diff --git a/config-stow b/config-stow index d409989..a2a6b2f 100755 --- a/config-stow +++ b/config-stow @@ -17,7 +17,6 @@ TUI_PKGS = [ *BASE_PKGS, "fastfetch", # sys info, "helix", # editor - "nvim", # editor "shell", # fish & .bash_profile & shell prompt "yazi", # terminal file manager ] @@ -55,7 +54,7 @@ NIRI_PKGS = [ "hypr", # for hyprlock & hypridle "niri", # wm config "quickshell", # widgets & status bar & notifications & ... - "rofi", # application launcher + "vicinae", # application launcher "wlogout", # logout menu ] @@ -103,7 +102,8 @@ def stow(pkg: str): def unstow(pkg: str): subprocess.run( - ["stow", "-v", "-d", str(PKGS_PATH), "-t", str(DEST_PATH), "-D", pkg], check=True, + ["stow", "-v", "-d", str(PKGS_PATH), "-t", str(DEST_PATH), "-D", pkg], + check=True, ) diff --git a/config/helix/.config/helix/config.toml b/config/helix/.config/helix/config.toml index 5324937..9ed353c 100644 --- a/config/helix/.config/helix/config.toml +++ b/config/helix/.config/helix/config.toml @@ -2,48 +2,56 @@ theme = "catppuccin_mocha" [editor] default-yank-register = "+" -shell = ["bash", "-c"] -line-number = "relative" -indent-guides.render = true +shell = ["bash", "-c"] +line-number = "relative" +indent-guides.render = true +trim-trailing-whitespace = true [editor.cursor-shape] insert = "bar" normal = "block" select = "underline" +[editor.whitespace.render] +space = "none" +tab = "all" +nbsp = "none" +nnbsp = "none" +newline = "none" + [keys.normal] -# "esc" = "collapse_selection" -"-" = "collapse_selection" +"-" = "collapse_selection" "A-minus" = "flip_selections" -"#" = "switch_to_lowercase" -"A-#" = "switch_to_uppercase" +"#" = "switch_to_lowercase" +"A-#" = "switch_to_uppercase" +"+" = "select_register" # Previously "[" [keys.normal."ö"] -"d" = "goto_prev_diag" -"D" = "goto_first_diag" -"f" = "goto_prev_function" -"t" = "goto_prev_class" -"a" = "goto_prev_parameter" -"c" = "goto_prev_comment" -"T" = "goto_prev_test" -"p" = "goto_prev_paragraph" -"g" = "goto_prev_change" -"G" = "goto_first_change" +"d" = "goto_prev_diag" +"D" = "goto_first_diag" +"f" = "goto_prev_function" +"t" = "goto_prev_class" +"a" = "goto_prev_parameter" +"c" = "goto_prev_comment" +"T" = "goto_prev_test" +"p" = "goto_prev_paragraph" +"g" = "goto_prev_change" +"G" = "goto_first_change" "space" = "add_newline_above" # Previously "]" [keys.normal."ä"] -"d" = "goto_next_diag" -"D" = "goto_last_diag" -"f" = "goto_next_function" -"t" = "goto_next_class" -"a" = "goto_next_parameter" -"c" = "goto_next_comment" -"T" = "goto_next_test" -"p" = "goto_next_paragraph" -"g" = "goto_next_change" -"G" = "goto_last_change" +"d" = "goto_next_diag" +"D" = "goto_last_diag" +"f" = "goto_next_function" +"t" = "goto_next_class" +"a" = "goto_next_parameter" +"c" = "goto_next_comment" +"T" = "goto_next_test" +"p" = "goto_next_paragraph" +"g" = "goto_next_change" +"G" = "goto_last_change" "space" = "add_newline_below" # [keys.insert."j"] diff --git a/config/helix/.config/helix/languages.toml b/config/helix/.config/helix/languages.toml index ffa4dca..cb8bfea 100644 --- a/config/helix/.config/helix/languages.toml +++ b/config/helix/.config/helix/languages.toml @@ -1,13 +1,7 @@ [[language]] name = "c" -auto-format = true indent = { tab-width = 4, unit = " " } [[language]] name = "cpp" -auto-format = true indent = { tab-width = 4, unit = " " } - -[[language]] -name = "toml" -auto-format = true diff --git a/config/niri/.config/niri/config/binds.kdl b/config/niri/.config/niri/config/binds.kdl index 1dac1a5..9340acf 100644 --- a/config/niri/.config/niri/config/binds.kdl +++ b/config/niri/.config/niri/config/binds.kdl @@ -36,13 +36,13 @@ binds { Mod+X repeat=false { spawn "qs" "ipc" "call" "notes" "openRecent"; } Mod+Shift+X repeat=false { spawn "qs" "ipc" "call" "notes" "create"; } - // Rofi - Mod+D repeat=false { spawn-sh "pkill -x rofi || rofi -show run"; } - Alt+Space repeat=false { spawn-sh "pkill -x rofi || rofi -show drun"; } + // Launcher + Alt+Space repeat=false { spawn "vicinae" "toggle"; } + Mod+V repeat=false { spawn "vicinae" "vicinae://launch/clipboard/history?toggle=true"; } + Mod+Period repeat=false { spawn "vicinae" "vicinae://launch/core/search-emojis?toggle=true"; } + Mod+D repeat=false { spawn "vicinae" "vicinae://launch/system/run?toggle=true"; } // Actions - Mod+V repeat=false { spawn-sh "ghostty +new-window -e fzfclip-wrap"; } - Mod+Period repeat=false { spawn-sh "pkill -x rofi || rofi-emoji"; } Print repeat=false { screenshot-screen; } Mod+Shift+S repeat=false { screenshot; } Mod+Ctrl+Shift+S repeat=false { screenshot-window; } diff --git a/config/niri/.config/niri/config/execs.kdl b/config/niri/.config/niri/config/execs.kdl index 7a8e322..47a8d32 100644 --- a/config/niri/.config/niri/config/execs.kdl +++ b/config/niri/.config/niri/config/execs.kdl @@ -1,21 +1,11 @@ // Switch configs spawn-at-startup "config-switch" "niri" -// Not necessary maybe ... -spawn-at-startup "fcitx5" - // Core spawn-at-startup "nm-applet" spawn-at-startup "gnome-keyring-daemon" "--start" "--components=secrets" spawn-at-startup "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" -// Clipboard history -spawn-at-startup "wl-paste" "--type" "text" "--watch" "cliphist" "store" -spawn-at-startup "wl-paste" "--type" "image" "--watch" "cliphist" "store" - -// wlsunset -// spawn-at-startup "sunset" // managed by quickshell - // Logitech spawn-at-startup "solaar" "-w" "hide" @@ -30,7 +20,5 @@ spawn-at-startup "hypridle" // QuickShell spawn-at-startup "quickshell" -// According to (https://ghostty.org/docs/linux/systemd#starting-ghostty-at-login) -// spawn-sh-at-startup "systemctl start --user app-com.mitchellh.ghostty.service" -// -// spawn-at-startup "flatpak" "run" "com.gopeed.Gopeed" "--hidden" +// Vicinae +spawn-at-startup "vicinae" "server" diff --git a/config/niri/.config/niri/config/misc.kdl b/config/niri/.config/niri/config/misc.kdl index 8c18b91..7a332b3 100644 --- a/config/niri/.config/niri/config/misc.kdl +++ b/config/niri/.config/niri/config/misc.kdl @@ -2,6 +2,7 @@ screenshot-path "~/Pictures/Screenshots/niri_screenshot_%Y-%m-%d_%H-%M-%S.png" debug { render-drm-device "/dev/dri/renderD129" + honor-xdg-activation-with-invalid-serial } // gestures { diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index 17f5189..4831780 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -12,8 +12,9 @@ gtk-enable-input-feedback-sounds=0 gtk-font-name=Sarasa UI SC, 10 gtk-icon-theme-name=Papirus gtk-menu-images=true -gtk-modules=colorreload-gtk-module +gtk-modules=colorreload-gtk-module:appmenu-gtk-module gtk-primary-button-warps-slider=true +gtk-shell-shows-menubar=1 gtk-sound-theme-name=ocean gtk-theme-name=catppuccin-mocha-blue-standard+default gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/config/quickshell/.config/quickshell/Modules/Bar/Modules/Time.qml b/config/quickshell/.config/quickshell/Modules/Bar/Modules/Time.qml index c1b2c22..8ea928a 100644 --- a/config/quickshell/.config/quickshell/Modules/Bar/Modules/Time.qml +++ b/config/quickshell/.config/quickshell/Modules/Bar/Modules/Time.qml @@ -22,7 +22,7 @@ Text { id: action running: false - command: ["rofi", "-show", "drun"] + command: ["vicinae", "toggle"] } } diff --git a/config/quickshell/.config/quickshell/Services/NotesService.qml b/config/quickshell/.config/quickshell/Services/NotesService.qml index d9b2919..444a811 100644 --- a/config/quickshell/.config/quickshell/Services/NotesService.qml +++ b/config/quickshell/.config/quickshell/Services/NotesService.qml @@ -39,7 +39,7 @@ Singleton { function openNote(path) { recentNotePath = path; - Quickshell.execDetached(["ghostty", "+new-window", "-e", "nvim", path]); + Quickshell.execDetached(["ghostty", "+new-window", "-e", "helix", path]); } function openRecent() { diff --git a/config/vicinae/.config/vicinae/settings.json b/config/vicinae/.config/vicinae/settings.json new file mode 100644 index 0000000..6578987 --- /dev/null +++ b/config/vicinae/.config/vicinae/settings.json @@ -0,0 +1,23 @@ +// This configuration is merged with the default vicinae configuration file, which you can obtain by running the `vicinae config default` command. +// Every item defined in this file takes precedence over the values defined in the default config or any other imported file. +// +// You can make manual edits to this file, however you should keep in mind that this file may be written to by vicinae when a configuration change is made through the GUI. +// When that happens, any custom comments or formatting will be lost. +// +// If you want to maintain a configuration file with your own comments and formatting, you should create a separate file and add it to the 'imports' array. +// +// Learn more about configuration at https://docs.vicinae.com/config + +{ + "$schema": "https://vicinae.com/schemas/config.json", + "font": { + "normal": { + "family": "LXGW WenKai" + } + }, + "theme": { + "dark": { + "name": "catppuccin-mocha" + } + } +} \ No newline at end of file diff --git a/config/nvim/.config/nvim/.gitignore b/legacy/nvim/.config/nvim/.gitignore similarity index 100% rename from config/nvim/.config/nvim/.gitignore rename to legacy/nvim/.config/nvim/.gitignore diff --git a/config/nvim/.config/nvim/.neoconf.json b/legacy/nvim/.config/nvim/.neoconf.json similarity index 100% rename from config/nvim/.config/nvim/.neoconf.json rename to legacy/nvim/.config/nvim/.neoconf.json diff --git a/config/nvim/.config/nvim/init.lua b/legacy/nvim/.config/nvim/init.lua similarity index 100% rename from config/nvim/.config/nvim/init.lua rename to legacy/nvim/.config/nvim/init.lua diff --git a/config/nvim/.config/nvim/lazyvim.json b/legacy/nvim/.config/nvim/lazyvim.json similarity index 100% rename from config/nvim/.config/nvim/lazyvim.json rename to legacy/nvim/.config/nvim/lazyvim.json diff --git a/config/nvim/.config/nvim/lua/config/autocmds.lua b/legacy/nvim/.config/nvim/lua/config/autocmds.lua similarity index 100% rename from config/nvim/.config/nvim/lua/config/autocmds.lua rename to legacy/nvim/.config/nvim/lua/config/autocmds.lua diff --git a/config/nvim/.config/nvim/lua/config/keymaps.lua b/legacy/nvim/.config/nvim/lua/config/keymaps.lua similarity index 100% rename from config/nvim/.config/nvim/lua/config/keymaps.lua rename to legacy/nvim/.config/nvim/lua/config/keymaps.lua diff --git a/config/nvim/.config/nvim/lua/config/lazy.lua b/legacy/nvim/.config/nvim/lua/config/lazy.lua similarity index 100% rename from config/nvim/.config/nvim/lua/config/lazy.lua rename to legacy/nvim/.config/nvim/lua/config/lazy.lua diff --git a/config/nvim/.config/nvim/lua/config/options.lua b/legacy/nvim/.config/nvim/lua/config/options.lua similarity index 100% rename from config/nvim/.config/nvim/lua/config/options.lua rename to legacy/nvim/.config/nvim/lua/config/options.lua diff --git a/config/nvim/.config/nvim/lua/plugins/colorscheme.lua b/legacy/nvim/.config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugins/colorscheme.lua rename to legacy/nvim/.config/nvim/lua/plugins/colorscheme.lua diff --git a/config/nvim/.config/nvim/lua/plugins/example.lua b/legacy/nvim/.config/nvim/lua/plugins/example.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugins/example.lua rename to legacy/nvim/.config/nvim/lua/plugins/example.lua diff --git a/config/nvim/.config/nvim/lua/plugins/kitty.lua b/legacy/nvim/.config/nvim/lua/plugins/kitty.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugins/kitty.lua rename to legacy/nvim/.config/nvim/lua/plugins/kitty.lua diff --git a/config/nvim/.config/nvim/lua/plugins/snacks.lua b/legacy/nvim/.config/nvim/lua/plugins/snacks.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugins/snacks.lua rename to legacy/nvim/.config/nvim/lua/plugins/snacks.lua diff --git a/config/nvim/.config/nvim/lua/plugins/tree.lua b/legacy/nvim/.config/nvim/lua/plugins/tree.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugins/tree.lua rename to legacy/nvim/.config/nvim/lua/plugins/tree.lua diff --git a/config/nvim/.config/nvim/stylua.toml b/legacy/nvim/.config/nvim/stylua.toml similarity index 100% rename from config/nvim/.config/nvim/stylua.toml rename to legacy/nvim/.config/nvim/stylua.toml diff --git a/config/rofi/.config/rofi/apply-color b/legacy/rofi/.config/rofi/apply-color similarity index 100% rename from config/rofi/.config/rofi/apply-color rename to legacy/rofi/.config/rofi/apply-color diff --git a/config/rofi/.config/rofi/config.rasi b/legacy/rofi/.config/rofi/config.rasi similarity index 100% rename from config/rofi/.config/rofi/config.rasi rename to legacy/rofi/.config/rofi/config.rasi diff --git a/config/rofi/.config/rofi/dmenu.rasi b/legacy/rofi/.config/rofi/dmenu.rasi similarity index 100% rename from config/rofi/.config/rofi/dmenu.rasi rename to legacy/rofi/.config/rofi/dmenu.rasi diff --git a/config/scripts/.local/scripts/fzfclip b/legacy/scripts/.local/scripts/fzfclip similarity index 100% rename from config/scripts/.local/scripts/fzfclip rename to legacy/scripts/.local/scripts/fzfclip diff --git a/config/scripts/.local/scripts/fzfclip-wrap b/legacy/scripts/.local/scripts/fzfclip-wrap similarity index 100% rename from config/scripts/.local/scripts/fzfclip-wrap rename to legacy/scripts/.local/scripts/fzfclip-wrap diff --git a/config/scripts/.local/scripts/rofi-cliphist b/legacy/scripts/.local/scripts/rofi-cliphist similarity index 100% rename from config/scripts/.local/scripts/rofi-cliphist rename to legacy/scripts/.local/scripts/rofi-cliphist diff --git a/config/scripts/.local/scripts/rofi-emoji b/legacy/scripts/.local/scripts/rofi-emoji similarity index 100% rename from config/scripts/.local/scripts/rofi-emoji rename to legacy/scripts/.local/scripts/rofi-emoji diff --git a/memo/hx-usage.txt b/memo/hx-usage.txt new file mode 100644 index 0000000..6fef048 --- /dev/null +++ b/memo/hx-usage.txt @@ -0,0 +1,95 @@ +i - Insert before the selection. +a - Insert after the selection. (a means 'append') +I - Insert at the start of the line. +A - Insert at the end of the line. + +o - Add a newline and insert below the cursor. +O - Add a newline and insert above the cursor. + +w - Move forward to before the beginning of the next word. +e - Move forward to the end of the current word. +b - Move backward to the beginning of the current word. +W - Move forward to before the beginning of the next WORD. +E - Move forward to the end of the current WORD. +B - Move backward to the beginning of the current WORD. + +c - Change the current selection. + +x - Select the whole line. +X - Select the whole line whithout extending to subsequent lines. + +; - Collapse selections to single cursors. +A-- - Flips the direction of the selection. + +u - Undo. +U - Redo. + +y - Copy the selection. +p - Paste after cursor. +P - Paste before cursor. + + +/ - Search forwards. +? - Search backwards. +n - Next search result. +N - Previous search result. + +C - Duplicate the cursor to the next suitable line. +, - Remove the other cursors. + +s - Select matches in the selection. +A-s - Split the selections on newlines. + +& - Align "head"s (nor "anchor"s) of the selections. + +f - Select up to and including a charater. +F - Same, but backwards. +t - Select up to a charater. +T - Same, but backwards. + +r - Replace all selected characters with . +R - Replace with yanked text. + +. - Repeat last insert command. +A-. - Repeat the last f/t selection. + +J - Join together lines in selection. + +< - Indent left +> - Indent right + +C-a - Increment the number under selection. +C-x - Decrement the number under selection. + +" - Select register , can be followed by y / R / p / P / q / Q ... +* - Copy the selection into register / + +Q - Start/Stop recording a macro. +q - Repeat the macro. + +C-s - Save current position to jumplist. +C-i - Move forward in the jumplist. +C-o - Move backward in the jumplist. + +gw - Jump using 2-character labels. + +) - Cycle the primary selection forward. +( - Cycle the primary selection backward. +Alt-, - Remove the primary selection. +Alt-) - Cycle the content of the selections forward. +Alt-( - Cycle the content of the selections backward. + +~ - Switch the case of all selected letters. +` - Set all selected letters to lowercase. +Alt-` - Set all selected letters to uppercase. + +C-c - Toggle comment the lines. + +mm - Jump to the matching bracket. +mi - Select inside object (parentheses excluded). +ma - Select around object (parentheses included). +ms - Add surrounding around the current selection. +md - Delete surrounding pair of delimiters, selection not required. +mr - Replace surrounding pair of delimiters, selection not required. + +C-w - Window menu. diff --git a/memo/nvim-usage.txt b/memo/nvim-usage.txt deleted file mode 100644 index 1e65efe..0000000 --- a/memo/nvim-usage.txt +++ /dev/null @@ -1,27 +0,0 @@ -u v undo -C-r v redo - -o v open new line below & insert mode -O v open new line above & insert mode - -S-h v move to left buffer -S-l v move to right buffer - -C-Enter i cancel auto-completion & move to next line - -Num j/k v move by num lines -Num G v move to line num - -w v move to start of next word -W v move to start next word, can contain punctuation -e v move to end of current word -E v move to end of current word, can contain punctuation -b v move to start of previous word -B v move to start of previous word, can contain punctuation -ge v move to end of previous word -gE v move to end of previous word, can contain punctuation - -0 v move to start of line -$ v move to end of line - -<>+... v indent