Home

dotnix @main - refs - log -
- 
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
chore: clean up flake Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmYOEh0ACgkQuFOtpdp7 v3obMg/9FOaBFC/jUKyVFAhK6k4zqT7b1ggpLRcFMZm3bpxinTk8O0+VGmfnpTFZ 8sUbcSvZdwk5wZ6X/9l3QLMgMjw6o62XjdsYYwtPjRYELO2MEYQGb5d56b9bMa/o IIoM6dKWqPTHjWWdGpcwIZuN37i+s01PBtEV7QeoVYx9juwQuLCwjo//BCGIXyjJ 7QUikr5hSJFx9Yn6tMBdffxQU2vMDB7M4o6RRUG7MWvKsT7iLhr3tjHqYKhT+Htq pEVncX+m0PrM+KFONJ+gylyegshsug04DpLYZiw1TA7SOrIy9L7wVtI4LtOMqnhZ W7nrRg/CXalC4uby1GZFXvDxkPpo9yuhBMP3vZZ91VKzVPDH5LrUYVl2tbjyyLEe 77Yrr4lZb8e+A4MTTCi88HmVxL3rDn+IAvX+IVSZk3FwV3KAnFH1b9hccFuey8dM Y5zzusQ9s1jZyt3wRI4JdggSNkWSBBVFuYdFR2llq77DAiPyzNCAjaLowX5drO+h 0TXhyUK0KD26k+bHuaJvLeezbpVIuBf7kVacVUhTM4RY4RTUGkcLRdqLLgnMIGyW fg0ZtggHNPKFjvtPiwr2dfacXGxxJ6RcBDsxDJWfnPI7AuP+IEAA4GWKg8sEhgXq 6zTmFGeZry4aTZcjpoJO8WvE6tIDo/gEj3YaIlJ39ZZr054sX5U= =I9pC -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
8 months ago
1 changed files, 111 additions(+), 125 deletions(-)
M flake.nix -> flake.nix
diff --git a/flake.nix b/flake.nix
index b978fb079b5ea6c2517f9fc7b78e3b54221a9f5e..5a9af83672e0bebeff44cba87080bf22a6df2e42 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 
     home-manager = {
@@ -17,7 +18,6 @@         darwin.follows = "";
         home-manager.follows = "";
       };
     };
-    flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     nur.url = "github:nix-community/NUR";
@@ -125,8 +125,7 @@       })
       inputs.golink.overlay
     ];
     pkgs = import nixpkgs {
-      inherit overlays;
-      system = "x86_64-linux";
+      inherit overlays system;
       config.allowUnfree = true;
     };
     userSecret = path: {
@@ -191,238 +190,225 @@         };
       })
     ];
     username = "jolheiser";
