fix hypr config

flake.lock

@@ -38,11 +38,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1772153824,
+        "lastModified": 1772983749,
-        "narHash": "sha256-T65qXmlcD9qFpPTi+mOXsn4dIkO2N8Ls67nqmuzepv0=",
+        "narHash": "sha256-IRC/YpTVMDr/lMmWMEc+JU4d+L9z3v38jZuj0jSLaW0=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "4b0f5b7bf7b3eeb484d49524f3c9791864ab9362",
+        "rev": "3594e4c94994515e0e32884dad20ca70ae88fc49",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772516620,
+        "lastModified": 1772985285,
-        "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=",
+        "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9",
+        "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772543027,
+        "lastModified": 1772913214,
-        "narHash": "sha256-3XOAKf8H5DiNgO4CvkNbrWtfexi5iI29zS30zkJnRrU=",
+        "narHash": "sha256-lI361+KhTUerHMYJOaDzVhIikAX1PNcZMNY1WEx/+dc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7299a3b0d5332da030e980e60b0ee35b93387cff",
+        "rev": "a4ecae91600d7e8ceb31610176d6b40cb816711b",
         "type": "github"
       },
       "original": {
@@ -469,11 +469,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1772773019,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
         "type": "github"
       },
       "original": {
@@ -517,11 +517,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1772433332,
+        "lastModified": 1772773019,
-        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
+        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
+        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
         "type": "github"
       },
       "original": {

modules/cli/fish.nix

@@ -17,6 +17,8 @@
 
         fish_vi_key_bindings
 
+        direnv hook fish | source
+
         fastfetch --config ~/.config/fastfetch/startup.jsonc
       '';
 
@@ -69,16 +71,6 @@
           "nh os switch /etc/nixos/";
       };
 
-      ls = {
-        body = # fish
-          "eza --long --icons --group-directories-first --git $argv";
-      };
-
-      lst = {
-        body = # fish
-          "eza --long --icons --color --git --tree  $argv";
-      };
-
       cp_mail = {
         body = # fish
           "pandoc $argv -t html |wl-copy -t text/html";
@@ -89,25 +81,56 @@
           if isNixOS then
             # fish
             ''
-              echo "=== System packages update==="
+              echo "=== System packages update ==="
               pushd /etc/nixos
-              nix flake update
+
-              reload_system
+              if git pull
+                git add -A
+                git commit --allow-empty -m "chore: state before system update"
+                
+                nix flake update
+                
+                if test $status -eq 0
+                    git add ./flake.lock
+                    git commit --allow-empty -m "chore: update system flake.lock"
+                    reload_system 
+                else
+                    echo "Error while updating system flake!"
+                end
+              else
+                echo "Error: 'git pull' failed in /etc/nixos. Skipping system update."
+              end
+
               popd
 
-              echo "===User packages update==="
+              echo "=== User packages update ==="
               pushd $HOME/.config/home-manager
-              nix flake update
+
-              reload_dotfiles
+              if git pull
+                git add -A
+                git commit --allow-empty -m "chore: state before home-manager update"
+                
+                nix flake update
+                
+                if test $status -eq 0
+                    git add ./flake.lock
+                    git commit --allow-empty -m "chore: update home flake.lock"
+                    reload_dotfiles
+                else
+                    echo "Error while updating home flake!"
+                end
+              else
+                echo "Error: 'git pull' failed in home-manager. Skipping user update."
+              end
+
               popd
 
-
-              echo "=== Flatpak update==="
               if type -q flatpak
-                  echo "===Flatpak update==="
+                echo "=== Flatpak update ==="
-                  flatpak update --noninteractive
+                flatpak update --noninteractive
-                  echo "===Flatpak remove unused==="
+                
-                  flatpak uninstall --unused
+                echo "=== Flatpak remove unused ==="
+                flatpak uninstall --unused --noninteractive
               end
             ''
           else
@@ -144,15 +167,11 @@
               end
             '';
       };
-
+    };
-      rm = {
+    shellAliases = {
-        body = "trash $argv";
+      ls = "eza --long --icons --group-directories-first --git";
-      };
+      lst = "eza --long --icons --color --git --tree";
-
+      rm = "trash";
-      open = {
-        body = "nohup xdg-open $argv > /dev/null & ";
-      };
-
     };
   };
 }

modules/hypr/hyprland.nix

@@ -352,8 +352,6 @@ in
       bindd = [
         "$mainMod, F, Make app fullscreen, fullscreen"
         "$mainMod, T, Toggle floating, togglefloating"
-        "$mainMod, S, layoutmsg, swapsplit"
-        "$mainMod, C, layoutmsg, togglesplit"
         "$mainMod, Q, Kill active window, killactive"
       ];
     };

modules/packages.nix

@@ -19,5 +19,11 @@
     slurp
     bc
     nh
+    runc
   ];
+
+  xdg.configFile."containers/containers.conf".text = ''
+    [engine]
+    runtime = "runc"
+  '';
 }