WIP

configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, userSettings, systemSettings, ... }:
 {
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
@@ -11,10 +11,6 @@
     eza
   ];
 
-  # imports = [
-  #   ./
-  # ];
-
   # For SSH access
   services.openssh.enable = true;
 
@@ -27,4 +23,14 @@
     execWheelOnly = false;
     wheelNeedsPassword = false; # allows sudo without password for those in the wheel group
   };
+
+  users.users.${userSettings.username} = {
+    isNormalUser  = true;
+    uid = 1000;
+    extraGroups  = [ "wheel" "networkmanager" ];
+    openssh.authorizedKeys.keyFiles = [ /root/.ssh/authorized_keys ];
+  };
+
+  time.timeZone = "${systemSettings.timeZone}";
+  networking.hostName = systemSettings.hostName;
 }

flake.lock

@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1733581040,
+        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
         "type": "github"
       },
       "original": {
@@ -71,18 +71,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
-        "path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1682134069,
         "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@@ -120,25 +108,9 @@
       }
     },
     "vscode-server": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2",
-        "vscode-server": "vscode-server_2"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-IWEQNW6HVBCztzSy/1SmMTU6R/dyLlnZrJKk9ldJG/I=",
-        "path": "./nixos/vscode",
-        "type": "path"
-      },
-      "original": {
-        "path": "./nixos/vscode",
-        "type": "path"
-      }
-    },
-    "vscode-server_2": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1729422940,

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "Loki flake config";
+  description = "Panoptes flake config";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -8,7 +8,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    vscode-server.url = "path:./nixos/vscode";
+    vscode-server.url = "github:nix-community/nixos-vscode-server";
   };
 
   outputs = {
@@ -19,50 +19,64 @@
     ...
   } @ inputs:
   let
+    stateVersion = "24.11";
     inherit (self) outputs;
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    stateVersion = "24.05";
-    timeZone = "America/Chicago";
-    hostname = "panoptes-nix";
-    user = "panoptes";
+    nixosSystem = inputs.nixpkgs.lib.nixosSystem;
+    
+    userSettings = rec {
+      username = "panoptes";
+      gitUserName = "John Lancaster";
+      gitUserEmail = "32917998+jsl12@users.noreply.github.com";
+      # gitUserEmail = "asdfasdf@asdf.com";
+    };
+
+    systemSettings = rec {
+      hostName = "panoptes-nix";
+      system = "x86_64-linux";
+      timeZone = "America/Chicago";
+      locale = "en_US.UTF-8";
+    };
+
+    pkgs = inputs.nixpkgs.legacyPackages.${systemSettings.system};
+    pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${systemSettings.system};
+
   in
   {
     nixosConfigurations = {
-      ${hostname} = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+      "${systemSettings.hostName}" = nixosSystem {
+        system = systemSettings.system;
+        specialArgs = {
+          inherit inputs;
+          inherit outputs;
+          inherit userSettings;
+          inherit systemSettings;
+        };
         modules = [
           ./configuration.nix # > Our main nixos configuration file <
-          "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
+          "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
           ({ ... }: {
-            nixpkgs.hostPlatform = "${system}";
             system.stateVersion = "${stateVersion}";
-            time.timeZone = "${timeZone}";
-            environment.systemPackages = [
-              (pkgs.writeShellScriptBin "nfs" ''
-                sudo nixos-rebuild switch --flake git+file:///etc/nixos#${hostname}
-              '')
-            ];
+            services.vscode-server.enable = true;
           })
+          inputs.vscode-server.nixosModules.default
         ];
       };
     };
 
-    # homeManagerModules.default = ./homeManagerModules;
-    # nixosModules.default = ./nixosModules;
-
-    # Standalone home-manager configuration entrypoint
-    # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
       useGlobalPkgs = true;
-      "root@${hostname}" = home-manager.lib.homeManagerConfiguration {
-        extraSpecialArgs = {inherit inputs outputs pkgs;};
-        modules = [ ./home-manager/git.nix ];
-      };
-
-      "${user}@${hostname}" = home-manager.lib.homeManagerConfiguration {
-        extraSpecialArgs = {inherit inputs outputs pkgs;};
-        modules = [ ./home-manager/home.nix ];
+      "panoptes@panoptes-nix" = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs stateVersion;
+        specialArgs = {
+          inherit inputs;
+          inherit outputs;
+          inherit userSettings;
+          inherit systemSettings;
+        };
+        modules = [
+          ./home.nix
+          # ({...}: {home.stateVersion = "${stateVersion}";})
+        ];
       };
     };
   };

