renaming machines for clarity

users/cnst/default.nix

@@ -1,18 +1,8 @@
-{
-  pkgs,
-  lib,
-  config,
-  # osConfig,
-  ...
-}:
-# let
-#   isCnixpad = osConfig.networking.hostName == "cnixpad";
-# in
-{
+{pkgs, ...}: {
   imports = [
     ./modules
+    ./variables
   ];
-  # ++ lib.optionals isCnixpad [./cpmodules.nix];
 
   home = {
     username = "cnst";
@@ -20,21 +10,8 @@
     stateVersion = "23.11";
     extraOutputsToInstall = ["doc" "devdoc"];
     packages = with pkgs; [
-      # misc.system
       bun
     ];
-
-    sessionVariables = {
-      BROWSER = "zen";
-      EDITOR = "hx";
-      TERM = "xterm-256color";
-
-      VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";
-      QT_QPA_PLATFORM = "wayland";
-      XDG_SESSION_TYPE = "wayland";
-      # GEMINI_API_KEY = "$(cat ${config.age.secrets.gcapi.path})";
-    };
   };
 
   manual = {
@@ -44,6 +21,4 @@
   };
 
   programs.home-manager.enable = true;
-
-  # systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
 }

users/cnst/modules/bunkopt.nix

@@ -2,7 +2,7 @@
   accounts = {
     username = "cnst";
     mail = "adam@cnst.dev";
-    sshUser = "cnixtop";
+    sshUser = "bunk";
   };
   monitors = [
     {

users/cnst/modules/default.nix

@@ -1,6 +1,19 @@
-{
-  imports = [
-    ./home.nix
-    ./options.nix
-  ];
+{osConfig, ...}: let
+  hostSpecificImports =
+    if osConfig.networking.hostName == "sobotka"
+    then [
+      ./sobotkamod.nix
+      ./sobotkaopt.nix
+    ]
+    else if osConfig.networking.hostName == "bunk"
+    then [
+      ./bunkmod.nix
+      ./bunkopt.nix
+    ]
+    else [
+      ./kimamod.nix
+      ./kimaopt.nix
+    ];
+in {
+  imports = hostSpecificImports;
 }

users/cnst/modules/kimamod.nix

@@ -0,0 +1,155 @@
+{
+  home = {
+    programs = {
+      aerc = {
+        enable = false;
+      };
+      alacritty = {
+        enable = true;
+      };
+      bash = {
+        enable = true;
+      };
+      chromium = {
+        enable = true;
+      };
+      discord = {
+        enable = true;
+        variant = "vesktop";
+      };
+      eza = {
+        enable = true;
+      };
+      floorp = {
+        enable = false;
+      };
+      firefox = {
+        enable = true;
+      };
+      fish = {
+        enable = true;
+      };
+      foot = {
+        enable = true;
+      };
+      fuzzel = {
+        enable = true;
+      };
+      git = {
+        enable = true;
+      };
+      ghostty = {
+        enable = true;
+      };
+      helix = {
+        enable = true;
+      };
+      hyprlock = {
+        enable = true;
+      };
+      jujutsu = {
+        enable = false;
+      };
+      kitty = {
+        enable = false;
+      };
+      misc = {
+        enable = true;
+      };
+      mpv = {
+        enable = true;
+      };
+      neovim = {
+        enable = false;
+      };
+      nvf = {
+        enable = false;
+      };
+      nwg-bar = {
+        enable = true;
+      };
+      rofi = {
+        enable = true;
+      };
+      ssh = {
+        enable = true;
+      };
+      tuirun = {
+        enable = true;
+      };
+      vscode = {
+        enable = false;
+      };
+      waybar = {
+        enable = true;
+      };
+      wezterm = {
+        enable = false;
+      };
+      yazi = {
+        enable = true;
+      };
+      zathura = {
+        enable = true;
+      };
+      zed-editor = {
+        enable = false;
+      };
+      zellij = {
+        enable = false;
+      };
+      zen = {
+        enable = true;
+      };
+      zsh = {
+        enable = false;
+      };
+    };
+    services = {
+      blueman-applet = {
+        enable = false;
+      };
+      copyq = {
+        enable = false;
+      };
+      dconf = {
+        settings = {
+          color-scheme = "prefer-dark";
+        };
+      };
+      dunst = {
+        enable = true;
+      };
+      gpg = {
+        enable = true;
+      };
+      gtk = {
+        enable = true;
+      };
+      hypridle = {
+        enable = true;
+      };
+      hyprpaper = {
+        enable = true;
+      };
+      mako = {
+        enable = false;
+      };
+      nix-index = {
+        enable = true;
+      };
+      protonmail-bridge = {
+        enable = false;
+      };
+      syncthing = {
+        enable = true;
+      };
+      udiskie = {
+        enable = true;
+      };
+      xdg = {
+        enable = true;
+      };
+    };
+  };
+}

users/cnst/modules/kimaopt.nix

@@ -1,8 +1,8 @@
 {
   accounts = {
-    username = "cnstlab";
+    username = "cnst";
     mail = "adam@cnst.dev";
-    sshUser = "cnixlab";
+    sshUser = "kima";
   };
   monitors = [
     {

users/cnst/modules/sobotkaopt.nix

@@ -0,0 +1,44 @@
+{
+  accounts = {
+    username = "cnst";
+    mail = "adam@cnst.dev";
+    sshUser = "sobotka";
+  };
+  monitors = [
+    {
+      name = "DP-3";
+      width = 2560;
+      height = 1440;
+      refreshRate = 240;
+      position = "0x0";
+      transform = 0;
+      bitDepth = 10;
+      workspace = "1";
+      primary = true;
+    }
+    {
+      name = "DP-4";
+      width = 1920;
+      height = 1080;
+      refreshRate = 60;
+      position = "2560x0";
+      transform = 3;
+      workspace = "5";
+      primary = false;
+    }
+    {
+      name = "eDP-1";
+      width = 1920;
+      height = 1200;
+      refreshRate = 60;
+      workspace = "1";
+      primary = false;
+    }
+  ];
+  theme = {
+    background = {
+      lockscreen = "wallpaper_2";
+      desktop = "wallpaper_1";
+    };
+  };
+}

users/cnst/variables/default.nix

@@ -0,0 +1,27 @@
+{osConfig, ...}: let
+  hostSpecificVariables =
+    if osConfig.networking.hostName == "sobotka"
+    then {
+      EDITOR = "hx";
+      TERM = "xterm-256color";
+    }
+    else if osConfig.networking.hostName == "bunk"
+    then {
+      BROWSER = "zen";
+      EDITOR = "hx";
+      TERM = "xterm-256color";
+      QT_QPA_PLATFORM = "wayland";
+      XDG_SESSION_TYPE = "wayland";
+    }
+    else {
+      BROWSER = "zen";
+      EDITOR = "hx";
+      TERM = "xterm-256color";
+      VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
+      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";
+      QT_QPA_PLATFORM = "wayland";
+      XDG_SESSION_TYPE = "wayland";
+    };
+in {
+  home.sessionVariables = hostSpecificVariables;
+}

users/cnstlab/default.nix

@@ -1,43 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  # osConfig,
-  ...
-}:
-# let
-#   isCnixpad = osConfig.networking.hostName == "cnixpad";
-# in
-{
-  imports = [
-    ./modules
-  ];
-  # ++ lib.optionals isCnixpad [./cpmodules.nix];
-
-  home = {
-    username = "cnstlab";
-    homeDirectory = "/home/cnstlab";
-    stateVersion = "23.11";
-    extraOutputsToInstall = ["doc" "devdoc"];
-    packages = with pkgs; [
-      # misc.system
-      bun
-    ];
-
-    sessionVariables = {
-      BROWSER = "zen";
-      EDITOR = "hx";
-      TERM = "xterm-256color";
-    };
-  };
-
-  manual = {
-    html.enable = false;
-    json.enable = false;
-    manpages.enable = false;
-  };
-
-  programs.home-manager.enable = true;
-
-  # systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
-}

users/cnstlab/modules/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./home.nix
-    ./options.nix
-  ];
-}

users/default.nix

@@ -6,7 +6,6 @@
   extraSpecialArgs = {inherit inputs self;};
 
   sharedImports = [
-    # ./etc
     "${self}/scripts"
     inputs.nvf.homeManagerModules.default
     self.nixosModules.home
@@ -14,20 +13,20 @@
   ];
 
   homeImports = {
-    "cnst@cnixtop" =
+    "cnst@kima" =
       sharedImports
       ++ [
         ./cnst
       ];
-    "cnst@cnixpad" =
+    "cnst@bunk" =
       sharedImports
       ++ [
         ./cnst
       ];
-    "cnstlab@cnixlab" =
+    "cnst@sobotka" =
       sharedImports
       ++ [
-        ./cnstlab
+        ./cnst
       ];
     "toothpick@toothpc" =
       sharedImports