wip

flake.lock

@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791642191,
+        "lastModified": 1779969295,
-        "narHash": "sha256-0bK0A59rVUn1SRZzo4cNi4VSqAe7vR1gL2/MZl53Frw=",
+        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c58f54c733a7894d84fa2fdff26cc12088c4b78c",
+        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
         "type": "github"
       },
       "original": {
@@ -21,6 +39,25 @@
         "type": "github"
       }
     },
+    "kube": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767247330,
+        "narHash": "sha256-CxXwzmvAOO07719jzE0Zw14C9r3fQcXfPllLtt5cIzo=",
+        "rev": "4a4d79a290c92de630e503f395fc8fd709904c1b",
+        "type": "tarball",
+        "url": "https://gitea.home-frikker.dedyn.io/api/v1/repos/jfrikker/kube/archive/4a4d79a290c92de630e503f395fc8fd709904c1b.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -28,11 +65,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791711434,
+        "lastModified": 1779604987,
-        "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=",
+        "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "9a2dd40780eeab8543aa97c59c26f11267025616",
+        "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
         "type": "github"
       },
       "original": {
@@ -43,11 +80,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1791734076,
+        "lastModified": 1779560665,
-        "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=",
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -57,32 +94,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "kube": "kube",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "rycee": "rycee"
-      }
-    },
-    "rycee": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1790708379,
-        "narHash": "sha256-UShpDPmypGviorjBWDwRtKWUTdVik7Zp6bt1t875jV4=",
-        "owner": "~rycee",
-        "repo": "nur-expressions",
-        "rev": "b549e36268fa8c975535d0405f66e013b234a0a4",
-        "type": "sourcehut"
-      },
-      "original": {
-        "owner": "~rycee",
-        "repo": "nur-expressions",
-        "type": "sourcehut"
       }
     }
   },

flake.nix

@@ -4,46 +4,23 @@
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # kube = {
+    kube = {
-    #   url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
+      url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
-    #   inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    };
 
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    rycee = {
-      url = "sourcehut:~rycee/nur-expressions";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs =
+  outputs = { nixpkgs, home-manager, kube, nix-index-database, ... }:
-    {
+    let modules-for-system = pkgs: pkgs.stdenv.mkDerivation {
-      nixpkgs,
-      home-manager,
-      nix-index-database,
-      rycee,
-      ...
-    }:
-    let
-      pkgs-for-system = (
-        system:
-        import nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-        }
-      );
-      modules-for-system =
-        pkgs:
-        pkgs.stdenv.mkDerivation {
           name = "home-manager-modules";
           src = pkgs.lib.fileset.toSource {
             root = ./.;
@@ -53,179 +30,58 @@
           };
           
           buildPhase = ''
-            runHook preBuild
+              runHook preBuild
-            ${pkgs.emacs}/bin/emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "home.org")'
+              ${pkgs.emacs}/bin/emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "home.org")'
-            runHook postBuild
+              runHook postBuild
-          '';
+            '';
           installPhase = ''
-            runHook preInstall
+              runHook preInstall
-            cp -R target $out
+              cp -R target $out
-            runHook postInstall
+              runHook postInstall
-          '';
+            '';
         };
