Merge branch 'master' into home_manager

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "assets/compose"]
 	path = assets/compose
 	url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
+[submodule "assets/dotfiles"]
+	path = assets/dotfiles
+	url = ssh://git@code.lazyworkhorse.net:2222/gortium/dotfiles.git

flake.lock

@@ -44,6 +44,26 @@
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1755625756,
+        "narHash": "sha256-t57ayMEdV9g1aCfHzoQjHj1Fh3LDeyblceADm2hsLHM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "dd026d86420781e84d0732f2fa28e1c051117b59",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1755615617,
@@ -63,6 +83,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs"
       }
     },

flake.nix

@@ -8,10 +8,14 @@
       inputs.darwin.follows = "";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     self.submodules = true;
   };
 
-  outputs = { self, nixpkgs, agenix, ... }@inputs:
+  outputs = { self, nixpkgs, agenix, home-manager, ... }@inputs:
     let
       system = "x86_64-linux";
       keys = import ./lib/keys.nix;
@@ -39,10 +43,11 @@
             modules = [
               { nixpkgs.overlays = overlays; }
               agenix.nixosModules.default
+              home-manager.nixosModules.default
               ./hosts/lazyworkhorse/configuration.nix
               ./hosts/lazyworkhorse/hardware-configuration.nix
               ./modules/default.nix
-              ./users/gortium.nix
+              ./users/gortium
             ];
           };
         };

hosts/lazyworkhorse/configuration.nix

@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, paths, keys, ... }:
+{ config, lib, pkgs, self, paths, keys, ... }:
 
 {
   # NAS Mounting
@@ -16,7 +16,7 @@
   nix.gc = {
     automatic = true;
     dates = "daily";  # You can also use "daily" or a cron-like spec
-    options = "--delete-older-than 30d";
+    options = "--delete-older-than 7d";  # Keep only 7 days of unreferenced data
   };
 
   nix.settings = {
@@ -153,6 +153,8 @@
     };
   };
 
+  fileSystems."/".neededForBoot = true;
+
   # Public host ssh key (kept in sync with the private one)
   environment.etc."ssh/ssh_host_ed25519_key.pub".text =
     "${keys.hosts.lazyworkhorse.main}";
@@ -162,19 +164,6 @@
   services.zfs.autoSnapshot.enable = true;
   services.zfs.autoScrub.enable = true;
 
-  # hardware.graphics = {
-  #   enable = true;
-  #   enable32Bit = true;
-  #   extraPackages = with pkgs; [
-  #     rocmPackages.clr
-  #     rocmPackages.rocblas
-  #     rocmPackages.rocrand
-  #     rocmPackages.rocminfo
-  #     rocmPackages.hipcc
-  #     rocmPackages.hiprt
-  #   ];
-  # };
-
  # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

lib/keys.nix

@@ -9,7 +9,7 @@
 
   hosts = {
     lazyworkhorse = {
-      main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmPv4JssvhHGIx85UwFxDSrL5anR4eXB/cd9V2i9wdW";
+      main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmXqD+bBveCYf4khmARA0uaCzkBOUIE077ZrInLNs1O";
       github = "";
       gitea = "";
       bootstrap = "age1r796v2uldtspawyh863pks74sd2pwcan8j4e4pjzsvkmr3vjja9qpz5ste";

modules/nixos/services/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, lib, config, ... }: {
+{
-  imports =
+  imports = [
-    [
+    ./dotfiles.nix
-      ./systemd
+    ./systemd
-    ];
+  ];
 }

modules/nixos/services/dotfiles.nix

@@ -0,0 +1,69 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.dotfiles;
+  stowDir = cfg.stowDir;
+
+  # Function to recursively find all files in a directory
+  findFiles = dir:
+    let
+      files = builtins.attrNames (builtins.readDir dir);
+    in
+      concatMap (name:
+        let
+          path = dir + "/${name}";
+        in
+          if (builtins.typeOf (builtins.readDir path) == "set")
+          then findFiles path
+          else [ path ]
+      ) files;
+
+  # Get a list of all packages (directories) in the stow directory
+  stowPackages = builtins.attrNames (builtins.readDir stowDir);
+
+  # Create an attribute set where each attribute is a package name
+  # and the value is a list of files to be linked.
+  homeManagerLinks = listToAttrs (map (pkg:
+    let
+      pkgPath = stowDir + "/${pkg}";
+      files = findFiles pkgPath;
+    in
+      nameValuePair pkg (map (file: {
+        source = file;
+        target = removePrefix (pkgPath + "/") file;
+      }) files)
+  ) stowPackages);
+
+in
+{
+  options.services.dotfiles = {
+    enable = mkEnableOption "Enable dotfiles management";
+
+    stowDir = mkOption {
+      type = types.path;
+      description = "The directory where your stow packages are located.";
+    };
+
+    user = mkOption {
+      type = types.str;
+      description = "The user to manage dotfiles for.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home-manager.users.${cfg.user} = {
+      home.file =
+        let
+          allFiles = concatLists (attrValues homeManagerLinks);
+        in
+          listToAttrs (map (file:
+            nameValuePair file.target {
+              source = file.source;
+            }
+          ) allFiles);
+    };
+  };
+}
+

modules/nixos/services/systemd/network.nix

@@ -1,9 +1,14 @@
 { config, pkgs, self, ... }:
 
 let
-  network_compose_dir = builtins.path {
+  network_compose_dir = pkgs.stdenv.mkDerivation {
     name = "network_compose_dir";
-    path = self + "/assets/compose/network";
+    src = self + "/assets/compose/network";
+    dontUnpack = true;
+    installPhase = ''
+      mkdir -p $out
+      cp -r $src/* $out/
+    '';
   };
 in
 {

modules/nixos/services/systemd/passwordmanager.nix

@@ -1,9 +1,14 @@
 { config, pkgs, self, ... }:
 
 let
-  passwordmanager_compose_dir = builtins.path {
+  passwordmanager_compose_dir = pkgs.stdenv.mkDerivation {
     name = "passwordmanager_compose_dir";
-    path = self + "/assets/compose/passwordmanager";
+    src = self + "/assets/compose/passwordmanager";
+    dontUnpack = true;
+    installPhase = ''
+      mkdir -p $out
+      cp -r $src/* $out/
+    '';
   };
 in
 {

modules/nixos/services/systemd/versioncontrol.nix

@@ -1,9 +1,14 @@
 { config, pkgs, self, ... }:
 
 let
-  versioncontrol_compose_dir = builtins.path {
+  versioncontrol_compose_dir = pkgs.stdenv.mkDerivation {
     name = "versioncontrol_compose_dir";
-    path = self + "/assets/compose/versioncontrol";
+    src = self + "/assets/compose/versioncontrol";
+    dontUnpack = true;
+    installPhase = ''
+      mkdir -p $out
+      cp -r $src/* $out/
+    '';
   };
 in
 {

users/gortium/default.nix

@@ -1,4 +1,5 @@
 { pkgs, inputs, config, keys, ... }: {
+  home-manager.users.gortium = import ./home.nix;
   users.users.gortium = {
     isNormalUser = true;
     extraGroups = [ "wheel" "docker" ]; # Enable ‘sudo’ for the user.

users/gortium/home.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  services.dotfiles = {
+    enable = true;
+    stowDir = ../../../assets/dotfiles;
+    user = "gortium";
+  };
+
+  home.username = "gortium";
+  home.homeDirectory = "/home/gortium";
+  home.stateVersion = "23.11"; # Please change this to your version.
+  programs.home-manager.enable = true;
+}