feat: hyprland, neovim, zsh changes

host/common/optional/desktop/cosmic.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  services.displayManager.cosmic-greeter.enable = true;
+
+  services.desktopManager.cosmic.enable = true;
+}

host/common/optional/desktop/hyprland.nix

@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./hyprland/font.nix
     ./hyprland/cursor.nix
     ./hyprland/packages.nix
     ./hyprland/greeter.nix

host/max/default.nix

@@ -8,6 +8,8 @@
     ./sops.nix
 
     ../common/optional/desktop/hyprland.nix
+    # ../common/optional/desktop/cosmic.nix
+    ../common/optional/font.nix
 
     ../common/optional/yubikey.nix
 
@@ -33,6 +35,15 @@
     };
   };
 
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      mesa.opencl
+    ];
+  };
+
+  services.upower.enable = true;
+
   networking.networkmanager.enable = true;
 
   hardware.bluetooth = {
@@ -61,11 +72,12 @@
     just
 
     # mpc
-    gurk-rs
     libreoffice-qt
     # ncmpcpp
 
     pkgs-unstable.signal-desktop-bin
+    pkgs-unstable.gurk-rs
+
     gnupg
 
     (pass.withExtensions (exts: [ exts.pass-otp ]))
@@ -112,6 +124,14 @@
         ${mpg123}/bin/mpg123 "$url"
       fi
     '')
+
+    (pkgs.writeShellScriptBin "battery-graph" ''
+      ${pkgs.coreutils}/bin/tail -n 20 /var/lib/upower/history-charge-bq40z651-69-F8Y3262H468Q1LTA1.dat | ${pkgs.coreutils}/bin/cut -f1,2 | RUBYOPT='-W0' ${pkgs.youplot}/bin/uplot line -w 70
+    '')
+
+    (pkgs.writeShellScriptBin "ocr-clip" ''
+      ${pkgs.grimblast}/bin/grimblast -f save area - | ${pkgs.tesseract}/bin/tesseract stdin stdout | ${pkgs.wl-clipboard}/bin/wl-copy
+    '')
   ];
 
   programs.zsh.enable = true;

host/max/home/nvim.nix

@@ -20,6 +20,9 @@
       cursorline = true;
       number = true;
 
+      tabstop = 2;
+      expandtab = true;
+
       signcolumn = "yes";
 
       updatetime = 250;
@@ -107,7 +110,6 @@
       gitsigns.enable = true;
       highlight-colors.enable = true;
       todo-comments.enable = true;
-      # smear-cursor.enable = true;
       goyo.enable = true;
 
       treesitter = {
@@ -241,6 +243,7 @@
       neo-tree = {
         enable = true;
         settings = {
+          window.width = 25;
           filesystem = {
             filtered_items = {
               visible = true;
@@ -273,15 +276,6 @@
     extraPlugins = with pkgs.vimPlugins; [
       stay-centered-nvim
       mini-ai
-      (pkgs.vimUtils.buildVimPlugin {
-         name = "neominimap";
-         src = pkgs.fetchFromGitHub {
-             owner = "Isrothy";
-             repo = "neominimap.nvim";
-             rev = "c827a43e5cad146e007c8b1f2a9744798d029e6f";
-             hash = "sha256-MQxeYIm0QLS2HROvGLD6Rc21Hqx3USF9OXcw1shNTWg=";
-         };
-       })
     ];
 
   };

host/max/home/terminal.nix

@@ -61,16 +61,22 @@
       bindkey '^G' fzf-project
 
       fzf-files() {
-        selected=$(rg --files | fzf)
+        local selected
+        selected=$(${pkgs.ripgrep}/bin/rg --files | ${pkgs.fzf}/bin/fzf) || return
+
         if [[ -n $selected ]]; then
-          xargs $EDITOR $selected
-          zle reset-prompt
+          BUFFER="v $selected"
+          print -s -- "$BUFFER"
+          zle accept-line
         fi
-        zle redisplay
       }
 
       zle -N fzf-files
-      bindkey -M viins '^F' fzf-files
+      bindkey '^V' fzf-files
+    '';
+
+    envExtra = ''
+      export PER_DIRECTORY_HISTORY_TOGGLE="^H"
     '';
 
     shellAliases = {
@@ -100,6 +106,15 @@
         src = pkgs.zsh-vi-mode;
         file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
       }
+      {
+        name = "per-directory-history";
+        src = pkgs.fetchFromGitHub {
+          owner = "jimhester";
+          repo = "per-directory-history";
+          rev = "95f06973e9f2ff0ff75f3cebd0a2ee5485e27834";
+          sha256 = "sha256-EV9QPBndwAWzdOcghDXrIIgP0oagVMOTyXzoyt8tXRo=";
+        };
+      }
     ];
   };