partial host migrations to flake parts

flake.nix

@@ -8,32 +8,6 @@
       flake-parts,
       ...
     }@inputs:
-    let
-      cLib = import ./lib { inherit (nixpkgs) lib; };
-      mkLinuxSystem =
-        mod: ovl:
-        nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs cLib; };
-          modules = [
-            inputs.home-manager.nixosModules.home-manager
-            inputs.stylix.nixosModules.stylix
-            inputs.agenix.nixosModules.default
-            {
-              nixpkgs.config.allowUnfree = true;
-              nixpkgs.overlays = [ self.overlays.default ] ++ ovl;
-            }
-            self.nixosModules.nix-config
-            self.nixosModules.boot
-            self.nixosModules.gpg-pinentry-wayland
-            self.nixosModules.keys
-            self.nixosModules.hm
-            self.nixosModules.secrets
-            self.nixosModules.tailscale
-            self.nixosModules.deploy
-          ]
-          ++ mod;
-        };
-    in
     flake-parts.lib.mkFlake { inherit self inputs; } {
       imports = [
         inputs.flake-parts.flakeModules.easyOverlay
@@ -44,18 +18,6 @@
 
       systems = import inputs.systems;
 
-      flake = {
-        # TODO: use ./hosts/
-        nixosConfigurations = {
-          artemis = mkLinuxSystem [ ./hosts/artemis ] [ ];
-          hermes =
-            mkLinuxSystem
-              [ ./hosts/hermes inputs.nocodb.nixosModules.nocodb inputs.copyparty.nixosModules.default ]
-              [ inputs.copyparty.overlays.default ];
-        };
-        diskoConfigurations = { }; # maybe?
-      };
-
       perSystem =
         {
           config,

home/c/programs/fish/default.nix

@@ -1,14 +1,16 @@
 {
   pkgs,
-  cLib,
+  lib,
   ...
-}: let
+}:
+let
   mkFishPlug = pkg: {
     name = pkg.pname;
     inherit (pkg) src;
   };
-  tmux = cLib.getProgFor pkgs "tmux";
+  tmux = lib.getExe pkgs.tmux;
-in {
+in
+{
   programs.fish = {
     enable = true;
 
@@ -19,7 +21,9 @@ in {
     '';
 
     # TODO: dont use this directly
-    shellAliases = {v = "nvim";};
+    shellAliases = {
+      v = "nvim";
+    };
 
     functions = {
       __trap_exit_tmux = {

home/c/programs/hypr/default.nix

@@ -1,29 +1,27 @@
 {
   pkgs,
-  cLib,
   lib,
   ...
-}: let
+}:
-  getProgFor' = cLib.getProgFor' pkgs;
+let
-  getProgFor = cLib.getProgFor pkgs;
+  web = lib.getExe pkgs.firefox;
-  web = getProgFor "firefox";
+  chat = lib.getExe pkgs.discord;
-  # mail = "";
+  media = lib.getExe pkgs.spotify;
-  chat = getProgFor "discord";
+  terminal = lib.getExe pkgs.alacritty;
-  media = getProgFor "spotify";
+  runner = lib.getExe pkgs.rofi;
-  terminal = getProgFor "alacritty";
+  rofi-rbw = lib.getExe' pkgs.rofi-rbw-wayland "rofi-rbw";
-  runner = getProgFor "rofi";
+  tmux = lib.getExe pkgs.tmux;
-  rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw";
+  slurp = lib.getExe pkgs.slurp;
-  tmux = getProgFor "tmux";
+  grim = lib.getExe pkgs.grim;
-  slurp = getProgFor "slurp";
+  wl-copy = lib.getExe' pkgs.wl-clipboard "wl-copy";
-  grim = getProgFor "grim";
+  mullvad = lib.getExe' pkgs.mullvad-vpn "mullvad-gui";
-  wl-copy = getProgFor' "wl-clipboard" "wl-copy";
+  playerctl = lib.getExe pkgs.playerctl;
-  mullvad = getProgFor' "mullvad-vpn" "mullvad-gui";
+  brightnessctl = lib.getExe pkgs.brightnessctl;
-  playerctl = getProgFor "playerctl";
+  wpctl = lib.getExe' pkgs.wireplumber "wpctl";
-  brightnessctl = getProgFor "brightnessctl";
+  hyprlock = lib.getExe pkgs.hyprlock;
-  wpctl = getProgFor' "wireplumber" "wpctl";
+  hyprctl = lib.getExe' pkgs.hyprland "hyprctl";
-  hyprlock = getProgFor "hyprlock";
+in
-  hyprctl = getProgFor' "hyprland" "hyprctl";
+{
-in {
   services = {
     blueman-applet.enable = true;
     network-manager-applet.enable = true;
@@ -156,8 +154,7 @@ in {
 
       "$mainMod" = "SUPER";
 
-      bind =
+      bind = [
-        [
         "$mainMod, q, killactive"
         "$mainMod SHIFT, q, exit"
         "$mainMod, F, fullscreen"
@@ -201,15 +198,20 @@ in {
         ", Print, exec, ${grim} - | ${wl-copy}"
         "$mainMod, 0, exec, ${hyprlock}"
       ]
-        ++ (builtins.concatLists (builtins.genList (x: let
+      ++ (builtins.concatLists (
+        builtins.genList (
+          x:
+          let
             ws = x + 1;
-          in [
+          in
+          [
             "$mainMod, ${toString ws}, workspace, ${toString ws}"
             "$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
             "$mainMod CTRL, ${toString ws}, moveworkspacetomonitor, ${toString ws} current"
             "$mainMod CTRL, ${toString ws}, workspace, ${toString ws}"
-          ])
+          ]
-          9));
+        ) 9
+      ));
 
       workspace = [
         "name:web, on-created-empty: ${web}"
@@ -236,7 +238,7 @@ in {
         ", XF86MonBrightnessDown, exec, ${brightnessctl} -c backlight set 5%-"
       ];
 
-      exec-once = [(toString mullvad)];
+      exec-once = [ (toString mullvad) ];
     };
   };
 }

home/c/programs/tmux/default.nix

@@ -1,13 +1,13 @@
 {
   pkgs,
-  cLib,
+  lib,
   ...
-}: let
+}:
-  getProgFor = cLib.getProgFor pkgs;
+let
-  tmux = getProgFor "tmux";
+  tmux = lib.getExe pkgs.tmux;
-  getProgFor' = cLib.getProgFor pkgs.scenics;
+  tmux-githop = lib.getExe pkgs.scenics.tmux-githop;
-  tmux-githop = getProgFor' "tmux-githop";
+in
-in {
+{
   programs.tmux = {
     enable = true;
     shortcut = "x";
@@ -21,7 +21,7 @@ in {
       yank
       {
         plugin = onedark-theme.overrideAttrs (_: {
-          patches = [./bar.patch];
+          patches = [ ./bar.patch ];
         });
         extraConfig = "\n";
       }

home/c/programs/waybar/default.nix

@@ -1,10 +1,12 @@
 {
   pkgs,
-  cLib,
+  lib,
   ...
-}: let
+}:
-  soundControl = cLib.getProgFor pkgs "pwvucontrol";
+let
-in {
+  soundControl = lib.getExe pkgs.pwvucontrol;
+in
+{
   programs.waybar = {
     enable = true;
     package = pkgs.waybar;
@@ -14,9 +16,19 @@ in {
         layer = "top";
         position = "bottom";
         height = 20;
-        modules-left = ["hyprland/workspaces" "hyprland/submap"];
+        modules-left = [
-        modules-center = ["hyprland/window"];
+          "hyprland/workspaces"
-        modules-right = ["temperature" "wireplumber" "backlight" "battery" "clock" "tray"];
+          "hyprland/submap"
+        ];
+        modules-center = [ "hyprland/window" ];
+        modules-right = [
+          "temperature"
+          "wireplumber"
+          "backlight"
+          "battery"
+          "clock"
+          "tray"
+        ];
         clock = {
           tooltip = false;
           interval = 1;
@@ -34,19 +46,34 @@ in {
           format = "{icon}  {capacity}%";
           format-good = "{icon}  {capacity}%";
           format-full = "  {capacity}%";
-          format-icons = ["" "" "" "" ""];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
           tooltip = false;
         };
         wireplumber = {
           on-click = toString soundControl;
           format = "{icon}  {volume}%";
           format-muted = "";
-          format-icons = ["" "" ""];
+          format-icons = [
+            ""
+            ""
+            ""
+          ];
           tooltip = false;
         };
         backlight = {
           format = "{icon} {percent}%";
-          format-icons = ["" "" "" ""];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+          ];
           tooltip = false;
         };
         tray = {
@@ -58,7 +85,7 @@ in {
         temperature = {
           thermal-zone = 5;
           format = "{icon} {temperatureC}°C";
-          format-icons = [""];
+          format-icons = [ "" ];
           interval = 30;
           tooltip = false;
         };

hosts/artemis/configuration.nix

@@ -2,30 +2,33 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   nixpkgs.hostPlatform = "x86_64-linux";
   c.services.mesh = {
     enable = true;
     exitNode = false;
     keyFile = config.age.secrets.mesh-conf-cleslie.path;
   };
-  c.services.remote-deploy = {
-    enable = false;
-    keys = config.keys.c;
-  };
 
   time.timeZone = "Europe/London";
   i18n.defaultLocale = "en_GB.UTF-8";
 
   users.users.c = {
     isNormalUser = true;
-    extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout" "wireshark"];
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+      "libvirtd"
+      "dialout"
+      "wireshark"
+    ];
     openssh.authorizedKeys.keys = config.keys.c;
     shell = pkgs.fish;
-    packages = with pkgs; [];
+    packages = with pkgs; [ ];
   };
 
-  nix.settings.trusted-users = ["c"];
+  nix.settings.trusted-users = [ "c" ];
 
   environment.systemPackages = with pkgs; [
     vim
@@ -44,13 +47,19 @@
   ];
 
   environment = {
-    variables = {EDITOR = "nvim";};
+    variables = {
-    sessionVariables = {NIXOS_OZONE_WL = "1";};
+      EDITOR = "nvim";
-
+    };
-    shells = with pkgs; [fish];
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1";
     };
 
-  fonts.packages = with pkgs; [meslo-lgs-nf] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+    shells = with pkgs; [ fish ];
+  };
+
+  fonts.packages =
+    with pkgs;
+    [ meslo-lgs-nf ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
   services.udev.packages = [
     pkgs.platformio-core.udev
     pkgs.openocd

hosts/artemis/home.nix

@@ -1,10 +1,7 @@
+{ inputs, ... }:
 {
-  inputs,
-  cLib,
-  ...
-}: {
   programs.hyprlock.enable = true;
-  security.pam.services.hyprlock = {};
+  security.pam.services.hyprlock = { };
   home-manager = {
     sharedModules = [
       {
@@ -16,6 +13,6 @@
       #inputs.self.homeManagerModules.trayscale
     ];
     users.c = import ../../home/c;
-    extraSpecialArgs = {inherit inputs cLib;};
+    extraSpecialArgs = { inherit inputs; };
   };
 }

lib/default.nix

@@ -1,6 +0,0 @@
-{lib, ...}: let
-  getProgFor' = pkgs: prog: progn: lib.getExe' pkgs.${prog} progn;
-  getProgFor = pkgs: prog: getProgFor' pkgs prog prog;
-in {
-  inherit getProgFor getProgFor';
-}

modules/hosts/artemis.nix

@@ -0,0 +1,9 @@
+{ config, ... }:
+{
+  flake.nixosConfigurations.artemis = config.flake.lib.mkHost {
+    modules = [
+      config.flake.nixosModules.profile-laptop
+      ../../hosts/artemis
+    ];
+  };
+}

modules/hosts/hermes.nix

@@ -0,0 +1,12 @@
+{ config, inputs, ... }:
+{
+  flake.nixosConfigurations.hermes = config.flake.lib.mkHost {
+    modules = [
+      config.flake.nixosModules.profile-server
+      inputs.nocodb.nixosModules.nocodb
+      inputs.copyparty.nixosModules.default
+      ../../hosts/hermes
+    ];
+    overlays = [ inputs.copyparty.overlays.default ];
+  };
+}

modules/lib/mk-host.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  inputs,
+  withSystem,
+  ...
+}:
+{
+  flake.lib.mkHost =
+    {
+      system ? "x86_64-linux",
+      modules,
+      overlays ? [ ],
+    }:
+    withSystem system (
+      { ... }:
+      inputs.nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs; }; # TODO: REMOVE
+        modules = modules ++ [
+          {
+            nixpkgs.config.allowUnfree = true;
+            nixpkgs.overlays = [ config.flake.overlays.default ] ++ overlays;
+          }
+        ];
+      }
+    );
+}

modules/profiles/base.nix

@@ -1,13 +1,15 @@
-{ config, ... }:
+{ inputs, config, ... }:
 {
   flake.nixosModules.profile-base = {
-    import = with config.flake.nixosModules; [
+    imports = [
-      nix-config
+      inputs.home-manager.nixosModules.home-manager
-      boot
+      inputs.agenix.nixosModules.default
-      keys
+      config.flake.nixosModules.nix-config
-      hm # maybe drop and make desktop only?
+      config.flake.nixosModules.boot
-      secrets
+      config.flake.nixosModules.keys
-      tailscale
+      config.flake.nixosModules.hm
+      config.flake.nixosModules.secrets
+      config.flake.nixosModules.tailscale
     ];
   };
 }

modules/profiles/graphical.nix

@@ -1,9 +1,9 @@
-{ config, ... }:
+{ config, inputs, ... }:
 {
   flake.nixosModules.profile-graphical = {
     imports = [
-      config.flake.nixosmodules.profile-base
+      config.flake.nixosModules.profile-base
-      config.flake.nixosModules.pinentry-fix-wayland
+      config.flake.nixosModules.gpg-pinentry-wayland
       inputs.stylix.nixosModules.stylix
     ];
   };