give up on agenix; set up remote deploys (not currently working)

16 files changed, 146 insertions, 249 deletions

diff --git a/flake.lock b/flake.lock
index 55e7306..63739b2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,7 @@
     "agenix": {
       "inputs": {
         "darwin": "darwin",
-        "home-manager": [],
+        "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -60,28 +60,25 @@
         "type": "github"
       }
     },
-    "determinate": {
+    "deploy-rs": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "git-hooks-nix": "git-hooks-nix",
+        "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-23-11": "nixpkgs-23-11",
-        "nixpkgs-regression": "nixpkgs-regression"
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1766174426,
-        "narHash": "sha256-0ZofAQZNgg5nfIKsVb7g4It6ufmIyLtfFRPOf+6WRkk=",
-        "owner": "DeterminateSystems",
-        "repo": "nix-src",
-        "rev": "15d6091194b5b90d292e8d6283db77f09c303b1e",
+        "lastModified": 1766051518,
+        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
         "type": "github"
       },
       "original": {
-        "owner": "DeterminateSystems",
-        "ref": "main",
-        "repo": "nix-src",
+        "owner": "serokell",
+        "repo": "deploy-rs",
         "type": "github"
       }
     },
@@ -124,11 +121,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -153,50 +150,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "determinate",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748821116,
-        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
-        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
-        "revCount": 377,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
-      }
-    },
-    "git-hooks-nix": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": [
-          "determinate"
-        ],
-        "nixpkgs": [
-          "determinate",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
-        "revCount": 1026,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -240,6 +193,27 @@
         "type": "github"
       }
     },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766387499,
+        "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -309,38 +283,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-23-11": {
-      "locked": {
-        "lastModified": 1717159533,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
-        "type": "github"
-      }
-    },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
     "pre-commit": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -367,7 +309,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "determinate": "determinate",
+        "deploy-rs": "deploy-rs",
         "disko": "disko",
         "firefox-csshacks": "firefox-csshacks",
         "hjem": "hjem",
@@ -427,7 +369,7 @@
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay",
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1760525934,
@@ -473,6 +415,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tmux-tsunami": {
       "inputs": {
         "nix-std": "nix-std",
@@ -493,6 +450,24 @@
         "repo": "tmux-tsunami",
         "type": "github"
       }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 5d644c5..d940a9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,14 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    determinate = {
-      url = "github:DeterminateSystems/nix-src/main";
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "";
     };
 
     disko = {
@@ -41,8 +40,8 @@
   };
 
   outputs = inputs: let
-    inherit (import ./lib/nix-furnace/mkSystem.nix) mkNixosSystem mkSystemManagerSystem;
-  in {
+    inherit (import ./lib/nix-furnace/mkSystem.nix) mkNixosSystem;
+  in rec {
     nixosConfigurations."mercury" = mkNixosSystem {
       inherit inputs;
       hostname = "mercury";
@@ -61,5 +60,15 @@
       username = "collin";
       module_types = ["nixos" "hjem"];
     };
+
+    deploy.nodes."ganymede" = {
+      hostname = "ganymede";
+      sshUser = "root";
+
+      profiles.system = {
+        user = "root";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos nixosConfigurations."ganymede";
+      };
+    };
   };
 }
