Upgrade flake

flake.lock

@@ -45,11 +45,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731257787,
-        "narHash": "sha256-QmijaEOYVhmj8V1bUtCQUQyanEHZ2n9HMCcMXveJMuI=",
+        "lastModified": 1733043608,
+        "narHash": "sha256-00uyKJEgix+TuIvEwH18SCXYXU9VDhRh3Kjxf9xrWgA=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "10001900f78be46ab8642edde7455aa5f0d54a6a",
+        "rev": "4ebaf4d0b6b8ab9bacd57f5db199da2d76eea8da",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1732837521,
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
@@ -152,27 +152,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1732824227,
+        "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1733016324,
+        "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1731264423,
-        "narHash": "sha256-DTWprnE/7Oud9JpJL1LOGVJP9CFod7YeArsb0U3yXWo=",
+        "lastModified": 1733060776,
+        "narHash": "sha256-fMPYWzojb0rzplG3HnP2eS3fpquu5U58tcKAr2taZxQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "00516a12c8792c11daa0982b8285b54c9a4e3c5e",
+        "rev": "0cccbcb30ee67c0b28c67ae33486118031a82b09",
         "type": "github"
       },
       "original": {

hosts/reykjavik/default.nix

@@ -62,7 +62,6 @@ in
     system.gpg.enable = true;
     system.pass.enable = true;
     system.sshfs.enable = true;
-    system.kanata.enable = true;
 
     server.vatnajokull.enable = true;
 
@@ -71,7 +70,10 @@ in
       inherit wallpaper;
       enable = true;
       laptop = true;
-      hyprland.enable = true;
+      hyprland = {
+        enable = true;
+        kb_layout = "es,gr";
+      };
     };
 
     # - Editors and development ------------------
@@ -88,6 +90,7 @@ in
     app.spotify.enable = true;
     app.skype.enable = true;
     app.nextcloud.enable = true;
+    app.yazi.enable = true;
 
     # - Gaming -----------------------------------
     gaming.lutris.enable = true;

modules/app/yazi.nix

@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.app.yazi;
+in
+{
+  options.samfelag.modules.app.yazi = {
+    enable = lib.mkEnableOption "yazi";
+  };
+  config = lib.mkIf cfg.enable {
+    hm.home.packages = with pkgs; [
+      yazi
+      ffmpeg
+      ffmpegthumbnailer
+      jq
+      poppler
+      fd
+      ripgrep
+      fzf
+      zoxide
+      imagemagick
+      wl-clipboard
+    ];
+
+    fonts.fontconfig.enable = true;
+
+    fonts.packages = with pkgs; [
+      iosevka
+      (nerdfonts.override { fonts = [ "Iosevka" ]; })
+    ];
+
+
+  };
+}

modules/desktop/hyprland.nix

@@ -10,10 +10,10 @@ in {
 
     mod = my.mkOpt' types.str "Mod4" "Main modifier key for hyprland";
 
-    laptop = mkEnableOption "Enable features for a laptop (trackpad, battery, etc...)";
+    kb_layout = my.mkOpt' types.str "es" "Keyboard layout(s) for hyprland";
 
     extraKeybindings = my.mkOpt (types.listOf types.str) [ ];
-    extraStartup = my.mkOpt (types.listOf types.attrs) [ ];
+    # extraStartup = my.mkOpt (types.listOf types.attrs) [ ];
   };
 
   config = lib.mkIf cfg.enable {
@@ -60,6 +60,7 @@ in {
     # - Dependencies -----------------------------
     samfelag.modules.desktop.rofi.enable = true;
     samfelag.modules.desktop.eww.enable = true;
+    samfelag.modules.system.kanata.enable = true;
 
     # - Configuration -----------------------------
 
@@ -85,7 +86,7 @@ in {
 
       settings = {
         input = {
-          kb_layout = "es";
+          kb_layout = cfg.kb_layout;
         };
 
         monitor = ",highres,auto,1";
@@ -163,6 +164,9 @@ in {
           ", XF86AudioPrev, exec, playerctl previous"
           ", XF86AudioStop, exec, playerctl stop"
 
+          # - Keyboard ---------------------------
+          "${cfg.mod} SHIFT, K, exec, hyprctl switchxkblayout kanata next"
+
         ] ++ cfg.extraKeybindings;
 
         binde = [

modules/system/kanata.nix

@@ -23,8 +23,8 @@ in
               a s d f h j k l
             )
             (defvar
-              tap-time 150
-              hold-time 200
+              tap-time 200
+              hold-time 250
             )
             (defalias
               a (tap-hold $tap-time $hold-time a lalt)