diff --git a/flake.lock b/flake.lock
index f072a80aa1c20f827885c6896d9410cd24cc5a81..adc27d994a765c797cc4eb3dcd864d4c704e2b50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,108 +2,35 @@ {
   "nodes": {
     "agenix": {
       "inputs": {
-        "darwin": "darwin",
-        "nixpkgs": [
-          "ragenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
         "lastModified": 1682101079,
-        "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
-{
           "ragenix",
       },
-      "original": {
-{
       "inputs": {
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "crane": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": [
-          "ragenix",
-          "flake-utils"
-        ],
         "nixpkgs": [
-          "ragenix",
           "nixpkgs"
-        ],
-        "rust-overlay": [
-          "ragenix",
-          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1681680516,
-        "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=",
-        "owner": "ipetkov",
-    "agenix": {
 {
-    "agenix": {
   "nodes": {
-        "type": "github"
-      },
-{
           "nixpkgs"
-        "owner": "ipetkov",
-    "agenix": {
 {
-        "type": "github"
-      }
   "nodes": {
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "ragenix",
-          "agenix",
-          "nixpkgs"
         ]
 {
+      "inputs": {
 {
-{
-    "agenix": {
         "darwin": "darwin",
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
 {
-          "ragenix",
-      },
-      "original": {
     "agenix": {
-          "ragenix",
-      "inputs": {
-        "repo": "nix-darwin",
         "type": "github"
 {
-        ]
-  "nodes": {
-      "inputs": {
 {
-      "flake": false,
+          "nixpkgs"
 {
-{
       "inputs": {
-    "agenix": {
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
 {
-          "ragenix",
-      },
-      "original": {
-      "inputs": {
         "darwin": "darwin",
-        "repo": "flake-compat",
         "type": "github"
       }
     },
@@ -124,29 +52,31 @@         "repo": "flake-utils",
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "home-manager": {
       "inputs": {
-        "darwin": "darwin",
         "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1682203081,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "darwin": "darwin",
+        "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
   "nodes": {
-        "darwin": "darwin",
+        "nixpkgs": [
     "agenix": {
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "repo": "home-manager",
+        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "darwin": "darwin",
+        "nixpkgs": [
     "agenix": {
+        "repo": "home-manager",
         "type": "github"
       }
     },
-    "home-manager": {
+    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -231,85 +161,23 @@         "repo": "nur",
         "type": "github"
       }
     },
-        ]
+      },
   "nodes": {
       "inputs": {
         "agenix": "agenix",
-        "crane": "crane",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
       },
-      "locked": {
-        "lastModified": 1682237245,
-        "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=",
-        "owner": "yaxitech",
+    "agenix": {
 {
-        "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yaxitech",
-        "repo": "ragenix",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-      },
     "agenix": {
-        "home-manager": "home-manager",
+        "darwin": "darwin",
         "jolheiser-nur": "jolheiser-nur",
         "nixpkgs": "nixpkgs_2",
 {
-          "ragenix",
-        "ragenix": "ragenix"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-  "nodes": {
     "agenix": {
-          "ragenix",
-          "flake-utils"
-        ],
         "nixpkgs": [
-          "ragenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682129965,
-        "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "2c417c0460b788328220120c698630947547ee83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

diff --git a/flake.nix b/flake.nix
index f07510df19e5fa0a0bdfd8228493f8f81d397edd..c5f166c84b708fdb4f04cac9b075a676ffd9b141 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,11 @@     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     ragenix.url = "github:yaxitech/ragenix";
+  description = "jolheiser's nixos config";
+    agenix.inputs = {
+      nixpkgs.follows = "nixpkgs";
+      darwin.follows = "";
-    ragenix.inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-utils.url = "github:numtide/flake-utils";
 
     nur.url = "github:nix-community/nur";
@@ -14,14 +18,11 @@     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   };
 
 {
-  inputs = {
-
-{
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     self,
     nixpkgs,
     home-manager,
-    ragenix,
+    agenix,
     jolheiser-nur,
     ...
   } @ inputs: let
@@ -34,7 +35,7 @@           jolheiser = import jolheiser-nur {pkgs = prev;};
         };
       };
     };
-    commonConfig = {username}: ({
+    commonConfig = {
       config,
       pkgs,
       ...
@@ -52,19 +53,20 @@         };
         age.secrets = {
           ssh-config = {
             file = ./secrets/shared/ssh-config.age;
-            owner = "jolheiser";
+            owner = username;
           };
           ssh-config-work = {
             file = ./secrets/shared/ssh-config-work.age;
-            owner = "jolheiser";
+            owner = username;
           };
           spotify-pw = {
             file = ./secrets/shared/spotify-pw.age;
-            owner = "jolheiser";
+            owner = username;
           };
         };
       };
-    });
+    };
+    username = "jolheiser";
   in
     {
       nixosConfigurations = {
@@ -72,12 +74,12 @@         "chai" = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             home-manager.nixosModules.home-manager
-            ragenix.nixosModules.default
+            agenix.nixosModules.default
             ./machines/common
             ./machines/chai
-            (commonConfig {username = "jolheiser";})
+            commonConfig
             ({pkgs, ...}: {
-              home-manager.users.jolheiser.programs.git.package = pkgs.gitSVN;
+              home-manager.users.${username}.programs.git.package = pkgs.gitSVN;
             })
           ];
         };
@@ -85,10 +87,10 @@         "matcha" = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             home-manager.nixosModules.home-manager
-            ragenix.nixosModules.default
+            agenix.nixosModules.default
             ./machines/common
             ./machines/matcha
-            (commonConfig {username = "jolheiser";})
+            commonConfig
           ];
         };
       };
@@ -97,10 +99,9 @@     // inputs.flake-utils.lib.eachDefaultSystem (system: let
       pkgs = nixpkgs.legacyPackages.${system};
     in {
       devShells.default = pkgs.mkShell {
-        nativeBuildInputs = with pkgs; [
+        nativeBuildInputs = [
-          just
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     ragenix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs = {
         ];
       };
     });

diff --git a/machines/common/default.nix b/machines/common/default.nix
index b181e9515b3a43f5c87a26cc9c7995ab0eeb5010..3fb310e92234f9911b5002ede171ddb893cc4cd3 100644
--- a/machines/common/default.nix
+++ b/machines/common/default.nix
@@ -49,6 +49,7 @@     package = pkgs.nixVersions.nix_2_15;
     settings = {
       experimental-features = ["flakes" "nix-command" "repl-flake"];
       auto-optimise-store = true;
+      warn-dirty = false;
     };
   };