Refactor, add roam using colmena

mod/collections/pc.nix

@@ -1,20 +0,0 @@
-{ mod, ... }:
-{
-  imports = with mod; [
-    audio
-    boot
-    fonts
-    gpg
-    locale
-    network
-    nix-configuration
-    security
-    services
-    software.development
-    software.editors
-    software.programs
-    software.shell
-    software.window-manager
-    users
-  ];
-}

mod/home-manager.nix

@@ -0,0 +1,25 @@
+{
+  inputs,
+  lib,
+  options,
+  config,
+  ...
+}:
+{
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
+
+  config = {
+    home.home.stateVersion = config.system.stateVersion;
+    home-manager.users."hd" = lib.mkAliasDefinitions options.home;
+  };
+
+  options = {
+    home = lib.mkOption {
+      type = lib.types.attrs;
+      default = { };
+    };
+  };
+
+}

mod/nix-configuration.nix

@@ -13,42 +13,10 @@
       ];
       trusted-users = [
         "root"
-        "@wheel"
       ];
       auto-optimise-store = true;
     };
 
-    programs.nix-ld.enable = true;
-
     nixpkgs.config.allowUnfree = false;
-    nixpkgs.config.allowUnfreePredicate =
-      pkg:
-      builtins.elem (lib.getName pkg) [
-        "nvidia-x11"
-        "nvidia-settings"
-        "vscode"
-        "obsidian"
-        "steam"
-        "steam-unwrapped"
-        "gateway" # jetbrains
-        "spotify"
-        "rust-rover"
-      ];
-
-    home.home.stateVersion = config.system.stateVersion; # is this safe?
-  };
-
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
-  # I don't think this will ever be multi user,
-  # no need to seperate home-manager. `home` is used
-  # in users.nix, I should prbably refactor...
-  options = {
-    home = lib.mkOption {
-      type = lib.types.attrs;
-      default = { };
-    };
   };
 }

mod/shared/all.nix

@@ -0,0 +1,10 @@
+{ mod, ... }:
+{
+  imports = with mod; [
+    boot
+    locale
+    nix-configuration
+    shell
+    users
+  ];
+}

mod/shared/pc.nix

@@ -0,0 +1,36 @@
+{ mod, lib, ... }:
+{
+  imports = with mod; [
+    shared.all
+
+    audio
+    fonts
+    gpg
+    home-manager
+    network
+    nix-configuration
+    security
+    services
+    software.development
+    software.editors
+    software.programs
+    software.window-manager
+  ];
+
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "nvidia-x11"
+      "nvidia-settings"
+      "vscode"
+      "obsidian"
+      "steam"
+      "steam-unwrapped"
+      "gateway" # jetbrains
+      "spotify"
+      "rust-rover"
+    ];
+
+  programs.nix-ld.enable = true;
+
+}

mod/shell.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   environment.shells = with pkgs; [
     bashInteractive
@@ -18,6 +18,7 @@
     unzip
     wget
     wl-clipboard
+    inputs.colmena.packages."x86_64-linux".colmena # todo use overlay
   ];
 
   programs = {

mod/software/games.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    runelite
-  ];
-  programs.steam.enable = true;
-}

mod/users.nix

@@ -5,19 +5,26 @@
   ...
 }:
 {
-  users.users."hd" = {
-    description = "Henri";
-    isNormalUser = true;
-    createHome = true;
-    home = "/home/hd";
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-    shell = pkgs.fish;
-    packages = [ ];
+  users = {
+    mutableUsers = false;
+    users."hd" = {
+      description = "Henri";
+      isNormalUser = true;
+      createHome = true;
+      home = "/home/hd";
+      extraGroups = [ "wheel" ];
+      shell = pkgs.fish;
+      packages = [ ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEG+dd4m98aKEWfFa/7VZUlJNX0axvIlHVihT8w7RLyY hd@solo"
+      ];
+      hashedPassword = "$y$j9T$L7VT26HQSBsX.nq5hKrZw0$6k43wNsKIO.SI.fqE1opaDuNobmFQrGXE1nzFB5wYg3";
+    };
+    users.root = {
+      hashedPassword = "!";
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEG+dd4m98aKEWfFa/7VZUlJNX0axvIlHVihT8w7RLyY hd@solo"
+      ];
+    };
   };
-  home-manager.users."hd" = lib.mkAliasDefinitions options.home;
-
-  users.users.root.hashedPassword = "!";
 }