diff --git a/flake.lock b/flake.lock
index 899d73c..404e72a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -62,16 +62,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1764034279,
+        "narHash": "sha256-hZH6EHQYFifVg0bmSBYT8Art5BWhXBXE307uPLnexY0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "381f4f8a3a5f773cb80d2b7eb8f8d733b8861434",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -144,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762049192,
-        "narHash": "sha256-4zTar274c7NXC3WA8UFXrRfFp/Clo7dixyogMJcHXw0=",
+        "lastModified": 1763776632,
+        "narHash": "sha256-mvumw4Djwi6BgMKVKw5cpNt8a80+h/LvPy2AHOtzBzE=",
         "owner": "infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e8092a7c5eb7f03612bd9eaff5d57652dfe0e7a8",
+        "rev": "e6d3b589d9f1f869e68142f44654e59fcb47390c",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1762267440,
-        "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=",
+        "lastModified": 1762847253,
+        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15",
+        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
         "type": "github"
       },
       "original": {
@@ -176,26 +176,26 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761999846,
-        "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
+        "lastModified": 1764012089,
+        "narHash": "sha256-PYDIWCOzz7UV67mrQWaaLbywLu3OhpsazJipwH8+JYs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
+        "rev": "1dcdcf9efc6aed8bf28347c0bfa583ba511954ae",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-25.05",
+        "ref": "25.11-beta",
         "type": "indirect"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1762156382,
-        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
+        "lastModified": 1763934636,
+        "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
+        "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
     },
     "nixpkgs-yet-unstabler": {
       "locked": {
-        "lastModified": 1762303136,
-        "narHash": "sha256-q5ZOlym6bMVxrqnKoKtifqdcSB89Ei5IZWkEkJexUU0=",
+        "lastModified": 1764066831,
+        "narHash": "sha256-acVdfPqceV0TEODo0G+zEPbAzYXK728RCB8ylostgHk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "353b4f16307b7a46fe4c0de82a2f55e0892ea50c",
+        "rev": "8798c05533731dc25d3eb0c21e37a4a972b8df4d",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742203788,
-        "narHash": "sha256-nRqyf+msCPEXvvXF6bvfiYH/B089dqWPc7ljRXieA7g=",
+        "lastModified": 1684092181,
+        "narHash": "sha256-Oi6G8Jx2RkEMi3UndtAnZw61hfgKGEe7l/ILdB9ump4=",
         "ref": "refs/heads/master",
-        "rev": "c4e353e745b4012feb75dd1c4405a71f6318ed02",
-        "revCount": 51,
+        "rev": "028ed8774d1cf4650fc15253146cf14451eb608c",
+        "revCount": 43,
         "type": "git",
         "url": "file:///home/h7x4/git/osuchan-line-bot"
       },
@@ -262,11 +262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "lastModified": 1764021963,
+        "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0fad6cc..4eed14e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,13 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs.url = "nixpkgs/25.11-beta";
     # nixpkgs.url = "nixpkgs/nixos-unstable";
     nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
     nixpkgs-yet-unstabler.url = "github:NixOS/nixpkgs/master";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
-      # url = "github:nix-community/home-manager/master";
+      # url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home/breakerbox.nix b/home/breakerbox.nix
index 81989c0..727e013 100644
--- a/home/breakerbox.nix
+++ b/home/breakerbox.nix
@@ -9,7 +9,9 @@ in
 
     ./programs/nix.nix
 
+    ./programs/ahoviewer.nix
     ./programs/alacritty.nix
+    ./programs/anki.nix
     ./programs/anyrun
     ./programs/aria2.nix
     ./programs/atuin.nix
@@ -19,9 +21,12 @@ in
     ./programs/bottom.nix
     ./programs/cargo.nix
     # ./programs/comma.nix
+    ./programs/delta.nix
     ./programs/direnv
+    ./programs/element-desktop.nix
     ./programs/emacs
     ./programs/eza.nix
+    ./programs/fastfetch.nix
     ./programs/feh.nix
     ./programs/firefox.nix
     ./programs/fzf.nix
@@ -36,17 +41,22 @@ in
     ./programs/jq.nix
     ./programs/less.nix
     ./programs/man.nix
+    ./programs/meli.nix
     ./programs/mpv.nix
     ./programs/ncmpcpp.nix
+    ./programs/neomutt.nix
     ./programs/neovim
     ./programs/newsboat
     ./programs/nix-index
     ./programs/nushell.nix
+    ./programs/nyxt.nix
     ./programs/obs-studio.nix
+    ./programs/obsidian.nix
     ./programs/pandoc.nix
     ./programs/prism-launcher.nix
     ./programs/python.nix
     ./programs/qutebrowser.nix
+    ./programs/rclone.nix
     ./programs/ripgrep.nix
     ./programs/rofi
     ./programs/skim.nix
@@ -99,6 +109,7 @@ in
   # programs.comma.enable = true;
   programs.direnv.enable = true;
   programs.eza.enable = true;
+  programs.fastfetch.enable = true;
   programs.fzf.enable = true;
   programs.gdb.enable = true;
   programs.gh-dash.enable = true;
@@ -111,11 +122,14 @@ in
   programs.jq.enable = true;
   programs.less.enable = true;
   programs.man.enable = true;
+  programs.meli.enable = true;
+  programs.neomutt.enable = true;
   programs.neovim.enable = true;
   programs.nix-index.enable = true;
   programs.nushell.enable = true;
   programs.pandoc.enable = true;
   programs.python.enable = true;
+  programs.rclone.enable = true;
   programs.ripgrep.enable = true;
   programs.skim.enable = true;
   programs.sqlite.enable = true;
@@ -132,14 +146,19 @@ in
 
   gtk.enable = graphics;
 
+  programs.ahoviewer.enable = graphics;
   programs.alacritty.enable = graphics;
+  programs.anki.enable = graphics;
+  programs.element-desktop.enable = graphics;
   programs.emacs.enable = graphics;
   programs.feh.enable = graphics;
   programs.firefox.enable = graphics;
   programs.mpv.enable = graphics;
   programs.ncmpcpp.enable = graphics;
   programs.newsboat.enable = graphics;
+  programs.nyxt.enable = graphics;
   programs.obs-studio.enable = graphics;
+  programs.obsidian.enable = graphics;
   programs.prism-launcher.enable = graphics;
   programs.qutebrowser.enable = graphics;
   programs.rofi.enable = graphics;
diff --git a/home/modules/services/mpd.nix b/home/modules/services/mpd.nix
index d560104..ce0ba15 100644
--- a/home/modules/services/mpd.nix
+++ b/home/modules/services/mpd.nix
@@ -37,7 +37,7 @@ in
       Service = {
         Type = "oneshot";
         Slice = "background.slice";
-        ExecStart = "${lib.getExe pkgs.mpc-cli} update --wait";
+        ExecStart = "${lib.getExe pkgs.mpc} update --wait";
 
         PrivateUsers = true;
         ProtectSystem = true;
diff --git a/home/packages.nix b/home/packages.nix
index 6cc5151..c510d4b 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -35,11 +35,9 @@
     lurk
     mdcat
     mediainfo
-    meli
     mkvtoolnix
     mmv
     mtr
-    neofetch
     nix-diff
     nix-output-monitor
     nix-tree
@@ -52,12 +50,10 @@
     pipr
     progress
     pwntools
-    rclone
     rip2
     rnr
     rsync
     # sc-im
-    skim
     slack-term
     tea
     terminal-parrot
@@ -87,15 +83,12 @@
     xorg.xprop
   ] ++ (
     lib.optionals (!machineVars.headless) [
-      ahoviewer
       alsa-utils
-      anki
       kdePackages.ark
       calibre
       cool-retro-term
       darktable
       yet-unstabler-pkgs.discord
-      element-desktop
       foliate
       geogebra
       ghidra
@@ -115,16 +108,14 @@
       libreoffice
       light
       mission-center
-      mopidy
-      mopidy-mpd
-      mopidy-soundcloud
-      mopidy-youtube
-      mpc_cli
+      # mopidy
+      # mopidy-mpd
+      # mopidy-soundcloud
+      # mopidy-youtube
+      mpc
       mumble
       naps2
       nsxiv
-      nyxt
-      obsidian
       pdfarranger
       pwvucontrol
       # scrcpy
@@ -164,7 +155,7 @@
       steam
       steam-tui
       stepmania
-      taisei
+      # taisei
     ] ++ lib.optionals (machineName != "dosei") [
       # Source blocked by external firewall on dosei
       pcloud
diff --git a/home/programs/ahoviewer.nix b/home/programs/ahoviewer.nix
new file mode 100644
index 0000000..ecb6c08
--- /dev/null
+++ b/home/programs/ahoviewer.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.ahoviewer = { };
+}
diff --git a/home/programs/anki.nix b/home/programs/anki.nix
new file mode 100644
index 0000000..4d8e5e3
--- /dev/null
+++ b/home/programs/anki.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.anki = { };
+}
diff --git a/home/programs/delta.nix b/home/programs/delta.nix
new file mode 100644
index 0000000..395d16e
--- /dev/null
+++ b/home/programs/delta.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  programs.delta = {
+    enableGitIntegration = true;
+    options = {
+      line-numbers = true;
+      side-by-side = true;
+      theme = "Monokai Extended Origin";
+    };
+  };
+}
diff --git a/home/programs/element-desktop.nix b/home/programs/element-desktop.nix
new file mode 100644
index 0000000..24c3b2d
--- /dev/null
+++ b/home/programs/element-desktop.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.element-desktop = { };
+}
diff --git a/home/programs/fastfetch.nix b/home/programs/fastfetch.nix
new file mode 100644
index 0000000..fc30839
--- /dev/null
+++ b/home/programs/fastfetch.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.fastfetch = { };
+}
diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix
index 0d6f047..a44f6ee 100644
--- a/home/programs/git/default.nix
+++ b/home/programs/git/default.nix
@@ -18,9 +18,6 @@ lib.mkIf cfg.enable {
     {
       package = pkgs.gitFull;
 
-      userName = "h7x4";
-      userEmail = "h7x4@nani.wtf";
-
       signing = {
         key = "46B9228E814A2AAC";
         # format = "openpgp";
@@ -31,86 +28,82 @@ lib.mkIf cfg.enable {
 
       lfs.enable = true;
 
-      delta = {
-        enable = true;
-        options = {
-          line-numbers = true;
-          side-by-side = true;
-          theme = "Monokai Extended Origin";
+      settings = {
+        user = {
+          name = "h7x4";
+          email = "h7x4@nani.wtf";
         };
-      };
 
-      aliases = {
-        aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'";
-        authors = "shortlog --summary --numbered --email";
-        delete-merged = "!git branch --merged | grep -v -e '\\*' -e 'master' -e 'main' | xargs -n 1 git branch -d";
-        ff = "fixup-fixup";
-        fi = "fixup-interactive";
-        forcepush = "push --force-with-lease --force-if-includes";
-        git = "!git";
-        pp = "post-pr";
-        rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\"";
-        reset-to-upstream = "!git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
-        rf = "rebase-fixups";
-        si = "switch-interactive";
-        subs = "submodule update --init --recursive";
-      } // (let
-        c = c: s: "%C(${c})${s}%C(reset)";
-      in {
-        graph = let
-          fmt = lib.concatStringsSep "" [
-            " - "
-            (c "bold blue" "%h")
-            " - "
-            (c "bold green" "(%ar)")
-            " "
-            (c "white" "> %s")
-            " "
-            (c "dim white" "- %an")
-            (c "bold yellow" "%d")
-          ];
-        in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
+        alias = {
+          aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'";
+          authors = "shortlog --summary --numbered --email";
+          delete-merged = "!git branch --merged | grep -v -e '\\*' -e 'master' -e 'main' | xargs -n 1 git branch -d";
+          ff = "fixup-fixup";
+          fi = "fixup-interactive";
+          forcepush = "push --force-with-lease --force-if-includes";
+          git = "!git";
+          pp = "post-pr";
+          rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\"";
+          reset-to-upstream = "!git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
+          rf = "rebase-fixups";
+          si = "switch-interactive";
+          subs = "submodule update --init --recursive";
+        } // (let
+          c = c: s: "%C(${c})${s}%C(reset)";
+        in {
+          graph = let
+            fmt = lib.concatStringsSep "" [
+              " - "
+              (c "bold blue" "%h")
+              " - "
+              (c "bold green" "(%ar)")
+              " "
+              (c "white" "> %s")
+              " "
+              (c "dim white" "- %an")
+              (c "bold yellow" "%d")
+            ];
+          in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
 
-        graphv = let
-          fmt = lib.concatStringsSep "" [
-            (c "bold blue" "%h")
-            " - "
-            (c "bold cyan" "%aD")
-            " "
-            (c "bold green" "(%ar)")
-            (c "bold yellow" "%d")
-            "%n"
-            "          "
-            (c "white" "%s")
-            " "
-            (c "dim white" "- %an")
-          ];
-        in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
+          graphv = let
+            fmt = lib.concatStringsSep "" [
+              (c "bold blue" "%h")
+              " - "
+              (c "bold cyan" "%aD")
+              " "
+              (c "bold green" "(%ar)")
+              (c "bold yellow" "%d")
+              "%n"
+              "          "
+              (c "white" "%s")
+              " "
+              (c "dim white" "- %an")
+            ];
+          in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
 
-        l = let
-          fmt = lib.concatStringsSep "%n" (map (x: if builtins.isList x then lib.concatStringsSep " " x else x) [
-            [ (c "bold yellow" "%H") (c "auto" "%d") ]
-            [ (c "bold white" "Author:") (c "bold cyan" "%aN <%aE>") (c "bold green" "(%ah)") ]
-            [ (c "bold white" "Committer:") (c "bold cyan" "%cN <%cE>") (c "bold green" "(%ah)") ]
-            [ (c "bold white" "GPG: (%G?)") (c "bold magenta" "%GF") "-" (c "bold cyan" "%GS") (c "bold blue" "(%GT) ") ]
-            ""
-            (c "bold white" "# %s")
-            "%+b"
-            (c "dim yellow" "%+N")
-          ]);
-          # sedExpressions = let
-          #   colorExpr = "\\x1B\\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]";
-          #   colorEndExpr = "\\x1B\\[m";
-          #   colored = x: "${colorExpr}${x}${colorEndExpr}";
-          # in lib.concatMapStringsSep " " (x: "-e '${x}'") [
-          #   "s|${colored "GPG: \\(N\\)"} ${colored "F3CDA86CC55A9F10D7A069819F2F7D8250F35146"} - ${colored "h7x4 <h7x4@nani.wtf>"} ${colored "\\(ultimate\\)"}|GPG: h7x4|"
-          #   "s|${colored "GPG: \\(N\\)"} ${colored ""} - ${colored ""} ${colored "\\(undefined\\)"}||"
-          # ];
-        in "log --decorate --format=tformat:'${fmt}'";
-        # in "!git log --color=always --format=format:'${fmt}' | sed -E ${sedExpressions} | $PAGER";
-      });
+          l = let
+            fmt = lib.concatStringsSep "%n" (map (x: if builtins.isList x then lib.concatStringsSep " " x else x) [
+              [ (c "bold yellow" "%H") (c "auto" "%d") ]
+              [ (c "bold white" "Author:") (c "bold cyan" "%aN <%aE>") (c "bold green" "(%ah)") ]
+              [ (c "bold white" "Committer:") (c "bold cyan" "%cN <%cE>") (c "bold green" "(%ah)") ]
+              [ (c "bold white" "GPG: (%G?)") (c "bold magenta" "%GF") "-" (c "bold cyan" "%GS") (c "bold blue" "(%GT) ") ]
+              ""
+              (c "bold white" "# %s")
+              "%+b"
+              (c "dim yellow" "%+N")
+            ]);
+            # sedExpressions = let
+            #   colorExpr = "\\x1B\\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]";
+            #   colorEndExpr = "\\x1B\\[m";
+            #   colored = x: "${colorExpr}${x}${colorEndExpr}";
+            # in lib.concatMapStringsSep " " (x: "-e '${x}'") [
+            #   "s|${colored "GPG: \\(N\\)"} ${colored "F3CDA86CC55A9F10D7A069819F2F7D8250F35146"} - ${colored "h7x4 <h7x4@nani.wtf>"} ${colored "\\(ultimate\\)"}|GPG: h7x4|"
+            #   "s|${colored "GPG: \\(N\\)"} ${colored ""} - ${colored ""} ${colored "\\(undefined\\)"}||"
+            # ];
+          in "log --decorate --format=tformat:'${fmt}'";
+          # in "!git log --color=always --format=format:'${fmt}' | sed -E ${sedExpressions} | $PAGER";
+        });
 
-      extraConfig = {
         core = {
           whitespace = lib.concatStringsSep "," [
             "space-before-tab"
@@ -278,7 +271,7 @@ lib.mkIf cfg.enable {
         ];
       in lib.genAttrs organizations (org: map (uri-prefix: "${uri-prefix}${org}") uri-prefixes);
     in {
-      extraConfig."url \"${lib.head uri-prefixes}\"".insteadOf = lib.tail uri-prefixes;
+      settings."url \"${lib.head uri-prefixes}\"".insteadOf = lib.tail uri-prefixes;
 
       includes = map (x: {
         contentSuffix = "pvv.gitconfig";
diff --git a/home/programs/hyprland/keybinds.nix b/home/programs/hyprland/keybinds.nix
index 75475f9..2c54dce 100644
--- a/home/programs/hyprland/keybinds.nix
+++ b/home/programs/hyprland/keybinds.nix
@@ -75,10 +75,10 @@ in
       ];
 
       bindl = [
-        "$mod, p, exec, ${exe pkgs.mpc_cli} toggle"
-        ",XF86AudioPlay, exec, ${exe pkgs.mpc_cli} toggle"
-        ",XF86AudioPrev, exec, ${exe pkgs.mpc_cli} prev"
-        ",XF86AudioNext, exec, ${exe pkgs.mpc_cli} next"
+        "$mod, p, exec, ${exe pkgs.mpc} toggle"
+        ",XF86AudioPlay, exec, ${exe pkgs.mpc} toggle"
+        ",XF86AudioPrev, exec, ${exe pkgs.mpc} prev"
+        ",XF86AudioNext, exec, ${exe pkgs.mpc} next"
       ];
 
       bindle = [
diff --git a/home/programs/less.nix b/home/programs/less.nix
index b095116..86402b2 100644
--- a/home/programs/less.nix
+++ b/home/programs/less.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   programs.less = {
-    keys = ''
+    config = ''
       #env
       LESS = -i -R
       LESSHISTSIZE=20000
diff --git a/home/programs/meli.nix b/home/programs/meli.nix
new file mode 100644
index 0000000..271b4a1
--- /dev/null
+++ b/home/programs/meli.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  programs.meli = {
+    package = pkgs.meli.overrideAttrs {
+      doCheck = false;
+    };
+  };
+}
diff --git a/home/programs/neomutt.nix b/home/programs/neomutt.nix
new file mode 100644
index 0000000..0b3dcd4
--- /dev/null
+++ b/home/programs/neomutt.nix
@@ -0,0 +1,29 @@
+{ config, lib, ... }:
+let
+  cfg = config.programs.neomutt;
+in lib.mkIf cfg.enable {
+  programs.neomutt = {
+    # vimKeys = true;
+    # set mailcap_path = ~/.config/neomutt/mailcap
+    # set header_cache = "~/.cache/mutt"
+    # set message_cachedir = "~/.cache/mutt"
+    # set tmpdir = /run/user/${uid}/mutt
+
+    # extraConfig = ''
+    #   # vim: filetype=muttrc
+    # '';
+  };
+
+  xdg.configFile."neomutt/mailcap".text = ''
+    # vim: filetype=muttrc
+
+    text/plain; nvim %s
+
+    #PDFs
+    application/pdf; zathura %s pdf
+
+    #Images
+    image/png; feh %s
+    image/jpeg; feh %s
+  '';
+}
diff --git a/home/programs/nyxt.nix b/home/programs/nyxt.nix
new file mode 100644
index 0000000..f0009af
--- /dev/null
+++ b/home/programs/nyxt.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.nyxt = { };
+}
diff --git a/home/programs/obsidian.nix b/home/programs/obsidian.nix
new file mode 100644
index 0000000..ababa03
--- /dev/null
+++ b/home/programs/obsidian.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.obsidian = { };
+}
diff --git a/home/programs/rclone.nix b/home/programs/rclone.nix
new file mode 100644
index 0000000..c58a2db
--- /dev/null
+++ b/home/programs/rclone.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.rclone = { };
+}
diff --git a/home/programs/ssh/default.nix b/home/programs/ssh/default.nix
index 549f288..6ff6555 100644
--- a/home/programs/ssh/default.nix
+++ b/home/programs/ssh/default.nix
@@ -23,9 +23,11 @@ in
         "${config.home.homeDirectory}/.ssh/mutable_config"
       ];
 
-      controlMaster = "auto";
-      controlPersist = "10m";
-      controlPath = "${controlMastersDir}/%n%C";
+      matchBlocks."*" = {
+        controlMaster = "auto";
+        controlPersist = "10m";
+        controlPath = "${controlMastersDir}/%n%C";
+      };
     };
 
     systemd.user.tmpfiles.settings."10-ssh" = {
diff --git a/home/programs/tmux/default.nix b/home/programs/tmux/default.nix
index 46f4968..900797f 100644
--- a/home/programs/tmux/default.nix
+++ b/home/programs/tmux/default.nix
@@ -37,7 +37,7 @@
       });
       mpd-status = (pkgs.writeShellApplication {
         name = "tmux-mpd-status";
-        runtimeInputs = with pkgs; [ mpc-cli gawk gnugrep ];
+        runtimeInputs = with pkgs; [ mpc gawk gnugrep ];
         text = fileContentsWithoutShebang ./scripts/mpd-status.sh;
       });
     in ''
diff --git a/home/programs/tmux/scripts/mpd-status.sh b/home/programs/tmux/scripts/mpd-status.sh
index 9193a4d..5f048b3 100755
--- a/home/programs/tmux/scripts/mpd-status.sh
+++ b/home/programs/tmux/scripts/mpd-status.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i sh -p mpc-cli gawk gnugrep
+#!nix-shell -i sh -p mpc gawk gnugrep
 
 while true; do
   MPC_OUTPUT=$(mpc --format '[[%artist% - ]%title%]|[%file%]')
diff --git a/home/programs/xmobar/default.nix b/home/programs/xmobar/default.nix
index e3c46e9..0059547 100644
--- a/home/programs/xmobar/default.nix
+++ b/home/programs/xmobar/default.nix
@@ -12,7 +12,7 @@ in {
     ];
 
     mpd_status_script = pkgs.writeShellScript "mpd-status" ''
-      MPD_STATUS=$(${pkgs.mpc-cli}/bin/mpc 2>/dev/null | sed -n '2{p;q}' | cut -d ' ' -f1)
+      MPD_STATUS=$(${lib.getExe pkgs.mpc} 2>/dev/null | sed -n '2{p;q}' | cut -d ' ' -f1)
       case "$MPD_STATUS" in
         "[playing]")
           echo "<fn=2><fc=#00ff00>▶</fc></fn>"
diff --git a/home/programs/zsh/default.nix b/home/programs/zsh/default.nix
index 806e417..7268151 100644
--- a/home/programs/zsh/default.nix
+++ b/home/programs/zsh/default.nix
@@ -3,18 +3,18 @@ let
   cfg = config.programs.zsh;
 in
 lib.mkIf cfg.enable {
-  home.file."${cfg.dotDir}/.zshrc".onChange = ''
-    ${lib.getExe (pkgs.writeTextFile {
-      name = "zsh-compinit-oneshot.zsh";
-      executable = true;
-      destination = "/bin/zsh-compinit-oneshot.zsh";
-      text = ''
-        #!${lib.getExe cfg.package}
+  #home.file."${cfg.dotDir}/.zshrc".onChange = ''
+  #  ${lib.getExe (pkgs.writeTextFile {
+  #    name = "zsh-compinit-oneshot.zsh";
+  #    executable = true;
+  #    destination = "/bin/zsh-compinit-oneshot.zsh";
+  #    text = ''
+  #      #!${lib.getExe cfg.package}
 
-        autoload -Uz compinit && compinit -C -d "${config.xdg.cacheHome}/zsh/zcompdump-$ZSH_VERSION"
-      '';
-    })}
-  '';
+  #      autoload -Uz compinit && compinit -C -d "${config.xdg.cacheHome}/zsh/zcompdump-$ZSH_VERSION"
+  #    '';
+  #  })}
+  #'';
 
   systemd.user.tmpfiles.settings."10-zsh"."${config.xdg.cacheHome}/zsh".d = {
     mode = "0770";
@@ -22,7 +22,7 @@ lib.mkIf cfg.enable {
   };
 
   programs.zsh = {
-    dotDir = ".config/zsh";
+    dotDir = "${config.xdg.configHome}/zsh";
     # enableSyntaxHighlighting = true;
     defaultKeymap = "viins";
     enableCompletion = true;
diff --git a/home/services/sxhkd.nix b/home/services/sxhkd.nix
index b824b44..5d6cd7b 100644
--- a/home/services/sxhkd.nix
+++ b/home/services/sxhkd.nix
@@ -30,11 +30,11 @@ in
 
       # Music
 
-      "super + p" = "${pkgs.mpc_cli}/bin/mpc toggle";
+      "super + p" = "${lib.getExe pkgs.mpc} toggle";
 
-      "XF86AudioPlay" = "${pkgs.mpc_cli}/bin/mpc toggle";
-      "XF86AudioPrev" = "${pkgs.mpc_cli}/bin/mpc prev";
-      "XF86AudioNext" = "${pkgs.mpc_cli}/bin/mpc next";
+      "XF86AudioPlay" = "${lib.getExe pkgs.mpc} toggle";
+      "XF86AudioPrev" = "${lib.getExe pkgs.mpc} prev";
+      "XF86AudioNext" = "${lib.getExe pkgs.mpc} next";
 
       # Monitor
 
diff --git a/home/shell.nix b/home/shell.nix
index 7ebcf64..238745e 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -281,7 +281,7 @@ in {
         type = ";";
         alias = [
           ''echo "${extendedLib.termColors.front.red "Concatenating all pdfs in current directory to 'out.pdf'"}"''
-          "${pkgs.poppler_utils}/bin/pdfunite *.pdf out.pdf"
+          "${pkgs.poppler-utils}/bin/pdfunite *.pdf out.pdf"
         ];
       };
 
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index e592196..80a3883 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -144,7 +144,6 @@ in {
   services = {
     udev.packages = with pkgs; [
       yubikey-personalization
-      android-udev-rules
       light
     ];
   };
diff --git a/hosts/common/fonts.nix b/hosts/common/fonts.nix
index ba53cb3..1673679 100644
--- a/hosts/common/fonts.nix
+++ b/hosts/common/fonts.nix
@@ -21,7 +21,7 @@
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       ocr-a
       open-sans
       powerline-fonts
@@ -29,7 +29,7 @@
       source-sans
       symbola
       texlivePackages.asana-math
-      ubuntu_font_family
+      ubuntu-classic
       victor-mono
       yasashisa-gothic
     ];
diff --git a/hosts/common/nix.nix b/hosts/common/nix.nix
index 7bd1f1d..24f1535 100644
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@@ -37,7 +37,8 @@
       allowed-uris = [ "http://" "https://" ];
       binary-caches = [ "https://cache.nixos.org/" ];
       builders-use-substitutes = true;
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ];
+      auto-allocate-uids = true;
       log-lines = 50;
       trusted-users = [ "h7x4" ];
       allowed-users = [ "@users" ];
diff --git a/hosts/common/services/logind.nix b/hosts/common/services/logind.nix
index 507f721..6bab541 100644
--- a/hosts/common/services/logind.nix
+++ b/hosts/common/services/logind.nix
@@ -1,6 +1,6 @@
 { ... }:
 {
   services.logind = {
-    powerKeyLongPress = "poweroff";
+    settings.Login.HandlePowerKeyLongPress = "poweroff";
   };
 }
diff --git a/hosts/common/services/nixseparatedebuginfod.nix b/hosts/common/services/nixseparatedebuginfod.nix
index 5995c95..9e5f736 100644
--- a/hosts/common/services/nixseparatedebuginfod.nix
+++ b/hosts/common/services/nixseparatedebuginfod.nix
@@ -1,6 +1,3 @@
-{ config, ... }: {
-  services.nixseparatedebuginfod = {
-    enable = true;
-    nixPackage = config.nix.package;
-  };
+{ ... }: {
+  services.nixseparatedebuginfod2.enable = true;
 }
diff --git a/hosts/tsuki/services/nginx/default.nix b/hosts/tsuki/services/nginx/default.nix
index 11184d6..05e6543 100644
--- a/hosts/tsuki/services/nginx/default.nix
+++ b/hosts/tsuki/services/nginx/default.nix
@@ -36,7 +36,6 @@
     recommendedOptimisation = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
-    recommendedZstdSettings = true;
 
     appendConfig = ''
       pcre_jit on;
@@ -144,7 +143,7 @@
           '';
         };
       }
-      # (host ["www"] { root = "${inputs.website.packages.${pkgs.system}.default}/"; })
+      # (host ["www"] { root = "${inputs.website.packages.${pkgs.stdenv.hostPlatform.system}.default}/"; })
       (host ["testmap"] {
         root = "/var/lib/mcmap";
         quic = true;