merge

.config/fish/config.fish

@@ -16,8 +16,12 @@ export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/tsousa/.ghcup/bin $PATH # ghcup-env
 fish_add_path $HOME/.local/share/nvim/mason/bin/
 fish_add_path $HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin
+<<<<<<< HEAD
+fish_add_path $HOME/.config/emacs/bin/
+=======
 fish_add_path $HOME/.cargo/bin/
 fish_add_path $HOME/.config/emacs/bin
+>>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab
 
 starship init fish | source
 

.config/fish/fish_variables

@@ -40,4 +40,8 @@ SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
+<<<<<<< HEAD
+SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
+=======
 SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
+>>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab

.config/i3/config

@@ -210,16 +210,30 @@ bindsym $mod+r mode "resize"
 gaps inner 10
 gaps top 40
 
+assign [class="^tidal-hifi$"] 4
 assign [class="discord"] 5
 
+# startup programs
+exec --no-startup-id nextcloud
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec alacritty'
 exec --no-startup-id picom -b
 exec --no-startup-id openrgb -d 0 -m off -d 1 -m off 
 exec_always --no-startup-id ~/.config/polybar/launch.sh 
 
+#mode "Power menu: [e]xit i3 | [S-s]hutdown | [s]uspend | [r]eboot" {
+#    bindsym $mod+e exec --no-startup-id i3-msg exit
+#    bindsym $mod+Shift+s exec shutdown -h now
+#    bindsym $mod+r exec reboot
+#    bindsym $mod+s exec systemctl suspend
+#
+#    bindsym Return mode "default"
+#    bindsym Escape mode "default"
+#}
+#bindsym $mod+Shift+e mode "Power menu: [e]xit i3 | [S-s]hutdown | [s]uspend | [r]eboot"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
+
 #bar {
 #        status_command i3status
 #        position top

.config/polybar/config.ini

@@ -27,6 +27,10 @@ pseudo-transparency = true
 monitor = ${env:MONITOR:eDP1}
 tray-position  = ${env:TRAY_POS:right}
 
+font-0 = Firacode Nerd Font:style=medium:size=10;2
+font-1 = jetbrainsmono nerd font:size=10:weight=bold;2
+font-2 = inter:size=10:weight=regular;2
+
 [bar/laptop]
 inherit = section/base
 width = 99.4%
@@ -44,9 +48,6 @@ foreground = ${colors.text}
 line-size = 3pt
 padding-right = 1
 
-font-0 = FiraCode Nerd Font:size=10:weight=medium;2
-font-1 = JetBrainsMono Nerd Font:size=10:weight=bold;2
-font-2 = Inter:size=10:weight=regular;2
 
 cursor-click = pointer
 enable-ipc = true
@@ -71,10 +72,6 @@ foreground = ${colors.text}
 line-size = 3pt
 padding-right = 1
 
-font-0 = FiraCode Nerd Font:size=10:weight=medium;2
-font-1 = JetBrainsMono Nerd Font:size=10:weight=bold;2
-font-2 = Inter:size=10:weight=regular;2
-
 cursor-click = pointer
 ;cursor-scroll = ns-resize
 enable-ipc = true
@@ -99,10 +96,6 @@ foreground = ${colors.text}
 line-size = 3pt
 padding-right = 1
 
-font-0 = FiraCode Nerd Font:size=10:weight=medium;2
-font-1 = JetBrainsMono Nerd Font:size=10:weight=bold;2
-font-2 = Inter:size=10:weight=regular;2
-
 cursor-click = pointer
 ;cursor-scroll = ns-resize
 enable-ipc = true

.config/rofi/scripts/powermenu.sh

@@ -1,5 +1,5 @@
 #! /bin/sh
-OPTIONS="Suspend\nLock\nReboot\nShutdown\nExit i3\n"
+OPTIONS="Suspend\nLock\nRestart\nShutdown\nExit i3\n"
 
 LAUNCHER="rofi -dmenu -i -p Power"
 LOCKER="betterlockscreen -l"