-  in
-    {
-      homeConfigurations = let
-        commonModules = [
+  description = "jolheiser's nixos config";
 {
-    ugit = {
 {
-      url = "git+https://git.jolheiser.com/ugit.git";
-        nixpkgs.follows = "nixpkgs";
+  description = "jolheiser's nixos config";
 {
-        nixpkgs.follows = "nixpkgs";
   description = "jolheiser's nixos config";
-{
   description = "jolheiser's nixos config";
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 {
-  inputs = {
 
+  description = "jolheiser's nixos config";
         nixpkgs.follows = "nixpkgs";
-  inputs = {
-        ];
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     home-manager = {
+  description = "jolheiser's nixos config";
 {
-      url = "github:a-h/templ";
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
       url = "github:nix-community/home-manager";
 {
   inputs = {
-      inputs.nixpkgs.follows = "nixpkgs";
+  description = "jolheiser's nixos config";
 {
-    templ = {
+      inputs.nixpkgs.follows = "nixpkgs";
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/nur.git";
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/nur.git";
 {
-        darwin.follows = "";
+    nur.url = "github:nix-community/NUR";
   description = "jolheiser's nixos config";
-        darwin.follows = "";
+      "jolheiser" = home-manager.lib.homeManagerConfiguration {
+      url = "git+https://git.jolheiser.com/nur.git";
 
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/nur.git";
   inputs = {
 {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    home-manager = {
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-        darwin.follows = "";
+        inherit pkgs;
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/nur.git";
     home-manager = {
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/nur.git";
       url = "github:nix-community/home-manager";
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/nur.git";
       inputs.nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "";
+    helix = {
-        home-manager.follows = "";
+    helix = {
 {
-        home-manager.follows = "";
+    helix = {
   description = "jolheiser's nixos config";
-        home-manager.follows = "";
+    helix = {
 
-        home-manager.follows = "";
+    helix = {
   inputs = {
+              programs = {
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      url = "github:nix-community/home-manager";
-{
+    helix = {
     home-manager = {
-      nixosConfigurations = {
+              };
+            }
 {
-          nurpkgs = prev;
+    nur.url = "github:nix-community/NUR";
 {
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
     home-manager = {
 {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixosConfigurations = {
+      url = "git+https://git.jolheiser.com/helix.drv.git";
 {
-        };
-        darwin.follows = "";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
   description = "jolheiser's nixos config";
-{
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      inputs.nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "";
+  description = "jolheiser's nixos config";
   inputs = {
+
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "git+https://git.jolheiser.com/nur.git";
       url = "github:nix-community/home-manager";
+            ./machines/chai
 {
-    home-manager = {
+  description = "jolheiser's nixos config";
 {
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
     home-manager = {
-{
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+        inherit system;
-{
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      url = "github:nix-community/home-manager";
-        darwin.follows = "";
   description = "jolheiser's nixos config";
-              ./machines/earlgrey
-        home-manager.follows = "";
   inputs = {
+
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "git+https://git.jolheiser.com/nur.git";
       url = "github:nix-community/home-manager";
-      };
   description = "jolheiser's nixos config";
-{
+  inputs = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-    home-manager = {
 {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  description = "jolheiser's nixos config";
 {
-        };
+    home-manager = {
-        darwin.follows = "";
   description = "jolheiser's nixos config";
-{
+  inputs = {
     home-manager = {
-
-      };
+  description = "jolheiser's nixos config";
   inputs = {
+  description = "jolheiser's nixos config";
-{
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+  description = "jolheiser's nixos config";
   inputs = {
+
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "git+https://git.jolheiser.com/nur.git";
       url = "github:nix-community/home-manager";
-        "matcha" = nixpkgs.lib.nixosSystem {
+            wsl.nixosModules.wsl
-          system = "x86_64-linux";
+            ./machines/masala
 {
-          tmpl = inputs.tmpl.packages.${prev.system}.default;
+    nur.url = "github:nix-community/NUR";
       };
-    home-manager = {
+      "matcha" = nixpkgs.lib.nixosSystem {
-            ./machines/matcha
+        inherit system;
+    website = {
 {
-        templ = inputs.templ.packages.${prev.system}.templ;
-{
   description = "jolheiser's nixos config";
+      inputs.flake-utils.follows = "flake-utils";
-        };
+          ./machines/matcha
-        "genmaicha" = nixpkgs.lib.nixosSystem {
+          commonConfig
-{
+      inputs.nixpkgs.follows = "nixpkgs";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-    home-manager = {
       };
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-            nixos-hardware.nixosModules.framework-13-7040-amd
+      "genmaicha" = nixpkgs.lib.nixosSystem {
-            agenix.nixosModules.default
-    flake-utils.url = "github:numtide/flake-utils";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
   description = "jolheiser's nixos config";
+    website = {
 {
-        templ = inputs.templ.packages.${prev.system}.templ;
-{
   description = "jolheiser's nixos config";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      url = "github:nix-community/home-manager";
-        "sencha" = nixpkgs.lib.nixosSystem {
+          agenix.nixosModules.default
-        home-manager.follows = "";
+    website = {
     home-manager = {
-      };
+          commonConfig
+      inputs.nixpkgs.follows = "nixpkgs";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
       };
-    home-manager = {
-{
+    website = {
       url = "github:nix-community/home-manager";
+  description = "jolheiser's nixos config";
   inputs = {
+  description = "jolheiser's nixos config";
+    website = {
 {
-        templ = inputs.templ.packages.${prev.system}.templ;
-{
+    website = {
   description = "jolheiser's nixos config";
-        };
+          ./machines/sencha
-      };
-    flake-utils.url = "github:numtide/flake-utils";
+  description = "jolheiser's nixos config";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 {
-      url = "github:nix-community/home-manager";
     home-manager = {
 {
-      file = path;
-            overlays = overlays;
-{
-  inputs = {
+  description = "jolheiser's nixos config";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      url = "github:nix-community/home-manager";
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
 {
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
   description = "jolheiser's nixos config";
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
 
+        };
 {
-      inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
   inputs = {
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-{
   description = "jolheiser's nixos config";
+          nurpkgs = prev;
+  description = "jolheiser's nixos config";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      url = "github:nix-community/home-manager";
-{
     home-manager = {
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+  description = "jolheiser's nixos config";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "github:nix-community/home-manager";
-{
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
       inputs.nixpkgs.follows = "nixpkgs";
-    home-manager = {
-{
       inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:nix-community/home-manager";
+    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
       };
 {
-          ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
   description = "jolheiser's nixos config";
+    home-manager = {
   description = "jolheiser's nixos config";
+    home-manager = {
 {
   description = "jolheiser's nixos config";
+    home-manager = {
   description = "jolheiser's nixos config";
-  description = "jolheiser's nixos config";
+{
+        flake-utils.follows = "flake-utils";
 
   description = "jolheiser's nixos config";
+    home-manager = {
   inputs = {
   description = "jolheiser's nixos config";
+    home-manager = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   description = "jolheiser's nixos config";
+    home-manager = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        ];
+      url = "git+https://git.jolheiser.com/nur.git";
 {
-    home-manager = {
-  description = "jolheiser's nixos config";
+{
-    home-manager = {
+  };
 }