-    in
+    in {
-    {
+      homeConfigurations.shibumi =
-      homeConfigurations.redbook =
+        let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
-        let
+            modules = modules-for-system pkgs;
-          pkgs = pkgs-for-system "aarch64-darwin";
+        in home-manager.lib.homeManagerConfiguration {
-          modules = modules-for-system pkgs;
-        in
-        home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           
-          modules = [
+          modules =
-            nix-index-database.homeModules.default
+            [
-            rycee.hmModules.emacs-init
+              nix-index-database.homeModules.default
-            "${modules}"
+              "${modules}"
-          ]
+            ] ++
-          ++ [
+            [{
-            {
               home.stateVersion = "22.05";
               home.username = "jfrikker";
               home.homeDirectory = "/Users/jfrikker";
               home.packages = [ pkgs.pinentry_mac ];
-              jfrikker.enable = true;
               jfrikker.desktop.enable = true;
-              jfrikker.redbook.enable = true;
+            }];
-            }
+
-          ];
+          extraSpecialArgs = { kube = kube.packages.aarch64-darwin.default; };
         };
       homeConfigurations.home =
-        let
+        let pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          pkgs = pkgs-for-system "x86_64-linux";
+            modules = modules-for-system pkgs;
-          modules = modules-for-system pkgs;
+        in home-manager.lib.homeManagerConfiguration {
-        in
-        home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           
           modules = [
             nix-index-database.homeModules.default
-            rycee.hmModules.emacs-init
-            "${modules}"
-          ]
-          ++ [
-            {
-              home.stateVersion = "22.05";
-              home.username = "jfrikker";
-              home.homeDirectory = "/home/jfrikker";
-              jfrikker.enable = true;
-            }
-          ];
-        };
-      homeConfigurations.home-laptop =
-        let
-          pkgs = pkgs-for-system "x86_64-linux";
-          modules = modules-for-system pkgs;
-        in
-        home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [
-            nix-index-database.homeModules.default
-            rycee.hmModules.emacs-init
-            "${modules}"
-          ]
-          ++ [
-            {
-              home.stateVersion = "22.05";
-              home.username = "jfrikker";
-              home.homeDirectory = "/home/jfrikker";
-              # home.packages = [ pkgs.pinentry ];
-              jfrikker.enable = true;
-              jfrikker.desktop.enable = true;
-
-              programs.ghostty = {
-                enable = true;
-                settings = {
-                  font-family = "Iosevka Term Extended";
-                  font-size = 10;
-                };
-              };
-
-              programs.foot = {
-                enable = true;
-                settings = {
-                  main = {
-                    font = "Iosevka Term:size=10:width=expanded";
-                  };
-                };
-              };
-
-              home.pointerCursor = {
-                enable = true;
-                package = pkgs.vanilla-dmz;
-                name = "Vanilla-DMZ";
-                sway.enable = true;
-                gtk.enable = true;
-              };
-
-              wayland.windowManager.sway = {
-                enable = true;
-                config.modifier = "Mod4";
-                # config.terminal = "${pkgs.ghostty}/bin/ghostty";
-                config.input = {
-                  "1452:628:bcm5974" = {
-                    scroll_factor = "0.4";
-                  };
-                };
-              };
-
-              programs.emacs.package = pkgs.emacs-pgtk;
-            }
-          ];
-
-          # extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
-        };
-      homeConfigurations.msi-laptop =
-      let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
-          modules = modules-for-system pkgs;
-      in home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-      
-        modules =
-          [
-            nix-index-database.homeModules.default
-            rycee.hmModules.emacs-init
-            "${modules}"
           ] ++
+          (pkgs.lib.filter 
+            (n: pkgs.lib.strings.hasSuffix ".nix" n)
+            (pkgs.lib.filesystem.listFilesRecursive "${modules}/base")) ++
           [{
             home.stateVersion = "22.05";
             home.username = "jfrikker";
             home.homeDirectory = "/home/jfrikker";
-            jfrikker.enable = true;
-            jfrikker.desktop.enable = true;
-            
-            home.packages = [ pkgs.protonmail-desktop pkgs.proton-vpn ];
-
-            programs.ghostty = {
-              enable = true;
-              settings = {
-                font-family = "Iosevka Term Extended";
-                font-size = 10;
-              };
-            };
-
-            programs.foot = {
-              enable = true;
-              settings = {
-                main = {
-                  font = "Iosevka Term:size=10:width=expanded";
-                };
-              };
-            };
-
-            home.pointerCursor = {
-              enable = true;
-              package = pkgs.vanilla-dmz;
-              name = "Vanilla-DMZ";
-              sway.enable = true;
-              gtk.enable = true;
-            };
-
-            programs.emacs.package = pkgs.emacs-pgtk;
           }];
-      };
+
-      packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux;
+          extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
+        };
       packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;
     };
 }