pin version to common

flakes/common/hm_modules/ssh.nix

@@ -129,6 +129,11 @@ in
         user = "luser";
       };
       "h003" = lib.mkIf (hasSecret "nix2h003") {
+        identityFile = age.secrets.nix2h003.path;
+        hostname = "10.12.14.1";
+        user = "luser";
+      };
+      "h003_" = lib.mkIf (hasSecret "nix2h003") {
         identityFile = age.secrets.nix2h003.path;
         user = "luser";
       };

hosts/h001/configuration.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  system.stateVersion = "24.11"; # Did you read the comment?
-}

hosts/h001/flake.nix

@@ -1,15 +1,20 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    home-manager.url = "github:rycee/home-manager/release-25.05";
+
     # nixpkgs-unstable.url = "github:wrvsrx/nixpkgs/fix-open-webui";
     open-webui-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     litellm-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     trilium-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     oauth2-proxy-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    pinchflat-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    # Use relative to get current version for testing
+    # Use relative to get current version for testin
-    # common.url = "path:../../common";
+    # common.url = "path:../../flakes/common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
+    # secrets.url = "path:../../flakes/secrets";
+    secrets.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/secrets";
 
     ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
 
@@ -19,93 +24,110 @@
   outputs =
     {
       nixpkgs,
+      home-manager,
       common,
+      secrets,
       ros_neovim,
       nixarr,
       ...
     }@inputs:
     let
       configuration_name = "h001";
+      system = "x86_64-linux";
+      stateVersion = "24.11";
+      primaryUser = "luser";
       lib = nixpkgs.lib;
     in
     {
       nixosConfigurations = {
         "${configuration_name}" = (
           lib.nixosSystem {
+            inherit system;
             specialArgs = {
               inherit inputs;
             };
             modules = [
-              common.nixosModules.default
+              home-manager.nixosModules.default
+
+              secrets.nixosModules.default
               ros_neovim.nixosModules.default
+
+              common.nixosModules.essentials
+              common.nixosModules.git
+              common.nixosModules.boot_systemd
+              common.nixosModules.hardening
+              common.nixosModules.nix_options
+              common.nixosModules.podman
+              common.nixosModules.tailnet
+              common.nixosModules.timezone_auto
+              common.nixosModules.tty_caps_esc
+              common.nixosModules.zsh
+
               nixarr.nixosModules.default
-              ./configuration.nix
               ./hardware-configuration.nix
               ./mods
               ./nginx.nix
               ./containers
               (
                 { config, pkgs, ... }:
-                {
+                rec {
+                  # Home Manager
+                  home-manager = {
+                    useUserPackages = true;
+                    useGlobalPkgs = true;
+                    backupFileExtension = "bak";
+                    # add all normal users to home manager so it applies to them
+                    users = lib.mapAttrs (name: user: {
+                      home.stateVersion = stateVersion;
+                      programs.home-manager.enable = true;
+                    }) (lib.filterAttrs (name: user: user.isNormalUser or false) users.users);
+
+                    sharedModules = [
+                      common.homeManagerModules.tmux
+                      common.homeManagerModules.atuin
+                      common.homeManagerModules.direnv
+                      common.homeManagerModules.git
+                      common.homeManagerModules.postgres_cli_options
+                      common.homeManagerModules.ssh
+                      common.homeManagerModules.starship
+                      common.homeManagerModules.zoxide
+                      common.homeManagerModules.zsh
+                    ];
+                  };
+
+                  # System configuration
+                  system.stateVersion = stateVersion;
+                  networking.hostName = configuration_name;
+                  programs.nh.flake = "/home/${primaryUser}/.config/nixos-config/hosts/${configuration_name}";
+                  nixpkgs.config.allowUnfree = true;
+                  users.users = {
+                    "${primaryUser}" = {
+                      isNormalUser = true;
+                      initialPassword = "password1";
+                      shell = pkgs.zsh;
+                      extraGroups = [
+                        "wheel"
+                        "networkmanager"
+                        "video"
+                        "input"
+                      ];
+                      openssh.authorizedKeys.keys = [
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZigrRMF/HHMhjBIwiOnS2pqbOz8Az19tch680BGvmu nix2h001"
+                      ];
+                    };
+                    root = {
+                      shell = pkgs.zsh;
+                      openssh.authorizedKeys.keys = [
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZigrRMF/HHMhjBIwiOnS2pqbOz8Az19tch680BGvmu nix2h001"
+                      ];
+                    };
+                  };
+
                   environment.systemPackages = with pkgs; [
                     lua
                     sqlite
+                    ttyd
                   ];
-
-                  ringofstorms_common = {
-                    systemName = configuration_name;
-                    boot.systemd.enable = true;
-                    secrets.enable = true;
-                    general = {
-                      reporting.enable = true;
-                    };
-                    programs = {
-                      tailnet.enable = true;
-                      ssh.enable = true;
-                      podman.enable = true;
-                    };
-                    users = {
-                      admins = [ "luser" ]; # First admin is also the primary user owning nix config
-                      users = {
-                        root = {
-                          openssh.authorizedKeys.keys = [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZigrRMF/HHMhjBIwiOnS2pqbOz8Az19tch680BGvmu nix2h001"
-                          ];
-                          shell = pkgs.zsh;
-                        };
-                        luser = {
-                          openssh.authorizedKeys.keys = [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZigrRMF/HHMhjBIwiOnS2pqbOz8Az19tch680BGvmu nix2h001"
-                          ];
-                          extraGroups = [
-                            "networkmanager"
-                            "video"
-                            "input"
-                          ];
-                          shell = pkgs.zsh;
-                        };
-                      };
-                    };
-                    homeManager = {
-                      users = {
-                        luser = {
-                          imports = with common.homeManagerModules; [
-                            kitty
-                            tmux
-                            atuin
-                            direnv
-                            git
-                            nix_deprecations
-                            postgres
-                            ssh
-                            starship
-                            zoxide
-                            zsh
-                          ];
-                        };
-                      };
-                    };
-                  };
                 }
               )
             ];

hosts/h001/mods/pinchflat.nix

@@ -1,10 +1,22 @@
 {
   lib,
+  inputs,
   ...
 }:
+let
+  declaration = "services/misc/pinchflat.nix";
+  nixpkgs = inputs.pinchflat-nixpkgs;
+  pkgs = import nixpkgs {
+    system = "x86_64-linux";
+    config.allowUnfree = true;
+  };
+in
 {
+  disabledModules = [ declaration ];
+  imports = [ "${nixpkgs}/nixos/modules/${declaration}" ];
   config = {
     services.pinchflat = {
+      package = pkgs.pinchflat;
       enable = true;
       port = 8945;
       selfhosted = true;

hosts/h001/readme.md

@@ -1 +0,0 @@
-Main media server and run things server, has a bunch of stuff on it I am self hosting