passing to colmena

hive.nix

@@ -0,0 +1,18 @@
+{
+  meta.nixpkgs = <nixpkgs>;
+  defaults = { pkgs, ... }: {
+    imports = [ 
+      (import <home-manager/nixos>)
+      ./modules
+    ];
+    boot.tmp.useTmpfs = true;
+  };
+  kat-probook = { name, nodes, ... }: {
+    imports = [
+      ./machines/kat-probook/configuration.nix
+      ./users/home_manager.nix
+    ];
+    deployment.allowLocalDeployment = true;
+    networking.hostName = name;
+  };
+}

machines/kat-probook/configuration.nix

@@ -1,35 +1,25 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, mods, ... }:
 
 {
   imports =
     [
       ./hardware-configuration.nix
-      ./home_manager.nix
-      (import <home-manager/nixos>)
     ];
 
-  boot.tmp.useTmpfs = true;  
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.supportedFilesystems = [ "bcachefs" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  networking.hostName = "katvayor"; # Define your hostname.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
   time.timeZone = "Europe/Paris";
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
     font = "Lat2-Terminus16";
     keyMap = "fr";
-  #  useXkbConfig = true; # use xkb.options in tty.
   };
 
   # Enable the X11 windowing system.
@@ -126,7 +116,7 @@
   # };
   home-manager.users.root = {
     home.stateVersion = "23.11";
-    imports = [ ./neovim ./zsh.nix ];
+    imports = [ "${mods}/neovim" "${mods}/zsh.nix" ];
   };
 
   services.syncthing = {

modules/default.nix

@@ -0,0 +1,3 @@
+{ ... }: {
+  config._module.args = { mods = ./.; };
+}

users/home_manager.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, mods, ... }:
 {
   imports = [
     (import <home-manager/nixos>)
@@ -6,7 +6,7 @@
   home-manager.users.catvayor = {
     home.stateVersion = "23.11";
 
-    imports = [ ./neovim ./zsh.nix ];
+    imports = [ "${mods}/neovim" "${mods}/zsh.nix" ];
 
     xdg.configFile."sway/config".onChange = lib.mkForce "";
 
@@ -37,8 +37,8 @@
     programs.thunderbird.enable = true;
     programs.thunderbird.profiles = {};
     programs.waybar.enable = true;
-    home.file.".config/waybar" = { source = ./waybar; recursive = true; };
-    programs.alacritty = { enable = true; settings = lib.importTOML ./alacritty.toml; };
+    home.file.".config/waybar" = { source = "${mods}/waybar"; recursive = true; };
+    programs.alacritty = { enable = true; settings = lib.importTOML "${mods}/alacritty.toml"; };
     services.mako = {
       enable = true;
       width = 400;
@@ -60,7 +60,7 @@
     xdg.enable = true;
 
     services.swayidle =
-      let lockwall = pkgs.runCommand "lock_wall.jpg" {} ''${pkgs.ffmpeg}/bin/ffmpeg -i ${./wall.jpg} -filter_complex 'gblur=sigma=3' $out -y'';
+      let lockwall = pkgs.runCommand "lock_wall.jpg" {} ''${pkgs.ffmpeg}/bin/ffmpeg -i ${"${mods}/wall.jpg"} -filter_complex 'gblur=sigma=3' $out -y'';
       in {
       enable = true;
       timeouts = [
@@ -87,7 +87,7 @@
         let menuCmd = "${pkgs.wofi}/bin/wofi --show drun -i | xargs swaymsg exec --";
             exitMd = ''Exit Mode:| (l)Log out | (r)Reboot | (p)Poweroff'';
             weechatCmd = pkgs.writeShellScript "weechat.sh" ''
-              nix-shell -p python3 python311Packages.dbus-python python311Packages.notify2 --run 'python ${./weenotify.py} -s' > /dev/null &
+              nix-shell -p python3 python311Packages.dbus-python python311Packages.notify2 --run 'python ${"${mods}/weenotify.py"} -s' > /dev/null &
               while true; do
                 ssh -R 5431:localhost:5431 weecat@watcher.kat -t screen -xaA -S weechat
                 sleep 1
@@ -123,7 +123,7 @@
           command = "waybar";
           mode = "hide";
         }];
-        output."*".bg = "${./wall.jpg} fill";
+        output."*".bg = "${"${mods}/wall.jpg"} fill";
         seat."*"."hide_cursor" = "5000";
         focus.wrapping = "yes";
         window.titlebar = false;