diff --git a/.config/Code/User/keybindings.json b/.config/Code/User/keybindings.json index 2067fe6..03a68e7 100644 --- a/.config/Code/User/keybindings.json +++ b/.config/Code/User/keybindings.json @@ -290,4 +290,47 @@ "key": "ctrl+shift+i", "command": "workbench.action.chat.openInEditor" }, + { + "key": "ctrl+k e", + "command": "-workbench.files.action.focusOpenEditorsView", + "when": "workbench.explorer.openEditorsView.active" + }, + { + "key": "ctrl+e", + "command": "-workbench.action.quickOpen" + }, + { + "key": "ctrl+e", + "command": "-thunder-client.change-env", + "when": "activeWebviewPanelId == 'tc.env-view' || activeWebviewPanelId == 'tc.request-view' || activeWebviewPanelId == 'tc.runcol-view'" + }, + { + "key": "ctrl+e", + "command": "-editor.action.toggleScreenReaderAccessibilityMode", + "when": "accessibilityHelpIsShown" + }, + { + "key": "ctrl+r", + "command": "renameFile", + "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "f2", + "command": "-renameFile", + "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "ctrl+l", + "command": "-notebook.centerActiveCell", + "when": "notebookEditorFocused" + }, + { + "key": "ctrl+shift+h", + "command": "-workbench.action.replaceInFiles" + }, + { + "key": "ctrl+shift+h", + "command": "references-view.showCallHierarchy", + "when": "editorHasCallHierarchyProvider" + }, ] \ No newline at end of file diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index dfb78fb..0da52a5 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -27,6 +27,11 @@ "**/.ammonite": true }, // + // File associations with languages + "files.associations": { + "*.pgpass" : "yaml", + }, + // // Settings Sync "settingsSync.ignoredSettings": [ "sshfs.configs", @@ -92,7 +97,7 @@ "emmet.showAbbreviationSuggestions": false, "editor.linkedEditing": true, "editor.codeActionsOnSave": { - "source.organizeImports": "always" + // "source.organizeImports": "always" } }, // @@ -112,4 +117,5 @@ "emmet.showExpandedAbbreviation": "never", "git.openRepositoryInParentFolders": "never", "editor.selectionClipboard": false, + "git.blame.editorDecoration.enabled": true, } \ No newline at end of file diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 10ca27d..42aa7f3 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -210,6 +210,7 @@ history_length = 20 ### Misc/Advanced ### + dmenu = /usr/bin/tofi # Browser for opening urls in context menu. browser = /usr/bin/xdg-open @@ -228,7 +229,7 @@ # corners. # The radius will be automatically lowered if it exceeds half of the # notification height to avoid clipping text and/or icons. - corner_radius = 5 + corner_radius = 10 # Ignore the dbus closeNotification message. # Useful to enforce the timeout set by dunst configuration. Without this @@ -315,6 +316,7 @@ [spotify] appname = "Spotify" frame_color = "#1ED760" + format = "Now Playing\n%s\n%b" # Every section that isn't one of the above is interpreted as a rules to diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index dcd74e8..ea161b6 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -40,19 +40,22 @@ $browser = firefox # Or execute your favorite apps at launch like this: exec-once = hyprpaper -exec-once = waybar exec-once = systemctl --user start hyprpolkitagent exec-once = dunst exec-once = wl-paste --type text --watch cliphist store # Stores only text data -exec-once = noisetorch -i exec-once = [ workspace special:term silent] $terminal exec-once = [ workspace special:browser silent] $browser -url "https://web.whatsapp.com" exec-once = [ workspace special:music silent] spotify +exec-once = [ workspace special:todo silent] clickup # Script to make bitwarden firefox extension windows launch in floating mode exec-once = ~/.config/hypr/scripts/float-bitwarden.sh +# Plugins +exec-once = hyprpm enable Hyprspace +exec-once = waybar 2>&1 > /home/paul/waybar.log + ############################# ### ENVIRONMENT VARIABLES ### ############################# @@ -220,7 +223,8 @@ bind = $mainMod SHIFT, S, exec, hyprshot -m region bind = $mainMod, PRINT, exec, hyprshot -m window bind = $mainMod SHIFT, B, exec, pkill waybar & hyprctl dispatch exec waybar bind = $mainMod SHIFT, C, exec, hyprpicker | wl-copy -bind = $mainMod, TAB, overview:toggle +# bind = $mainMod, TAB, overview:toggle +bind = $mainMod, END, exec, wlogout -b 6 -L 1100 -R 1100 -T 650 -B 650 # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l @@ -243,7 +247,6 @@ bind = $mainMod, 5, workspace, 5 bind = $mainMod, 6, workspace, 6 bind = $mainMod, 7, workspace, 7 bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 # Switch workspaces of secondary monitor with mainMod + [F1-9] bind = $mainMod, F1, workspace, 11 @@ -254,7 +257,6 @@ bind = $mainMod, F5, workspace, 15 bind = $mainMod, F6, workspace, 16 bind = $mainMod, F7, workspace, 17 bind = $mainMod, F8, workspace, 18 -bind = $mainMod, F9, workspace, 19 # Move active window to a workspace with mainMod + SHIFT + [1-9] (primary monitor) bind = $mainMod SHIFT, 1, movetoworkspace, 1 @@ -265,7 +267,6 @@ bind = $mainMod SHIFT, 5, movetoworkspace, 5 bind = $mainMod SHIFT, 6, movetoworkspace, 6 bind = $mainMod SHIFT, 7, movetoworkspace, 7 bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to a workspace with mainMod + SHIFT + [F1-F9] (secondary monitor) bind = $mainMod SHIFT, F1, movetoworkspace, 11 @@ -276,15 +277,16 @@ bind = $mainMod SHIFT, F5, movetoworkspace, 15 bind = $mainMod SHIFT, F6, movetoworkspace, 16 bind = $mainMod SHIFT, F7, movetoworkspace, 17 bind = $mainMod SHIFT, F8, movetoworkspace, 18 -bind = $mainMod SHIFT, F9, movetoworkspace, 19 # Special workspaces (scratchpad) -bind = $mainMod, F10, togglespecialworkspace, term -bind = $mainMod SHIFT, F10, movetoworkspace, special:term +bind = $mainMod, F12, togglespecialworkspace, term +bind = $mainMod SHIFT, F12, movetoworkspace, special:term bind = $mainMod, F11, togglespecialworkspace, browser bind = $mainMod SHIFT, F11, movetoworkspace, special:browser -bind = $mainMod, F12, togglespecialworkspace, music -bind = $mainMod SHIFT, F12, movetoworkspace, special:music +bind = $mainMod, F10, togglespecialworkspace, music +bind = $mainMod SHIFT, F10, movetoworkspace, special:music +bind = $mainMod, F9, togglespecialworkspace, todo +bind = $mainMod SHIFT, F9, movetoworkspace, special:todo # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow @@ -320,6 +322,9 @@ windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinn # Window rules to assign windows to workspaces windowrulev2 = float,title:^(.*Extension: Bitwarden.*)$ +# Always center ClickUp command bar +windowrulev2 = center, title:ClickUp Command Bar + # Open audio settings in floating mode windowrulev2 = float, class:org.pulseaudio.pavucontrol windowrulev2 = size 500 1000, class:org.pulseaudio.pavucontrol diff --git a/.config/pipewire/pipewire.conf.d/raop-discover.conf b/.config/pipewire/pipewire.conf.d/raop-discover.conf new file mode 100644 index 0000000..7a1179b --- /dev/null +++ b/.config/pipewire/pipewire.conf.d/raop-discover.conf @@ -0,0 +1,6 @@ +context.modules = [ + { + name = libpipewire-module-raop-discover + args = { } + } +] \ No newline at end of file diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 9e98927..aec321e 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,12 +1,12 @@ * { border: none; - font-family: 'Fira Sans Semibold', 'Symbols Nerd Font Mono'; - font-size: 16px; + font-family: 'Cantarell', 'monospace', 'Symbols Nerd Font Mono'; + font-size: 12px; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } window#waybar { - background: transparent; + background: rgba(0, 0, 0, 0.5); } /* All modules */ @@ -14,15 +14,12 @@ window#waybar { /* Module on the left */ .modules-left { color: #cdd6f4; - margin-top: 4px; - margin-left: 10px; } #custom-power { - background-color: rgba(255, 255, 255, 0.2); color: white; - padding: 0px 9px; - border-radius: 100px; + padding: 0px 8px; + padding-left: 18px; font-weight: 800; } @@ -35,7 +32,6 @@ window#waybar { margin-left: 10px; font-size: 12px; border-radius: 100px; - background-color: rgba(255, 255, 255, 0.2); padding: 2px; } @@ -43,34 +39,32 @@ window#waybar { color: white; animation: gradient_f 20s ease-in infinite; transition: all 0.2s ease-in; - border-radius: 100px; - padding: 0px 4px; - margin: 0px 2px; + margin: 0px; + padding: 0px; } #workspaces button:hover { background: none; - background-color: black; color: white; box-shadow: inherit; text-shadow: inherit; } #workspaces button.active { - background-color: #33ccff; - color: #167797; - border-radius: 100px; - padding: 0px 10px; + color: #33ccff; } #custom-spotify { - margin-left: 20px; + padding: 0px 10px; +} + +#custom-spotify:hover { + background-color: rgba(0, 0, 0, 0.4); } /* Module in the middle */ #clock { color: #cdd6f4; - margin-top: 3px; padding-left: 10px; padding-right: 10px; margin-right: 15px; @@ -79,36 +73,34 @@ window#waybar { /* Module on the right */ .modules-right { - color: black; - margin-top: 3px; + color: white; margin-right: 10px; } -#custom-wireguard, #memory { - background-color: rgba(255, 255, 255, 0.8); - border-radius: 0px 100px 100px 0px; - padding-right: 7px; +.modules-right *:hover { + background-color: rgba(0, 0, 0, 0.2); } -#bluetooth, #cpu { - background-color: rgba(255, 255, 255, 0.8); - border-radius: 100px 0px 0px 100px; - padding: 0px 7px; +.modules-right * { + padding: 0px 10px; } + #memory { - margin-right: 7px; + padding-left: 5px; } -#pulseaudio { - color: white; - margin-right: 7px; +#cpu { + padding-right: 5px; } -#privacy { - background-color: rgba(17, 17, 27, 0.15); - padding: 0px 10px; - border-radius: 100px; - color: white; - margin-right: 7px; -} \ No newline at end of file +#bluetooth { + padding-right: 5px; +} + +#custom-wireguard { + padding-left: 5px; +} + + + diff --git a/.config/wireplumber/wireplumber.conf.d/99-renames.conf b/.config/wireplumber/wireplumber.conf.d/99-renames.conf new file mode 100644 index 0000000..dde16a7 --- /dev/null +++ b/.config/wireplumber/wireplumber.conf.d/99-renames.conf @@ -0,0 +1,75 @@ +monitor.alsa.rules = [ + # OUTPUT DEVICES + { + matches = [ + { node.name = "alsa_output.pci-0000_01_00.1.hdmi-stereo" } + ], + actions = { + update-props = { + node.description = "BenQ GL2580", + } + } + }, + { + matches = [ + { node.name = "alsa_output.pci-0000_11_00.6.analog-stereo" } + ], + actions = { + update-props = { + node.description = "Logitech Z313", + } + } + }, + { + matches = [ + { node.name = "alsa_output.usb-Razer_Razer_BlackShark_V2_Pro-00.analog-stereo" } + ], + actions = { + update-props = { + node.description = "Razer BlackShark V2 Pro", + } + } + }, + { + matches = [ + { node.name = "alsa_output.usb-R__DE_Microphones_R__DE_NT-USB_Mini_514A76EB-00.analog-stereo" } + ], + actions = { + update-props = { + node.description = "RØDE NT-USB Mini", + } + } + }, + + # INPUT DEVICES + { + matches = [ + { node.name = "alsa_input.usb-R__DE_Microphones_R__DE_NT-USB_Mini_514A76EB-00.mono-fallback" } + ], + actions = { + update-props = { + node.description = "RØDE NT-USB Mini", + } + } + }, + { + matches = [ + { node.name = "alsa_input.usb-Razer_Razer_BlackShark_V2_Pro-00.mono-fallback" } + ], + actions = { + update-props = { + node.description = "Razer BlackShark V2 Pro", + } + } + }, + { + matches = [ + { node.name = "alsa_input.pci-0000_11_00.6.analog-stereo" } + ], + actions = { + update-props = { + node.description = "3.5mm Input", + } + } + } +] \ No newline at end of file diff --git a/.config/wlogout/icons/hibernate.png b/.config/wlogout/icons/hibernate.png deleted file mode 100644 index a6322aa..0000000 Binary files a/.config/wlogout/icons/hibernate.png and /dev/null differ diff --git a/.config/wlogout/icons/lock-active.svg b/.config/wlogout/icons/lock-active.svg deleted file mode 100644 index 37c2365..0000000 --- a/.config/wlogout/icons/lock-active.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.config/wlogout/icons/lock.png b/.config/wlogout/icons/lock.png index f0b1eaf..a3fcd5c 100644 Binary files a/.config/wlogout/icons/lock.png and b/.config/wlogout/icons/lock.png differ diff --git a/.config/wlogout/icons/lock.svg b/.config/wlogout/icons/lock.svg deleted file mode 100644 index 6ab53f1..0000000 --- a/.config/wlogout/icons/lock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.config/wlogout/icons/logout.png b/.config/wlogout/icons/logout.png index 345a8aa..e37acbd 100644 Binary files a/.config/wlogout/icons/logout.png and b/.config/wlogout/icons/logout.png differ diff --git a/.config/wlogout/icons/reboot.png b/.config/wlogout/icons/reboot.png index 29cfa2f..79a0882 100644 Binary files a/.config/wlogout/icons/reboot.png and b/.config/wlogout/icons/reboot.png differ diff --git a/.config/wlogout/icons/shutdown.png b/.config/wlogout/icons/shutdown.png index 4d7d499..4bdfa8b 100644 Binary files a/.config/wlogout/icons/shutdown.png and b/.config/wlogout/icons/shutdown.png differ diff --git a/.config/wlogout/icons/suspend.png b/.config/wlogout/icons/suspend.png index 647bd66..50444a9 100644 Binary files a/.config/wlogout/icons/suspend.png and b/.config/wlogout/icons/suspend.png differ diff --git a/.config/wlogout/icons/windows.png b/.config/wlogout/icons/windows.png new file mode 100644 index 0000000..fc4f378 Binary files /dev/null and b/.config/wlogout/icons/windows.png differ diff --git a/.config/wlogout/layout b/.config/wlogout/layout index 7013ee9..5459821 100644 --- a/.config/wlogout/layout +++ b/.config/wlogout/layout @@ -4,12 +4,6 @@ "text" : "Lock", "keybind" : "l" } -{ - "label" : "hibernate", - "action" : "systemctl hibernate", - "text" : "Hibernate", - "keybind" : "h" -} { "label" : "logout", "action" : "loginctl terminate-user $USER", @@ -34,3 +28,9 @@ "text" : "Reboot", "keybind" : "r" } +{ + "label" : "windows", + "action" : "/usr/local/bin/reboot_windows", + "text" : "Windows", + "keybind" : "w" +} \ No newline at end of file diff --git a/.config/wlogout/style.css b/.config/wlogout/style.css index 7f78559..9a00076 100644 --- a/.config/wlogout/style.css +++ b/.config/wlogout/style.css @@ -1,11 +1,11 @@ * { background-image: none; box-shadow: none; - font-family: "Fira Sans Semibold", 'Courier New', Courier, monospace; + font-family: "Cantarell", 'Courier New', Courier, monospace; } window { - background-color: rgba(12, 12, 12, 0.8); + background-color: rgba(12, 12, 12, 0.9); } button { @@ -23,7 +23,7 @@ button { button:focus, button:active, button:hover { color: #33CCFF; outline-style: none; - font-family: "Fira Sans Bold"; + font-family: "Cantarell"; } #lock { @@ -38,10 +38,6 @@ button:focus, button:active, button:hover { background-image: image(url("/home/paul/.config/wlogout/icons/suspend.png"), url("/usr/local/share/wlogout/icons/suspend.png")); } -#hibernate { - background-image: image(url("/home/paul/.config/wlogout/icons/hibernate.png"), url("/usr/local/share/wlogout/icons/hibernate.png")); -} - #shutdown { background-image: image(url("/home/paul/.config/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png")); } @@ -49,3 +45,7 @@ button:focus, button:active, button:hover { #reboot { background-image: image(url("/home/paul/.config/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png")); } + +#windows { + background-image: image(url("/home/paul/.config/wlogout/icons/windows.png"), url("/usr/local/share/wlogout/icons/windows.png")); +} \ No newline at end of file diff --git a/.zshrc b/.zshrc index 87110bc..bd12a92 100644 --- a/.zshrc +++ b/.zshrc @@ -112,13 +112,13 @@ fi # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -# Reboot to Windows -reboot_windows() -{ - windows_title=$(grep -i windows /boot/grub/grub.cfg | cut -d "'" -f 2) - sudo grub-reboot "$windows_title" && sudo reboot -} -alias reboot-windows='reboot_windows' +# Reboot to Windows (REPLACED WITH SCRIPT) +# reboot_windows() +# { +# windows_title=$(grep -i windows /boot/grub/grub.cfg | cut -d "'" -f 2) +# sudo grub-reboot "$windows_title" && sudo reboot +# } +# alias reboot-windows='reboot_windows' # Command aliases alias py=python3 @@ -142,6 +142,8 @@ alias wol=wakeonlan alias ge=gnome-extensions alias open="xdg-open" alias lg="lazygit" +alias ccat="pygmentize -g -O style=monokai,linenos=1" + alias wstmux="cd ~/code/wasteside/app && tmux new -A -s wasteside" alias R="R --no-save" @@ -152,8 +154,9 @@ export PATH="/usr/local/opt/tcl-tk/bin:$PATH" # autojump [ -f /opt/homebrew/etc/profile.d/autojump.sh ] && . /opt/homebrew/etc/profile.d/autojump.sh -# vscode shortcuts -alias ws="cd ~/code/wasteside/app && code . && tmux new -A -s wasteside" +# ws shortcuts +alias wsproddb="psql -h ep-shiny-brook-a23l5gzv-pooler.eu-central-1.aws.neon.tech -d neondb -U neondb_owner" +alias wsdevdb="psql -h ep-bitter-queen-a2jgwcaj-pooler.eu-central-1.aws.neon.tech -d verceldb -U default" # Fix ls colors for synology directories LS_COLORS+=':ow=01;33' @@ -179,4 +182,4 @@ export PATH="$HOME/.yarn/bin:$PATH" # pyenv stuff (make sure this is at the end of the file) export PYENV_ROOT="$HOME/.pyenv" [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" \ No newline at end of file +eval "$(pyenv init -)"