diff --git a/hosts/jupiter/minecraft.nix b/hosts/ganymede/minecraft.nix
index a42e9a0..a42e9a0 100644
--- a/hosts/jupiter/minecraft.nix
+++ b/hosts/ganymede/minecraft.nix
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index af0716d..e4a72e9 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -7,4 +7,5 @@
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "25.05";
 }
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index 9747720..06f2005 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -6,7 +6,6 @@
 
     desktop = {
       gnome.enable = true;
-
       gdm.enable = true;
 
       programs = {
diff --git a/hosts/jupiter/disks.nix b/hosts/jupiter/disks.nix
index ebf76e4..a5b5fae 100644
--- a/hosts/jupiter/disks.nix
+++ b/hosts/jupiter/disks.nix
@@ -1,28 +1,34 @@
-{
-  disko.enableConfig = true;
-  disko.devices = {
-    disk.main = {
-      device = "/dev/nvme0n1";
-      type = "disk";
-      content = {
-        type = "gpt";
-        partitions = {
-          ESP = {
-            type = "EF00";
-            size = "1G";
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-              mountOptions = ["umask=0077"];
+{inputs, ...}: {
+  imports = [
+    inputs.disko.nixosModules.default
+  ];
+
+  disko = {
+    enableConfig = true;
+    devices = {
+      disk.main = {
+        device = "/dev/nvme0n1";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              type = "EF00";
+              size = "1G";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = ["umask=0077"];
+              };
             };
-          };
-          root = {
-            size = "100%";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
             };
           };
         };
diff --git a/hosts/jupiter/hjem.nix b/hosts/jupiter/hjem.nix
index 33d260a..3c85521 100644
--- a/hosts/jupiter/hjem.nix
+++ b/hosts/jupiter/hjem.nix
@@ -1,10 +1,15 @@
 {pkgs, ...}: {
   packages = with pkgs; [
     orca-slicer
+    bambu-studio
+
     freecad-wayland
     gimp
     qbittorrent
     bottles
+
+    vital
     musescore
+    helvum
   ];
 }
diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix
index f318195..5afeefe 100644
--- a/hosts/jupiter/nixos.nix
+++ b/hosts/jupiter/nixos.nix
@@ -4,25 +4,16 @@
   ...
 }: {
   imports = [
-    inputs.disko.nixosModules.disko
     ./disks.nix
-
-    ./samba.nix
-
     inputs.nixos-facter-modules.nixosModules.facter
-    {facter.reportPath = ./facter.json;}
   ];
 
-  time.timeZone = "America/Chicago";
-
   systemd.network.wait-online.enable = false; # fix for weird wifi issue
 
-  # music stuff
-  environment.systemPackages = with pkgs; [vital helvum bambu-studio];
-
   fonts.packages = [pkgs.nerd-fonts.iosevka];
 
-  system.stateVersion = "25.05";
-
+  facter.reportPath = ./facter.json;
+  time.timeZone = "America/Chicago";
   nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "25.05";
 }
diff --git a/hosts/jupiter/samba.nix b/hosts/jupiter/samba.nix
deleted file mode 100644
index 8cf3429..0000000
--- a/hosts/jupiter/samba.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{config, ...}: {
-  users.users.${config.collinux.user.name}.extraGroups = ["brainusers"];
-  users.users.bob = {
-    isNormalUser = true;
-    extraGroups = ["brainusers"];
-    hashedPassword = "$y$j9T$L8CQv7V.LCD3gw/xR8M2T0$A4NHW9qpgc9pua7XE18P6ShICj.PNXHoyMW4yqmEMID";
-  };
-
-  users.groups."brainusers".name = "brainusers";
-
-  # sudo smbpasswd -a collin <PASSWORD>
-  # sudo smbpasswd -n bob # no password
-
-  networking.firewall.allowedTCPPorts = [445];
-  services.samba = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      global = {
-        "workgroup" = "WORKGROUP";
-        "server string" = "brain2.0";
-        "security" = "user";
-        "map to guest" = "Bad User";
-
-        # disable printing
-        "load printers" = "no";
-        "printing" = "bsd";
-        "printcap name" = "/dev/null";
-        "disable spoolss" = "yes";
-      };
-
-      "brain2.0-public" = {
-        path = "/srv/brain";
-        "read only" = "yes";
-        "guest ok" = "yes";
-        "force group" = "brainusers";
-      };
-
-      "brain2.0-admin" = {
-        path = "/srv/brain";
-        "read only" = "no";
-        "valid users" = "collin";
-        writeable = "yes";
-        browseable = "yes";
-        "guest ok" = "no";
-        "create mask" = "0660";
-        "directory mask" = "0770";
-        "force group" = "brainusers";
-      };
-
-      "brain2.0-worldbuilding" = {
-        path = "/srv/brain/notes/worldbuilding";
-        "read only" = "no";
-        "guest ok" = "yes";
-        writeable = "yes";
-        browseable = "yes";
-        public = "yes"; # make windows not ask for password?
-        "create mask" = "0660";
-        "directory mask" = "0770";
-        "force group" = "brainusers";
-
-        "delete readonly" = "no"; # prevent deletion of the directory
-      };
-    };
-  };
-}
diff --git a/modules/services/nixos/ssh.nix b/modules/services/nixos/ssh.nix
index 6db41bf..bf1aefe 100644
--- a/modules/services/nixos/ssh.nix
+++ b/modules/services/nixos/ssh.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -9,8 +8,14 @@ in
   lib.mkIf cfg.enable {
     services.openssh = {
       enable = true;
+      hostKeys = [
+        {
+          path = "/etc/ssh/ssh_host_ed25519_key";
+          type = "ed25519";
+        }
+      ];
       settings = {
-        PermitRootLogin = "no";
+        PermitRootLogin = "prohibit-password";
         PasswordAuthentication = false;
       };
     };
diff --git a/modules/terminal/hjem/programs/lazygit.nix b/modules/terminal/hjem/programs/lazygit.nix
index a939446..5eb546e 100644
--- a/modules/terminal/hjem/programs/lazygit.nix
+++ b/modules/terminal/hjem/programs/lazygit.nix
@@ -7,7 +7,7 @@
   cfg = config.collinux.terminal.programs.lazygit;
 
   settings = {
-    git.paging.pager = "${pkgs.diff-so-fancy}/bin/diff-so-fancy";
+    git.pagers = [(lib.getExe pkgs.diff-so-fancy)];
     gui = {
       showRandomTip = false;
       commitLength.show = false;
diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix
index 0257198..b14e52d 100644
--- a/modules/user/nixos/default.nix
+++ b/modules/user/nixos/default.nix
@@ -6,11 +6,14 @@
 }: let
   cfg = config.collinux.user;
 in {
-  users.users."${cfg.name}" = {
-    isNormalUser = true;
-    description = cfg.name;
-    extraGroups = ["networkmanager" "pipewire" "disks" "input" "video" "dialout" "kvm"] ++ (lib.optional cfg.isAdmin "wheel");
-    hashedPasswordFile = config.age.secrets."${cfg.name}@${hostname}-passwd".path;
+  users = {
+    mutableUsers = true;
+
+    users."${cfg.name}" = {
+      isNormalUser = true;
+      description = cfg.name;
+      extraGroups = ["networkmanager" "pipewire" "disks" "input" "video" "dialout" "kvm"] ++ (lib.optional cfg.isAdmin "wheel");
+    };
   };
   security.sudo-rs.enable = true;
   services.userborn.enable = true;
diff --git a/secrets/collin-jupiter-passwd.age b/secrets/collin-jupiter-passwd.age
deleted file mode 100644
index 2ce36a9..0000000
--- a/secrets/collin-jupiter-passwd.age
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHEzZUV5dyBRR0pM
-UzBhY2ptL1l5UjFTK2RWREhxdjZHMlBCbGNTUWtHblpWd0g3QWhvCnFLb2t2RHhC
-SDI2eHdFY1V5cjcyNjBuVzVtZVdZYmF3UEtOQUxEdk1oMVkKLT4gc3NoLWVkMjU1
-MTkgWjh6aWtnIDUzT011SUZvTWJCWm1LYmlybG1acmprVXdmQmVTM0doSWdva1Jv
-RTdKbW8KRE0wUUJOZEt1WEQwYkVtVXgyYzBOdGJsMHI0akxZc28ySkd5UXk3V3Zz
-VQotLS0gY0xFRDVrQ0ZFbHVUaVNwajBWSVI4YUI3aVR4WUJsRU5zYTBEMWEyKzVh
-WQptqU95IRsooJtCtVgzTZfjp7yZFet841kzAqLzV9vn0LZyQxgjJfta4/fpAGCK
-REnUB9iQ13vugXLjiLFmtUF1wKP/OR9HxsPOg0nBvrdI7T7IH/Zifcmnh8QKxRQK
-TD5g/tmj2Y9P9I7h
------END AGE ENCRYPTED FILE-----
diff --git a/secrets/collin-mercury-passwd.age b/secrets/collin-mercury-passwd.age
deleted file mode 100644
index fff172f..0000000
--- a/secrets/collin-mercury-passwd.age
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHhkakdNZyBRRmZa
-dTJmcmQ1akI1OFJpN1Y1dkFjSElDa0RuYUd3V2l5STRXSDlzV1RRCmZyKzNjbWZm
-RFpDZnFxSTFDUmpRam1KVE84dEVmWFBoWXFzOFRzR0tVQTAKLT4gc3NoLWVkMjU1
-MTkgYXpCaWxnIENrRzV3QVpRc1BUTGZYb0dYcXR3RzIvc1lWS1loZTZxRnIwS1Fa
-bmE4eFkKQWQ1VGY4M0V6ekw2WlRob2w2QmFyZVB5d3Rmb1lYaWlKNlkvTVI1aW1a
-OAotLS0gSDNwamwydTEvNzl1c1lBVzlsWHlTcDF2YVZBUlZwRWRTL1hZWDg5QnpW
-cwrClzpxMgfLhDNpTDq/Kmsdrzu920naw4XlzpBfk+v6tmQIs0mFZpYZMhMpXN+R
-aMNVtYr+3UnvgVpGB+nBR5+LBhtpmvr2I4NXbLS7BVFqaFDX6elmVzr/Ixed+ISC
-yHC1JVVYfEM2S32l
------END AGE ENCRYPTED FILE-----
diff --git a/secrets/default.nix b/secrets/default.nix
index 25dee35..4571e52 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -1,6 +1,6 @@
 {
-  age.secrets = {
-    "collin@mercury-passwd".file = ./collin-mercury-passwd.age;
-    "collin@jupiter-passwd".file = ./collin-jupiter-passwd.age;
+  age = {
+    identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+    secrets = {};
   };
 }
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 7d2119d..aea48e6 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,16 +1,7 @@
 let
-  user_mercury = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAvxtKW0rmRBi8J67gLrLv8Zv338AcmZ3P20DePiUfnX";
-  user_jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGK8U+m6/9g7/AduxQcawJrA2V3lSEUrF7j/oJwPow3q";
-
-  system_mercury = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQtMAgPdWwrOzlZT/lEIRQZ+ajhafG9AEJCrF2/bsmN";
-  system_jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFTSXbRaBDe09gkREhYrRVis+CtxpHOcDoIRdUAAO/Js";
+  # host keys
+  mercury = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQtMAgPdWwrOzlZT/lEIRQZ+ajhafG9AEJCrF2/bsmN";
+  jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPB7feUHl5qoD5zF9AMOV2meViA+wZYdVvbVjPkggZf8";
 in {
-  "collin-mercury-passwd.age" = {
-    publicKeys = [user_mercury system_mercury];
-    armor = true;
-  };
-  "collin-jupiter-passwd.age" = {
-    publicKeys = [user_jupiter system_jupiter];
-    armor = true;
-  };
+  # no secrets as of yet
 }