home.nix

@@ -0,0 +1,41 @@
+{
+  pkgs,
+  systemSettings,
+  userSettings,
+  ...
+}:
+let
+  homePath = "/srv/panoptes";
+  repoURL = "https://gitea.john-stream.com/john/loki-nix";
+  repoBranch = "reorg";
+in
+{
+  nixpkgs.config.allowUnfree = true;
+  programs.home-manager.enable = true;
+
+  programs.git = {
+    enable = true;
+    extraConfig.credential.helper = "store --file ~/.git-credentials";
+    userName = "${userSettings.gitUserName}";
+    userEmail = "${userSettings.gitUserEmail}";
+    extraConfig.safe.directory = "${homePath}";
+  };
+
+  programs.bash.enable = true;
+  programs.ssh.enable = true;
+
+  home = {
+    homeDirectory = "${homePath}";
+    packages = [
+      (pkgs.writeShellScriptBin "nfs" ''
+        sudo nixos-rebuild switch --flake ${homePath}#${hostName} --impure
+      '')
+      (pkgs.writeShellScriptBin "init-panoptes" ''
+        sudo -u git clone -b ${repoBranch} ${repoURL} /srv/panoptes
+      '')
+      git
+    ];
+  };
+
+  systemd.user.startServices = "sd-switch";
+}

homeManagerModules/git.nix

@@ -1,9 +0,0 @@
-{ ... }:
-{
-  programs.git = {
-    enable = true;
-    extraConfig.credential.helper = "store --file ~/.git-credentials";
-    userName = "John Lancaster";
-    userEmail = "32917998+jsl12@users.noreply.github.com";
-  };
-}

homeManagerModules/home.nix

@@ -1,24 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  homePath = "/srv/panoptes";
-in
-{
-  imports = [ ./git.nix ];
-
-  programs.git.extraConfig.safe.directory = "${homePath}";
-
-  programs.home-manager.enable = true;
-  home = {
-    stateVersion = "24.05";
-    username = "${user}";
-    homeDirectory = "${homePath}";
-  };
-
-  systemd.user.startServices = "sd-switch";
-}

nixosModules/default.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  config,
+  lib,
+  inputs,
+  outputs,
+  ...
+}: {
+  imports =
+    [
+      ./services/loki.nix
+    ];
+
+  config = {
+    nix.settings.experimental-features = ["nix-command" "flakes"];
+    programs.nix-ld.enable = true;
+    nixpkgs.config.allowUnfree = true;
+  };
+}

nixosModules/services/loki.nix

@@ -1,11 +1,13 @@
-{ pkgs, config, lokiPort ? 3100, ... }:
+{ pkgs, config, ... }:
 {
   networking.firewall.allowedTCPPorts = [
     config.services.loki.configuration.server.http_listen_port
   ];
 
   environment.systemPackages = with pkgs; [
-    (pkgs.writeShellScriptBin "loki-check" "curl http://localhost:${builtins.toString lokiPort}/ready")
+    (pkgs.writeShellScriptBin "loki-check" ''
+      curl http://localhost:${config.services.loki.configuration.server.http_listen_port}/ready
+    '')
     (pkgs.writeShellScriptBin "loki-logs" "journalctl -b -u loki.service -n 10")
   ];
   
@@ -14,7 +16,7 @@
     user = "loki";
 
     configuration = {
-      server.http_listen_port = lokiPort;
+      server.http_listen_port = 3100;
       # server.grpc_listen_port = 9096;
       auth_enabled = false;
 

nixosModules/vscode/flake.nix

@@ -1,14 +0,0 @@
-{
-  inputs.vscode-server.url = "github:nix-community/nixos-vscode-server";
-
-  outputs = { self, nixpkgs, vscode-server }: {
-    nixosConfigurations.yourhostname = nixpkgs.lib.nixosSystem {
-      modules = [
-        vscode-server.nixosModules.default
-        ({ config, pkgs, ... }: {
-          services.vscode-server.enable = true;
-        })
-      ];
-    };
-  };
-}