diff --git a/flake.lock b/flake.lock
index 1a6bddb..5fac803 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,133 @@
 {
   "nodes": {
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "ref": "main",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16_2": {
+      "inputs": {
+        "fromYaml": "fromYaml_2"
+      },
+      "locked": {
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "ref": "main",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "materus-inputs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768818222,
+        "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "ref": "main",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "devshell_2": {
+      "inputs": {
+        "nixpkgs": [
+          "materus-inputs-unstable",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768818222,
+        "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "ref": "main",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "materus-inputs",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1775925499,
+        "narHash": "sha256-yDiy4gqHJyHe4gliPyNabgXTJKXfddKr91MENiAJ22k=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "d620f2831e367850fb9310849db3049587151ad1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
+    "emacs-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "materus-inputs-unstable",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_2"
+      },
+      "locked": {
+        "lastModified": 1775925499,
+        "narHash": "sha256-yDiy4gqHJyHe4gliPyNabgXTJKXfddKr91MENiAJ22k=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "d620f2831e367850fb9310849db3049587151ad1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -24,6 +152,28 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "materus-inputs",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "materus-inputs-unstable",
@@ -46,6 +196,28 @@
         "type": "github"
       }
     },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "materus-inputs-unstable",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -84,6 +256,90 @@
         "type": "github"
       }
     },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "fromYaml_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "git-agecrypt": {
+      "inputs": {
+        "flake-utils": [
+          "materus-inputs",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "materus-inputs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710176518,
+        "narHash": "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k=",
+        "owner": "vlaci",
+        "repo": "git-agecrypt",
+        "rev": "126be86c515466c5878a60561f754a9ab4af6ee8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vlaci",
+        "ref": "main",
+        "repo": "git-agecrypt",
+        "type": "github"
+      }
+    },
+    "git-agecrypt_2": {
+      "inputs": {
+        "flake-utils": [
+          "materus-inputs-unstable",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "materus-inputs-unstable",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710176518,
+        "narHash": "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k=",
+        "owner": "vlaci",
+        "repo": "git-agecrypt",
+        "rev": "126be86c515466c5878a60561f754a9ab4af6ee8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vlaci",
+        "ref": "main",
+        "repo": "git-agecrypt",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -92,11 +348,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775077333,
-        "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=",
+        "lastModified": 1775425411,
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
@@ -114,11 +370,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775139622,
-        "narHash": "sha256-/qfz8ZdwLuaO11ApSUsrgKQJVP/RehKo2u7YMfF4LCw=",
+        "lastModified": 1775900011,
+        "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "eb6f347055769a23967dda70cdc8b46f7d247ab9",
+        "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e",
         "type": "github"
       },
       "original": {
@@ -130,13 +386,20 @@
     },
     "materus-inputs": {
       "inputs": {
+        "base16": "base16",
+        "devshell": "devshell",
+        "emacs-overlay": "emacs-overlay",
         "flake-utils": "flake-utils",
+        "git-agecrypt": "git-agecrypt",
         "home-manager": "home-manager",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixerus": "nixerus",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nur": "nur_2",
+        "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix"
       },
       "locked": {
@@ -151,13 +414,20 @@
     },
     "materus-inputs-unstable": {
       "inputs": {
+        "base16": "base16_2",
+        "devshell": "devshell_2",
+        "emacs-overlay": "emacs-overlay_2",
         "flake-utils": "flake-utils_2",
+        "git-agecrypt": "git-agecrypt_2",
         "home-manager": "home-manager_2",
         "nix-vscode-extensions": "nix-vscode-extensions_2",
         "nixerus": "nixerus_2",
+        "nixos-hardware": "nixos-hardware_2",
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
+        "nur": "nur_4",
+        "plasma-manager": "plasma-manager_2",
         "sops-nix": "sops-nix_2"
       },
       "locked": {
@@ -178,11 +448,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775098553,
-        "narHash": "sha256-OFWIVY1vzAbPE73ksKAMsFh11AXZ3MjIymRQ90Butnc=",
+        "lastModified": 1775875897,
+        "narHash": "sha256-/6yiKV+yW1b1bvM5QxfAovW5nu7JHMfW+1HTCBchrlk=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "361b17a5b2f4536a119c794a367a29b07691f941",
+        "rev": "517e9639fc0830315bb88af02d5dcacfb96aa342",
         "type": "github"
       },
       "original": {
@@ -200,11 +470,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775098553,
-        "narHash": "sha256-OFWIVY1vzAbPE73ksKAMsFh11AXZ3MjIymRQ90Butnc=",
+        "lastModified": 1775875897,
+        "narHash": "sha256-/6yiKV+yW1b1bvM5QxfAovW5nu7JHMfW+1HTCBchrlk=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "361b17a5b2f4536a119c794a367a29b07691f941",
+        "rev": "517e9639fc0830315bb88af02d5dcacfb96aa342",
         "type": "github"
       },
       "original": {
@@ -251,7 +521,7 @@
           "materus-inputs-unstable",
           "nixpkgs"
         ],
-        "nur": "nur_2"
+        "nur": "nur_3"
       },
       "locked": {
         "lastModified": 1767995196,
@@ -268,6 +538,38 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1775490113,
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixos-hardware_2": {
+      "locked": {
+        "lastModified": 1775490113,
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1755615617,
@@ -284,13 +586,45 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1775036866,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -301,6 +635,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1741173522,
+        "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1755615617,
         "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
@@ -316,13 +666,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1775002709,
-        "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=",
+        "lastModified": 1741173522,
+        "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -353,7 +719,28 @@
     "nur_2": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1769756556,
+        "narHash": "sha256-gvLoC2HohFNtIAVEvBWSMacBH3sZdvhIPiF75hR2cO4=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "7f4366be821b64f130c08dd47cbc22cad3003d97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "nur_3": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1756145408,
@@ -368,11 +755,84 @@
         "type": "indirect"
       }
     },
+    "nur_4": {
+      "inputs": {
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_4",
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1769756556,
+        "narHash": "sha256-gvLoC2HohFNtIAVEvBWSMacBH3sZdvhIPiF75hR2cO4=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "7f4366be821b64f130c08dd47cbc22cad3003d97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "materus-inputs",
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "materus-inputs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775856943,
+        "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "trunk",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
+    "plasma-manager_2": {
+      "inputs": {
+        "home-manager": [
+          "materus-inputs-unstable",
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "materus-inputs-unstable",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775856943,
+        "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "trunk",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "materus-inputs": "materus-inputs",
         "materus-inputs-unstable": "materus-inputs-unstable",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
@@ -384,11 +844,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774910634,
-        "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
+        "lastModified": 1775682595,
+        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
+        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
         "type": "github"
       },
       "original": {
@@ -406,11 +866,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774910634,
-        "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
+        "lastModified": 1775682595,
+        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
+        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
         "type": "github"
       },
       "original": {
@@ -449,6 +909,50 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "materus-inputs",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "materus-inputs-unstable",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 28bbf2b..13d517c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,6 +63,7 @@
           materusArgs = {
             inherit files;
             inherit arch;
+            inherit self;
             inputs = inp;
             flake-path = path;
             host-path = path + "/nix-config/host/${host}";
@@ -102,6 +103,7 @@
           materusArgs = {
             inherit files;
             inherit arch;
+            inherit self;
             inputs = inp;
             flake-path = path;
             home-path = path + "/nix-config/home/${user}";
diff --git a/nix-config/host/materusPC/configuration.nix b/nix-config/host/materusPC/configuration.nix
index 9851c1e..be14286 100644
--- a/nix-config/host/materusPC/configuration.nix
+++ b/nix-config/host/materusPC/configuration.nix
@@ -140,8 +140,8 @@ in
     PATH = [ "\${XDG_BIN_HOME}" ];
   };
   environment.shellInit = ''
-    if ! [ -z "$DISPLAY" ]; then xhost +si:localuser:root &> /dev/null; fi;
-    if ! [ -z "$DISPLAY" ]; then xhost +si:localuser:$USER &> /dev/null; fi;
+    if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
+    if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
   '';
   i18n.inputMethod.enabled = "fcitx5";
   i18n.inputMethod.fcitx5.addons = [
@@ -294,5 +294,7 @@ in
     AllowSuspendThenHibernate=no
   '';
   
+
+
   system.stateVersion = "25.11";
 }
diff --git a/nix-config/host/materusPC/hardware-configuration.nix b/nix-config/host/materusPC/hardware-configuration.nix
index d82d7b0..781130f 100644
--- a/nix-config/host/materusPC/hardware-configuration.nix
+++ b/nix-config/host/materusPC/hardware-configuration.nix
@@ -155,6 +155,11 @@ in
   };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  services.udev.extraRules = ''
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x744c", ATTR{power/control}="on"
+  '';
+
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   hardware.sane.enable = true;
diff --git a/nix-config/host/materusPC/services.nix b/nix-config/host/materusPC/services.nix
index 77fb55f..8e4fa7a 100644
--- a/nix-config/host/materusPC/services.nix
+++ b/nix-config/host/materusPC/services.nix
@@ -110,7 +110,6 @@
   services.wivrn = {
     enable = true;
     openFirewall = true;
-    defaultRuntime = true;
   };
   #endregion
 }
diff --git a/nix-config/shared/default.nix b/nix-config/shared/default.nix
index 1c3e9a3..27a88a8 100644
--- a/nix-config/shared/default.nix
+++ b/nix-config/shared/default.nix
@@ -14,6 +14,7 @@ isHm:
 
   imports = [
     (import ./nvim.nix isHm)
+    ./nix.nix
   ];
   config.mkk.var = import ./private/variables.nix;
   config._module.args.mkk = config.mkk.var;
diff --git a/nix-config/shared/nix.nix b/nix-config/shared/nix.nix
index 4ad9f47..c6a7138 100644
--- a/nix-config/shared/nix.nix
+++ b/nix-config/shared/nix.nix
@@ -1,78 +1,130 @@
-{...}:{
-config.nix.package = lib.mkDefault  pkgs.nixVersions.latest;
-  config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {
+{
+  materusArgs,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config.nix.package = lib.mkDefault pkgs.nixVersions.latest;
+  config.nix.registry = {
     nixpkgs-stable = {
-      from = { type = "indirect"; id = "nixpkgs-stable"; };
-      flake = materusCfg.materusFlake.inputs.nixpkgs-stable;
+      from = {
+        type = "indirect";
+        id = "nixpkgs-stable";
+      };
+      flake = materusArgs.self.inputs.nixpkgs;
     };
     nixpkgs-unstable = {
-      from = { type = "indirect"; id = "nixpkgs-unstable"; };
-      flake = materusCfg.materusFlake.inputs.nixpkgs;
+      from = {
+        type = "indirect";
+        id = "nixpkgs-unstable";
+      };
+      flake = materusArgs.self.inputs.nixpkgs-unstable;
     };
 
     nixpkgs = {
-      from = { type = "indirect"; id = "nixpkgs"; };
-      flake = materusCfg.configInputs.nixpkgs;
+      from = {
+        type = "indirect";
+        id = "nixpkgs";
+      };
+      flake = materusArgs.inputs.nixpkgs;
     };
 
     emacs-overlay = {
-      from = { type = "indirect"; id = "emacs-overlay"; };
-      flake = materusCfg.configInputs.emacs-overlay;
+      from = {
+        type = "indirect";
+        id = "emacs-overlay";
+      };
+      flake = materusArgs.inputs.emacs-overlay;
     };
 
     flake-utils = {
-      from = { type = "indirect"; id = "flake-utils"; };
-      flake = materusCfg.configInputs.flake-utils;
+      from = {
+        type = "indirect";
+        id = "flake-utils";
+      };
+      flake = materusArgs.inputs.flake-utils;
     };
 
     nixos-hardware = {
-      from = { type = "indirect"; id = "nixos-hardware"; };
-      flake = materusCfg.configInputs.nixos-hardware;
+      from = {
+        type = "indirect";
+        id = "nixos-hardware";
+      };
+      flake = materusArgs.inputs.nixos-hardware;
     };
 
     nixerus = {
-      from = { type = "indirect"; id = "nixerus"; };
-      flake = materusCfg.configInputs.nixerus;
+      from = {
+        type = "indirect";
+        id = "nixerus";
+      };
+      flake = materusArgs.inputs.nixerus;
     };
 
     devshell = {
-      from = { type = "indirect"; id = "devshell"; };
-      flake = materusCfg.configInputs.devshell;
+      from = {
+        type = "indirect";
+        id = "devshell";
+      };
+      flake = materusArgs.inputs.devshell;
     };
 
     home-manager = {
-      from = { type = "indirect"; id = "home-manager"; };
-      flake = materusCfg.configInputs.home-manager;
+      from = {
+        type = "indirect";
+        id = "home-manager";
+      };
+      flake = materusArgs.inputs.home-manager;
     };
 
     sops-nix = {
-      from = { type = "indirect"; id = "sops-nix"; };
-      flake = materusCfg.configInputs.sops-nix;
+      from = {
+        type = "indirect";
+        id = "sops-nix";
+      };
+      flake = materusArgs.inputs.sops-nix;
     };
 
     base16 = {
-      from = { type = "indirect"; id = "base16"; };
-      flake = materusCfg.configInputs.base16;
+      from = {
+        type = "indirect";
+        id = "base16";
+      };
+      flake = materusArgs.inputs.base16;
     };
 
     git-agecrypt = {
-      from = { type = "indirect"; id = "git-agecrypt"; };
-      flake = materusCfg.configInputs.git-agecrypt;
+      from = {
+        type = "indirect";
+        id = "git-agecrypt";
+      };
+      flake = materusArgs.inputs.git-agecrypt;
     };
 
     plasma-manager = {
-      from = { type = "indirect"; id = "plasma-manager"; };
-      flake = materusCfg.configInputs.plasma-manager;
+      from = {
+        type = "indirect";
+        id = "plasma-manager";
+      };
+      flake = materusArgs.inputs.plasma-manager;
     };
 
     nur = {
-      from = { type = "indirect"; id = "nur"; };
-      flake = materusCfg.configInputs.nur;
+      from = {
+        type = "indirect";
+        id = "nur";
+      };
+      flake = materusArgs.inputs.nur;
     };
+
     nix-vscode-extensions = {
-      from = { type = "indirect"; id = "nix-vscode-extensions"; };
-      flake = materusCfg.configInputs.nix-vscode-extensions;
+      from = {
+        type = "indirect";
+        id = "nix-vscode-extensions";
+      };
+      flake = materusArgs.inputs.nix-vscode-extensions;
     };
 
   };
-  }
\ No newline at end of file
+}
diff --git a/nix-config/subflake/flake.nix b/nix-config/subflake/flake.nix
index c979a2b..f117bc0 100644
--- a/nix-config/subflake/flake.nix
+++ b/nix-config/subflake/flake.nix
@@ -8,6 +8,24 @@
       ref = "nixos-unstable";
     };
 
+    nixerus = {
+      type = "github";
+      owner = "materusPL";
+      repo = "Nixerus";
+      ref = "master";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
+    };
+
+    nur = {
+      type = "github";
+      owner = "nix-community";
+      repo = "NUR";
+      ref = "master";
+    };
+
     flake-utils = {
       type = "github";
       owner = "numtide";
@@ -15,6 +33,28 @@
       ref = "main";
     };
 
+    git-agecrypt = {
+      type = "github";
+      owner = "vlaci";
+      repo = "git-agecrypt";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+
+    plasma-manager = {
+      type = "github";
+      owner = "nix-community";
+      repo = "plasma-manager";
+      ref = "trunk";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
+    };
+
     home-manager = {
       type = "github";
       owner = "nix-community";
@@ -25,17 +65,6 @@
       };
     };
 
-    nixerus = {
-      type = "github";
-      owner = "materusPL";
-      repo = "Nixerus";
-      ref = "master";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "home-manager";
-      };
-    };
-
     sops-nix = {
       type = "github";
       owner = "Mic92";
@@ -56,6 +85,40 @@
       };
     };
 
+    devshell = {
+      type = "github";
+      owner = "numtide";
+      repo = "devshell";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
+    emacs-overlay = {
+      type = "github";
+      owner = "nix-community";
+      repo = "emacs-overlay";
+      ref = "master";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
+    nixos-hardware = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixos-hardware";
+      ref = "master";
+    };
+
+    base16 = {
+      type = "github";
+      owner = "SenchoPens";
+      repo = "base16.nix";
+      ref = "main";
+    };
+
   };
 
   outputs = inputs: inputs;