update

2026-04-14 22:57:32 +02:00
parent 7f41488da6
commit 1f52782226
33 changed files with 168 additions and 85 deletions
@@ -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,
    )


@@ -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"]
@@ -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
@@ -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; }
@@ -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"
@@ -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 {
@@ -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
@@ -22,7 +22,7 @@ Text {
        id: action

        running: false
-        command: ["rofi", "-show", "drun"]
+        command: ["vicinae", "toggle"]
    }

 }
@@ -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() {
@@ -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"
+      }
+   }
+}
@@ -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<ch> - Select up to and including a charater.
+F<ch> - Same, but backwards.
+t<ch> - Select up to a charater.
+T<ch> - Same, but backwards.
+
+r<ch> - Replace all selected characters with <ch>.
+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.
+
+"<ch> - Select register <ch>, 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.
@@ -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