more vim config

desktops/hyprland/decoration.nix

@@ -1,18 +0,0 @@
-{
-  rounding = 20;
-  blur = {
-    enabled = true;
-    xray = false;
-    special = false;
-
-    size = 6;
-    passes = 4;
-    new_optimizations = "on";
-  };
-
-  drop_shadow = true;
-  shadow_range = 15;
-  shadow_offset = "0 2";
-  shadow_render_power = 6;
-  "col.shadow" = "rgba(00000044)";
-}

desktops/hyprland/hyprland.nix

@@ -63,10 +63,10 @@
         "7,monitor:DP-3"
         "8,monitor:DP-3"
         "9,monitor:DP-3"
+        "special:calc,border:false,gapsout:200,on-created-empty:[noanim;silent] kitty -e qalc"
       ];
       windowrule = [
         "pseudo,^(discord)$"
-        "pseudo,^(org.gnome.Calculator)$"
         "pseudo,^(Slack)$"
         "pseudo,^(steam)$"
         "monitor DP-3,^(discord)$"
@@ -84,9 +84,64 @@
         "noanim,class:^(jetbrains-.*)$,title:^(win.*)$"
         "noinitialfocus,class:^(jetbrains-.*)$,title:^(win.*)$"
         "rounding 0,class:^(jetbrains-.*)$,title:^(win.*)$"
+        # pinentry
+        "dimaround,class:^(gcr-prompter)$"
+        "noborder,class:^(gcr-prompter)$"
+        "rounding 10,class:^(gcr-prompter)$"
+        "animation slide,class:^(gcr-prompter)$"
       ];
-      layerrule = import ./layerrules.nix;
+      layerrule = [
-      decoration = import ./decoration.nix;
+        "noanim, .*"
+        "xray 1, .*"
+
+        "noanim, noanim"
+        "blur, noanim"
+        "blur, gtk-layer-shell"
+        "ignorezero, gtk-layer-shell"
+        "blur, launcher"
+        "ignorealpha 0.3, launcher"
+        "blur, notifications"
+        "ignorealpha 0.3, notifications"
+        # ags
+        "blur, bar"
+        "ignorealpha 0.3, bar"
+        "blur, corner.*"
+        "ignorealpha 0.3, corner.*"
+        "blur, indicator.*"
+        "ignorealpha 0.3, indicator.*"
+        "blur, overview"
+        "ignorealpha 0.3, overview"
+        "xray 0, overview"
+        "blur, cheatsheet"
+        "ignorealpha 0.3, cheatsheet"
+        "blur, sideright"
+        "ignorealpha 0.3, sideright"
+        "blur, sideleft"
+        "ignorealpha 0.3, sideleft"
+        "blur, indicatorundefined"
+        "ignorealpha 0.3, indicatorundefined"
+        "blur, osk"
+        "ignorealpha 0.3, osk"
+        "blur, session"
+      ];
+      animation = [
+        "specialWorkspace,1,4,default,fade"
+      ];
+      decoration = {
+        rounding = 20;
+        blur = {
+          enabled = true;
+          xray = false;
+
+          size = 6;
+          passes = 4;
+        };
+
+        drop_shadow = true;
+        shadow_range = 15;
+        shadow_render_power = 6;
+        "col.shadow" = "rgba(00000044)";
+      };
     };
   };
 
@@ -174,10 +229,10 @@
     enable = true;
     target = ".zprofile"; # change to .profile if you're not using zsh
     text = ''
-      Hyprland && echo "goodbye" && exit 0 \
+    Hyprland && echo "goodbye" && exit 0 \
-        || echo "$? couldn't launch Hyprland" && tty | grep tty1 \
+    || echo "$? couldn't launch Hyprland" && tty | grep tty1 \
-        && echo "refusing to autologin without Hyprland on tty1" && exit 0 \
+    && echo "refusing to autologin without Hyprland on tty1" && exit 0 \
-        || echo "not on tty1, letting in"
+    || echo "not on tty1, letting in"
     '';
   };
 

desktops/hyprland/keybinds.nix

