Merge branch 'main' of src:greg/nixos-config

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 stages:
   - eval
   - build
+  - push
 
 default:
   tags:
@@ -24,13 +25,27 @@ default:
 
 "Build image":
   stage: build
-  parallel:
+  parallel: &parallel
     matrix:
       - IMG:
           - img-bitwarden
+  artifacts:
+    paths:
+      - "*.tar.gz"
   script:
     - nix run "nixpkgs#podman" -- login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
     - nix build ".#${IMG}"
-    - nix run "nixpkgs#podman" -- load -i result
-    - nix run "nixpkgs#podman" -- tag "localhost/${IMG}:latest" "$CI_REGISTRY/greg/ci-images/${IMG}:latest"
-    - nix run "nixpkgs#podman" -- push "$CI_REGISTRY/greg/ci-images/${IMG}:latest"
+    - cp -L result "${IMG}.tar.gz"
+
+"Push Image":
+  stage: push
+  parallel: *parallel
+  dependencies:
+    - "Build image"
+  image: podman:latest
+  tags:
+    - kubernetes
+  script:
+    - podman load -i "${IMG}.tar.gz"
+    - podman tag "localhost/${IMG}:latest" "$CI_REGISTRY/greg/ci-images/${IMG}:latest"
+    - podman push "$CI_REGISTRY/greg/ci-images/${IMG}:latest"

home/default.nix

@@ -13,10 +13,8 @@ let
         allowUnfreePredicate = _: true;
       };
     });
-  ivr =
-    let
-      system = "aarch64-darwin";
-    in
+  user =
+    system: host: username:
     top.hmunstable.lib.homeManagerConfiguration {
       pkgs = pkgs system;
       modules = [
@@ -24,15 +22,17 @@ let
         ./home.nix
       ];
       extraSpecialArgs = {
-        inherit top;
+        inherit top host username;
         nixvim = top.nixvimunstable;
         gui = false;
         gnome = false;
-        host = "ivr";
-        username = "gregory.hellings";
       };
     };
+  greg = host: (user "x86_64-linux" host "greg");
 in
 {
-  "MacBook-Pro.local" = ivr;
+  "MacBook-Pro.local" = user "aarch64-darwin" "ivr" "gregory.hellings";
+  exodus = greg "exodus";
+  jude = greg "jude";
+  isaiah = greg "isaiah";
 }

home/home.nix

@@ -3,9 +3,18 @@
   lib,
   host ? "most",
   top,
+  username,
   ...
 }:
-
+let
+  homeDirectory =
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "/Users/${username}"
+    else if username == "root" then
+      "/root"
+    else
+      "/home/${username}";
+in
 {
   imports = [
     top.nixvimunstable.homeManagerModules.nixvim
@@ -13,30 +22,33 @@
     ./baseline
   ] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
 
-  home.stateVersion = "25.05";
+  home = {
+    inherit homeDirectory username;
 
-  home.packages = with pkgs; [
-    copier
-    diffutils
-    findutils
-    gh
-    git
-    gnupatch
-    hms
-    btop
-    inetutils
-    jq
-    nano
-    nix-prefetch
-    nmap
-    openssl
-    setup-ssh
-    tmux
-    tree
-    unzip
-    wget
-    zip
-  ];
+    packages = with pkgs; [
+      copier
+      diffutils
+      findutils
+      gh
+      git
+      gnupatch
+      hms
+      btop
+      inetutils
+      jq
+      nano
+      nix-prefetch
+      nmap
+      openssl
+      setup-ssh
+      tmux
+      tree
+      unzip
+      wget
+      zip
+    ];
+    stateVersion = "25.05";
+  };
 
   programs.tmux = {
     enable = true;

hosts/baseline.nix

@@ -210,7 +210,7 @@ in
     shell = config.programs.xonsh.package;
     initialPassword = "password";
     openssh.authorizedKeys.keys = lib.strings.splitString "\n" (
-      builtins.readFile ../../home/ssh/authorized_keys
+      builtins.readFile ../home/ssh/authorized_keys
     );
   };
 

hosts/exodus/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   top,
   ...
 }:
@@ -23,8 +22,6 @@
     ];
   };
 
-  environment.defaultPackages = [ pkgs.code-cursor ];
-
   greg = {
     home = true;
     gnome.enable = true;

hosts/isaiah/default.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   top,
   ...
@@ -75,18 +74,6 @@
   };
 
   services = {
-    gitlab-runner = {
-      enable = true;
-      settings = {
-        concurrent = 5;
-      };
-      services = {
-        kubernetes = {
-          authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
-          executor = "shell";
-        };
-      };
-    };
     k3s.clusterInit = true; # This is the first node in the cluster
     openssh = {
       enable = true;