diff --git a/assets/wallpaper/01.png b/assets/wallpaper/01.png
index 95a7674..5eacc54 100644
Binary files a/assets/wallpaper/01.png and b/assets/wallpaper/01.png differ
diff --git a/flake.lock b/flake.lock
index d7ef6cf..747336f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
     "bt-tracker": {
       "flake": false,
       "locked": {
-        "lastModified": 1742400565,
-        "narHash": "sha256-e2NNhOLCJxh4N0rUCVt9s594R8PhxmZ2hw+FRoIC0yU=",
+        "lastModified": 1742631003,
+        "narHash": "sha256-8joGkRd75mq8Wrd+iNTqMqAy51nAGvMVWyqis3iEobg=",
         "owner": "XIU2",
         "repo": "TrackersListCollection",
-        "rev": "e069b2e998f22b015e62051e7ede133a15ff59fe",
+        "rev": "8f29f914ae6965e16ef61ca297526a799a210ee4",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1742411408,
-        "narHash": "sha256-8MA3lI6meP4N325oRw6oycbv+K3UQyU5J+TecBGY9XE=",
+        "lastModified": 1742589311,
+        "narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "9c064216a24f5de423bc9c75b65e3948e2f7db55",
+        "rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba",
         "type": "github"
       },
       "original": {
@@ -421,11 +421,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1742392450,
-        "narHash": "sha256-i1xsmge/nKNJeLSz7MJ0ZgU10Fnr+MxPhs5v6EYD5R4=",
+        "lastModified": 1742627201,
+        "narHash": "sha256-2sKLhRoN5LJG7LrgxlFB/JmTjj7k9Mgu+QUL1wpxHOg=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "ccf956412307e754d1a8df19366e4d9ef382f1db",
+        "rev": "3a63e85b6ab204bf0e55d56db63ea02263175424",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742411829,
-        "narHash": "sha256-IwstGdqU2u3NG8KXtjirXCA0s1qm0zkZ7NrhUIVE/VQ=",
+        "lastModified": 1742588233,
+        "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4a40b441e49443ffd25c05614ad9c134a12e53c",
+        "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
         "type": "github"
       },
       "original": {
@@ -466,11 +466,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1742409616,
-        "narHash": "sha256-UogCu75sqpoB+xhA5DsWG3CHN4+KsIqymUFjHMdm+U8=",
+        "lastModified": 1742624823,
+        "narHash": "sha256-s2J3pzxnpI0Hf5k1lSA4Q2h6Wso9qvruxgM4UZoMscc=",
         "owner": "jj-vcs",
         "repo": "jj",
-        "rev": "364ece09e09b5771b2d7aa3a59e1437d0aae2c62",
+        "rev": "78239ee133159b29b6483e9a46ed1012026aef7c",
         "type": "github"
       },
       "original": {
@@ -530,11 +530,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1742355568,
-        "narHash": "sha256-cHW060+beSciKdCK4SZ9vYPOFy/otAq+t9MiO54zKYY=",
+        "lastModified": 1742629677,
+        "narHash": "sha256-x3s8p2rTjB42PQR5yN49qYhEOx/AhykqiNNyDFHmAas=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "10b56ff2ecc915ec26505526125b4f3a3006d5b3",
+        "rev": "b6db5c8dc7e46864b090e01114a2b8b40e7b6c3b",
         "type": "github"
       },
       "original": {
@@ -563,11 +563,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742276600,
-        "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=",
+        "lastModified": 1742627013,
+        "narHash": "sha256-GOp+thjLXji90Apk6yBhH/5+nuYKGdaG7gAaOQba8Lk=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a",
+        "rev": "0d4f0f00c0cd83a72151468bc610ce230a550027",
         "type": "github"
       },
       "original": {
@@ -583,11 +583,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1742395601,
-        "narHash": "sha256-WSoI4R/pY/8AY5ulSn03nry9KFGBGFRFcXjhBYYRYtI=",
+        "lastModified": 1742555319,
+        "narHash": "sha256-EcBXXGcJDDIy2uhr0ObGXGgubbpgdCxvSh5SIGRCFs8=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "7f8e9de5c8494d209bd618dad4ad81e98b19fabc",
+        "rev": "e8207c233ac95a927bfb02f914f02a9d41dbdfa0",
         "type": "github"
       },
       "original": {
@@ -598,11 +598,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1742376361,
-        "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=",
+        "lastModified": 1742631601,
+        "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9",
+        "rev": "380ed15bcd6440606c6856db44a99140d422b46f",
         "type": "github"
       },
       "original": {
@@ -614,11 +614,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742288794,
-        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+        "lastModified": 1742422364,
+        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
+        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
         "type": "github"
       },
       "original": {
@@ -661,11 +661,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1742268799,
-        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
+        "lastModified": 1742512142,
+        "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
+        "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
         "type": "github"
       },
       "original": {
@@ -677,11 +677,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1742268799,
-        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
+        "lastModified": 1742388435,
+        "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
+        "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6",
         "type": "github"
       },
       "original": {
@@ -691,6 +691,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1742422364,
+        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -717,11 +733,11 @@
     "nur-rycee": {
       "flake": false,
       "locked": {
-        "lastModified": 1742410664,
-        "narHash": "sha256-IbHml9lhbD+6bNNbzX30zySRs7Y3WteeyDHj/melcmo=",
+        "lastModified": 1742489760,
+        "narHash": "sha256-OkYl/wf09cKviSV1R6SshcRmeX1iDNEKCMg5KlmTwK0=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "4470fe1e563328d9b1d791dd005360ad3539fae3",
+        "rev": "10f7b577f5081b30ca6b7fd5f98de8d7dfdb5a27",
         "type": "gitlab"
       },
       "original": {
@@ -764,10 +780,7 @@
         "niri-flake": "niri-flake",
         "nixos-cosmic": "nixos-cosmic",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": [
-          "nixos-cosmic",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
         "nur-rycee": "nur-rycee",
         "oskars-dotfiles": "oskars-dotfiles",
         "sops-nix": "sops-nix",
@@ -823,11 +836,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742406979,
-        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
+        "lastModified": 1742595978,
+        "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
+        "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
         "type": "github"
       },
       "original": {
@@ -864,11 +877,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1742406729,
-        "narHash": "sha256-k03W8/GTJlCTtf5UaC4PIKSwTVQ3d3farweYvpkb53M=",
+        "lastModified": 1742591463,
+        "narHash": "sha256-CguaHULcm4RuIGN+i4u80dYZujFgZaeOTiShFxCwFhw=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "ccb411c5db16341455d82d955fef4db9985741a6",
+        "rev": "113643f332e1f70d90991722f8c4e5a0ace6fd06",
         "type": "github"
       },
       "original": {
@@ -1031,11 +1044,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742249030,
-        "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=",
+        "lastModified": 1742475924,
+        "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc",
+        "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d",
         "type": "github"
       },
       "original": {
@@ -1093,8 +1106,8 @@
       },
       "original": {
         "owner": "jcollie",
-        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       }
     }
diff --git a/flake.nix b/flake.nix
index 461276e..25d58e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
   description = "A simple NixOS flakes";
 
   inputs = {
-    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     # nixpkgs.url = "github:NixOS/nixpkgs/master";
-    nixpkgs.follows = "nixos-cosmic/nixpkgs";
+    # nixpkgs.follows = "nixos-cosmic/nixpkgs";
 
     lix-module = {
       url = "git+https://git.lix.systems/lix-project/nixos-module";
diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix
index ab5af6d..2458d8b 100644
--- a/home/david/configurations/Akun/default.nix
+++ b/home/david/configurations/Akun/default.nix
@@ -40,7 +40,10 @@
 
   david = {
     wallpaper.enable = true;
-    programs.openssh.enable = true;
+    programs = {
+      openssh.enable = true;
+      niri.enable = true;
+    };
   };
 
   home.username = "${unixName}";
diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix
index 3b9fae7..ed6e5f4 100644
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@@ -7,11 +7,6 @@
   ...
 }:
 {
-  imports = [
-    ./niri
-    ./wluma
-  ];
-
   youthlic = {
     xdg-dirs.enable = true;
     programs = {
@@ -50,7 +45,10 @@
 
   david = {
     wallpaper.enable = true;
-    programs.openssh.enable = true;
+    programs = {
+      niri.enable = true;
+      openssh.enable = true;
+    };
   };
 
   home.username = "${unixName}";
diff --git a/home/david/configurations/Tytonidae/niri/default.nix b/home/david/configurations/Tytonidae/niri/default.nix
deleted file mode 100644
index f019883..0000000
--- a/home/david/configurations/Tytonidae/niri/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  youthlic.programs.niri = {
-    enable = true;
-    config = ./config.kdl;
-  };
-}
diff --git a/home/david/configurations/Tytonidae/wluma/default.nix b/home/david/configurations/Tytonidae/wluma/default.nix
deleted file mode 100644
index 50a5098..0000000
--- a/home/david/configurations/Tytonidae/wluma/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  youthlic.programs.wluma.config = ./config.toml;
-}
diff --git a/home/david/modules/programs/default.nix b/home/david/modules/programs/default.nix
index 29f07f6..4d84c73 100644
--- a/home/david/modules/programs/default.nix
+++ b/home/david/modules/programs/default.nix
@@ -2,5 +2,7 @@
 {
   imports = [
     ./openssh.nix
+    ./niri
+    ./wluma
   ];
 }
diff --git a/home/david/configurations/Tytonidae/niri/config.kdl b/home/david/modules/programs/niri/config.kdl
similarity index 100%
rename from home/david/configurations/Tytonidae/niri/config.kdl
rename to home/david/modules/programs/niri/config.kdl
diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix
new file mode 100644
index 0000000..b9bde1c
--- /dev/null
+++ b/home/david/modules/programs/niri/default.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+let
+  cfg = config.david.programs.niri;
+in
+{
+  options = {
+    david.programs.niri = {
+      enable = lib.mkEnableOption "niri";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    youthlic.programs.niri = {
+      enable = true;
+      config = ./config.kdl;
+    };
+    david.programs.wluma.enable = true;
+  };
+}
diff --git a/home/david/configurations/Tytonidae/wluma/config.toml b/home/david/modules/programs/wluma/config.toml
similarity index 100%
rename from home/david/configurations/Tytonidae/wluma/config.toml
rename to home/david/modules/programs/wluma/config.toml
diff --git a/home/david/modules/programs/wluma/default.nix b/home/david/modules/programs/wluma/default.nix
new file mode 100644
index 0000000..648ebb5
--- /dev/null
+++ b/home/david/modules/programs/wluma/default.nix
@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+let
+  cfg = config.david.programs.wluma;
+in
+{
+  options = {
+    david.programs.wluma = {
+      enable = lib.mkEnableOption "wluma";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    youthlic.programs.wluma.config = ./config.toml;
+  };
+}
diff --git a/home/modules/programs/firefox.nix b/home/modules/programs/firefox.nix
index f16f017..269fac4 100644
--- a/home/modules/programs/firefox.nix
+++ b/home/modules/programs/firefox.nix
@@ -34,7 +34,7 @@ in
         ];
         search = {
           force = true;
-          default = "DuckDuckGo";
+          default = "ddg";
           engines = {
             "Nix Packages" = {
               urls = [
@@ -131,8 +131,8 @@ in
               ];
               definedAliases = [ "nw" ];
             };
-            "Bing".metaData.hidden = true;
-            "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
+            "bing".metaData.hidden = true;
+            "google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
           };
         };
       };
diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix
index d847e1a..3d7a8cc 100644
--- a/nixos/configurations/Akun/default.nix
+++ b/nixos/configurations/Akun/default.nix
@@ -22,7 +22,7 @@
       kanata.enable = true;
       tailscale.enable = true;
     };
-    gui.enabled = "cosmic";
+    gui.enabled = "niri";
   };
   programs.gnupg.agent = {
     enable = true;
diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix
index 8f14f77..77e1aa7 100644
--- a/nixos/modules/gui/niri.nix
+++ b/nixos/modules/gui/niri.nix
@@ -19,37 +19,45 @@ in
       kdePackages.qt6ct
       libsForQt5.qt5ct
     ];
-    xdg.mime = {
-      enable = true;
-      defaultApplications = {
-        "inode/directory" = [
-          "com.system76.CosmicFiles.desktop"
-        ];
-        "x-scheme-handler/about" = [
-          "firefox.desktop"
-          "chromium-browser.desktop"
-        ];
-        "x-scheme-handler/ftp" = [
-          "firefox.desktop"
-          "chromium-browser.desktop"
-        ];
-        "x-scheme-handler/http" = [
-          "firefox.desktop"
-          "chromium-browser.desktop"
-        ];
-        "x-scheme-handler/https" = [
-          "firefox.desktop"
-          "chromium-browser.desktop"
-        ];
-        "x-scheme-handler/mailto" = [
-          "firefox.desktop"
-          "chromium-browser.desktop"
-        ];
-        "x-scheme-handler/tg" = [ "telegramdesktop.desktop" ];
-        "x-scheme-handler/unknown" = [
-          "firefox.desktop"
-          "chromium-browser.desktop"
-        ];
+    xdg = {
+      terminal-exec = {
+        enable = true;
+        settings = {
+          default = [ "com.mitchellh.ghostty.desktop" ];
+        };
+      };
+      mime = {
+        enable = true;
+        defaultApplications = {
+          "inode/directory" = [
+            "com.system76.CosmicFiles.desktop"
+          ];
+          "x-scheme-handler/about" = [
+            "firefox.desktop"
+            "chromium-browser.desktop"
+          ];
+          "x-scheme-handler/ftp" = [
+            "firefox.desktop"
+            "chromium-browser.desktop"
+          ];
+          "x-scheme-handler/http" = [
+            "firefox.desktop"
+            "chromium-browser.desktop"
+          ];
+          "x-scheme-handler/https" = [
+            "firefox.desktop"
+            "chromium-browser.desktop"
+          ];
+          "x-scheme-handler/mailto" = [
+            "firefox.desktop"
+            "chromium-browser.desktop"
+          ];
+          "x-scheme-handler/tg" = [ "telegramdesktop.desktop" ];
+          "x-scheme-handler/unknown" = [
+            "firefox.desktop"
+            "chromium-browser.desktop"
+          ];
+        };
       };
     };
     hardware.bluetooth = {