@@ -1,8 +1,9 @@
 [
   "SUPER,Q,killactive"
   "SUPER,T,exec,kitty"
+  "SUPER,C,togglespecialworkspace,calc"
   "SUPER_SHIFT,C,exec,hyprpicker"
-  "SUPER_SHIFT,S,exec,slurp | grim -g - - | wl-copy"
+  ",PRINT,exec,slurp | grim -g - - | wl-copy"
   "SUPER,P,pseudo,"
 
   "SUPER_SHIFT,up,movewindow,u"
@@ -10,6 +11,9 @@
   "SUPER_SHIFT,left,movewindow,l"
   "SUPER_SHIFT,right,movewindow,r"
 
+  "SUPER_SHIFT,S,movetoworkspace,special"
+  "SUPER,S,togglespecialworkspace,special"
+
   "SUPER,up,movefocus,u"
   "SUPER,down,movefocus,d"
   "SUPER,left,movefocus,l"

desktops/hyprland/layerrules.nix

@@ -1,35 +0,0 @@
-[
-  "noanim, .*"
-  "xray 1, .*"
-
-  "noanim, noanim"
-  "blur, noanim"
-  "blur, gtk-layer-shell"
-  "ignorezero, gtk-layer-shell"
-  "blur, launcher"
-  "ignorealpha 0.3, launcher"
-  "blur, notifications"
-  "ignorealpha 0.3, notifications"
-
-  # ags
-  "blur, bar"
-  "ignorealpha 0.3, bar"
-  "blur, corner.*"
-  "ignorealpha 0.3, corner.*"
-  "blur, indicator.*"
-  "ignorealpha 0.3, indicator.*"
-  "blur, overview"
-  "ignorealpha 0.3, overview"
-  "xray 0, overview"
-  "blur, cheatsheet"
-  "ignorealpha 0.3, cheatsheet"
-  "blur, sideright"
-  "ignorealpha 0.3, sideright"
-  "blur, sideleft"
-  "ignorealpha 0.3, sideleft"
-  "blur, indicatorundefined"
-  "ignorealpha 0.3, indicatorundefined"
-  "blur, osk"
-  "ignorealpha 0.3, osk"
-  "blur, session"
-]

flake.lock

@@ -122,11 +122,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700261686,
+        "lastModified": 1700695018,
-        "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=",
+        "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee",
+        "rev": "134deb46abd5d0889d913b8509413f6f38b0811e",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1700204040,
+        "lastModified": 1700612854,
-        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
+        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
+        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
         "type": "github"
       },
       "original": {

nohup.out

@@ -0,0 +1,29 @@
+cancelled
+Exception ignored in: <function StreamWriter.__del__ at 0x7fba56512ca0>
+Traceback (most recent call last):
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/streams.py", line 395, in __del__
+    self.close()
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/streams.py", line 343, in close
+    return self._transport.close()
+           ^^^^^^^^^^^^^^^^^^^^^^^
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/selector_events.py", line 860, in close
+    self._loop.call_soon(self._call_connection_lost, None)
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/base_events.py", line 761, in call_soon
+    self._check_closed()
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/base_events.py", line 519, in _check_closed
+    raise RuntimeError('Event loop is closed')
+RuntimeError: Event loop is closed
+Exception ignored in: <function StreamWriter.__del__ at 0x7fba56512ca0>
+Traceback (most recent call last):
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/streams.py", line 395, in __del__
+    self.close()
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/streams.py", line 343, in close
+    return self._transport.close()
+           ^^^^^^^^^^^^^^^^^^^^^^^
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/selector_events.py", line 860, in close
+    self._loop.call_soon(self._call_connection_lost, None)
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/base_events.py", line 761, in call_soon
+    self._check_closed()
+  File "/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/lib/python3.11/asyncio/base_events.py", line 519, in _check_closed
+    raise RuntimeError('Event loop is closed')
+RuntimeError: Event loop is closed

packages.nix

@@ -57,4 +57,7 @@
   # utils
   neofetch
   pinentry-gnome
+  ranger
+  lazydocker
+  libqalculate
 ]

programs/nixvim.nix

@@ -1,6 +1,15 @@
 { pkgs }:
 let
   angular-ls = (import ../packages/node-packages { inherit pkgs; nodejs = pkgs.nodejs_18; })."@angular/language-server";
+  nvim-treesitter-angular = (pkgs.vimUtils.buildVimPlugin {
+    name = "nvim-treesitter-angular";
+    src = pkgs.fetchFromGitHub {
+      owner = "dlvandenberg";
+      repo = "nvim-treesitter-angular";
+      rev = "e852e68352f1eed8f098691a74fd057461379cfe";
+      sha256 = "sha256-zSVKDWAUYoXjxxZIovx9BqGyjKMmtvlUhnKLiYE/RIk=";
+    };
+  });
 in
 {
   enable = true;
@@ -25,6 +34,7 @@ in
 
   keymaps = [
     { key = "<leader>u"; mode = "n"; action = "<cmd>:UndotreeToggle<CR>"; }
+    { key = "<leader>t"; mode = "n"; action = "<cmd>:NvimTreeOpen<CR>"; }
   ];
 
   globals = {
@@ -80,6 +90,7 @@ in
   plugins = {
     lualine.enable = true;
     fidget.enable = true;
+    auto-save.enable = true;
     indent-blankline = {
       enable = true;
       indent.char = "▏";
@@ -87,6 +98,10 @@ in
     rainbow-delimiters.enable = true;
     nvim-autopairs.enable = true;
     nvim-colorizer.enable = true;
+    nvim-tree = {
+      enable = true;
+      filters.dotfiles = true;
+    };
     undotree.enable = true;
     toggleterm = {
       enable = true;
@@ -107,18 +122,18 @@ in
     treesitter = {
       enable = true;
       indent = true;
-      /* TODO: grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars ++ [
+      grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars ++ [
         (pkgs.tree-sitter.buildGrammar {
           language = "angular";
           version = "624ff10";
           src = pkgs.fetchFromGitHub {
-            owner = "osenvosem";
+            owner = "dlvandenberg";
             repo = "tree-sitter-angular";
-            rev = "194a9404a0769e05a9cce77c4d69d92cd48d00fe";
+            rev = "b13cf5ccc54805622db6505904bf60b80537f22a";
-            sha256 = "sha256-bza1f5DDZcH65UJpO778AhjRUYICL4y5hqwB8lmAh0Q=";
+            sha256 = "sha256-tOEuWDarWQSNhS7A3ah3tKohbYCxw0QO/GJWEURAxpc=";
           };
         })
-      ];*/
+      ];
     };
 
     none-ls.enable = true;
@@ -176,14 +191,6 @@ in
   extraPackages = [ angular-ls pkgs.nodePackages.typescript-language-server ];
   extraPlugins = with pkgs.vimPlugins; [
     minimap-vim
-    /*(pkgs.vimUtils.buildVimPlugin {
+    nvim-treesitter-angular
-      name = "nvim-treesitter-angular";
-      src = pkgs.fetchFromGitHub {
-        owner = "elgiano";
-        repo = "nvim-treesitter-angular";
-        rev = "53d55ba0473c3ac58e25ce3d016a0409481c645c";
-        sha256 = "sha256-+OIOTRVfJxCFDzWqFDZAtfQVSQMaJZEltXSKfgfbeVY=";
-      };
-    })*/
   ];
 }