Convert over cadmium host to blueprint

giodamelio · Feb 7, 2025 · 36bf3d0 · 36bf3d0
1 parent f230598
commit 36bf3d0
Show file tree

Hide file tree

Showing 27 changed files with 48 additions and 69 deletions.
diff --git a/nix/home-modules/default.nix b/nix/home-modules/default.nix
diff --git a/...os-configurations/cadmium/3d-printing.nix → nix/hosts/cadmium/3d-printing.nix b/...os-configurations/cadmium/3d-printing.nix → nix/hosts/cadmium/3d-printing.nix
diff --git a/...xos-configurations/cadmium/bootloader.nix → nix/hosts/cadmium/bootloader.nix b/...xos-configurations/cadmium/bootloader.nix → nix/hosts/cadmium/bootloader.nix
diff --git a/nix/nixos-configurations/cadmium/default.nix → nix/hosts/cadmium/configuration.nix b/nix/nixos-configurations/cadmium/default.nix → nix/hosts/cadmium/configuration.nix
@@ -1,9 +1,6 @@
-{
-  inputs,
-  homelab,
-  ezModules,
-  ...
-}: {
+{ inputs, flake, ... }: let
+  homelab = builtins.fromTOML (builtins.readFile ../../../homelab.toml);
+in {
   imports = [
     inputs.colmena.nixosModules.deploymentOptions
     inputs.home-manager.nixosModules.home-manager
@@ -23,23 +20,21 @@
         openssh.authorizedKeys.keys = homelab.ssh_keys;
       };
       programs.zsh.enable = true;
-
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
     })
 
     # Basic packages I want on every system
-    ezModules.basic-packages
-    ezModules.basic-packages-desktop
-    ezModules.basic-settings
+    flake.nixosModules.basic-packages
+    flake.nixosModules.basic-packages-desktop
+    flake.nixosModules.basic-settings
 
     # Setup user programs/services
-    ezModules.modern-coreutils-replacements
-    ezModules.programs-atuind
+    flake.nixosModules.modern-coreutils-replacements
+    flake.nixosModules.programs-atuind
+    flake.nixosModules.monitoring
     ./3d-printing.nix
 
     # Autosnapshot ZFS and send to NAS
-    ezModules.zfs-backup
+    flake.nixosModules.zfs-backup
     (_: {
       gio.services.zfs_backup = {
         enable = true;
@@ -53,10 +48,10 @@
     })
 
     # Software Development tools
-    ezModules.software-development
+    flake.nixosModules.software-development
 
     # Easy key rebinding
-    ezModules.keyd
+    flake.nixosModules.keyd
 
     ({pkgs, ...}: {
       programs.sway = {

diff --git a/nix/nixos-configurations/cadmium/disko.nix → nix/hosts/cadmium/disko.nix b/nix/nixos-configurations/cadmium/disko.nix → nix/hosts/cadmium/disko.nix
diff --git a/...nixos-configurations/cadmium/hardware.nix → nix/hosts/cadmium/hardware.nix b/...nixos-configurations/cadmium/hardware.nix → nix/hosts/cadmium/hardware.nix
diff --git a/nix/home-configurations/giodamelio.nix → nix/hosts/cadmium/users/giodamelio.nix b/nix/home-configurations/giodamelio.nix → nix/hosts/cadmium/users/giodamelio.nix
@@ -1,22 +1,22 @@
 {
   pkgs,
-  ezModules,
+  flake,
   ...
 }: {
   imports = [
-    ezModules.git
-    ezModules.neovim
-    ezModules.wezterm
-    ezModules.qutebrowser
-    ezModules.zellij
-    ezModules.starship
-    ezModules.zsh
-    ezModules.nushell
-    ezModules.hyprland
-    ezModules.sway
-    ezModules.waybar
-    ezModules.nix-index
-    ezModules.syncthing
+    flake.homeModules.git
+    flake.homeModules.neovim
+    flake.homeModules.wezterm
+    flake.homeModules.qutebrowser
+    flake.homeModules.zellij
+    flake.homeModules.starship
+    flake.homeModules.zsh
+    flake.homeModules.nushell
+    flake.homeModules.hyprland
+    flake.homeModules.sway
+    flake.homeModules.waybar
+    flake.homeModules.nix-index
+    flake.homeModules.syncthing
   ];
 
   home = {

diff --git a/nix/home-modules/hyprland.nix → nix/modules/home/hyprland.nix b/nix/home-modules/hyprland.nix → nix/modules/home/hyprland.nix
diff --git a/nix/home-modules/nix-index.nix → nix/modules/home/nix-index.nix b/nix/home-modules/nix-index.nix → nix/modules/home/nix-index.nix
diff --git a/nix/home-modules/nushell.nix → nix/modules/home/nushell.nix b/nix/home-modules/nushell.nix → nix/modules/home/nushell.nix
diff --git a/nix/home-modules/qutebrowser.nix → nix/modules/home/qutebrowser.nix b/nix/home-modules/qutebrowser.nix → nix/modules/home/qutebrowser.nix
@@ -1,9 +1,9 @@
 {
   pkgs,
-  self,
+  flake,
   ...
 }: let
-  myQutebrowser = self.packages.${pkgs.stdenv.system}.qutebrowser-tree-tabs;
+  myQutebrowser = flake.packages.${pkgs.stdenv.system}.qutebrowser-tree-tabs;
 in {
   programs.qutebrowser = {
     enable = true;

diff --git a/nix/home-modules/starship/default.nix → nix/modules/home/starship/default.nix b/nix/home-modules/starship/default.nix → nix/modules/home/starship/default.nix
diff --git a/...e-modules/starship/starship-nerdfont.toml → ...ules/home/starship/starship-nerdfont.toml b/...e-modules/starship/starship-nerdfont.toml → ...ules/home/starship/starship-nerdfont.toml
diff --git a/nix/home-modules/sway.nix → nix/modules/home/sway.nix b/nix/home-modules/sway.nix → nix/modules/home/sway.nix
@@ -1,4 +1,5 @@
 {
+  perSystem,
   pkgs,
   lib,
   ...
@@ -22,7 +23,7 @@ in {
       menu = "${pkgs.wofi}/bin/wofi --show=drun --allow-images";
 
       # Use Wezterm as our terminal
-      terminal = "${pkgs.wezterm}/bin/wezterm";
+      terminal = "${perSystem.self.wezterm-patched}/bin/wezterm";
 
       # Replace the built in bars with Waybar
       bars = [];

diff --git a/nix/home-modules/syncthing.nix → nix/modules/home/syncthing.nix b/nix/home-modules/syncthing.nix → nix/modules/home/syncthing.nix
diff --git a/nix/home-modules/waybar.nix → nix/modules/home/waybar.nix b/nix/home-modules/waybar.nix → nix/modules/home/waybar.nix
diff --git a/nix/home-modules/wezterm.nix → nix/modules/home/wezterm.nix b/nix/home-modules/wezterm.nix → nix/modules/home/wezterm.nix
diff --git a/nix/home-modules/zellij.nix → nix/modules/home/zellij.nix b/nix/home-modules/zellij.nix → nix/modules/home/zellij.nix
diff --git a/nix/nixos-modules/basic-packages-desktop.nix → nix/modules/nixos/basic-packages-desktop.nix b/nix/nixos-modules/basic-packages-desktop.nix → nix/modules/nixos/basic-packages-desktop.nix
diff --git a/nix/nixos-modules/keyd.nix → nix/modules/nixos/keyd.nix b/nix/nixos-modules/keyd.nix → nix/modules/nixos/keyd.nix
@@ -1,4 +1,4 @@
-_: {
+{
   services.keyd = {
     enable = true;
 

diff --git a/...modules/modern-coreutils-replacements.nix → ...s/nixos/modern-coreutils-replacements.nix b/...modules/modern-coreutils-replacements.nix → ...s/nixos/modern-coreutils-replacements.nix
diff --git a/nix/nixos-modules/programs-atuind.nix → nix/modules/nixos/programs-atuind.nix b/nix/nixos-modules/programs-atuind.nix → nix/modules/nixos/programs-atuind.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{ pkgs, lib, ... }: {
   home-manager.users.giodamelio = _:
     lib.mkMerge [
       # Launch Daemon for SystemD

diff --git a/nix/nixos-modules/software-development.nix → nix/modules/nixos/software-development.nix b/nix/nixos-modules/software-development.nix → nix/modules/nixos/software-development.nix
diff --git a/nix/nixos-modules/default.nix b/nix/nixos-modules/default.nix
diff --git a/nix/overlays/wezterm.nix b/nix/overlays/wezterm.nix
diff --git a/nix/packages/wezterm-patched.nix b/nix/packages/wezterm-patched.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+pkgs.wezterm.overrideAttrs (_: prev: {
+  patches =
+    prev.patches
+    or []
+    ++ [
+      (pkgs.fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/wez/wezterm/pull/6508.patch";
+        sha256 = "sha256-eMpg206tUw8m0Sz+3Ox7HQnejPsWp0VHVw169/Rt4do=";
+      })
+      .outPath
+    ];
+})
diff --git a/src/homeModules/wezterm.nix b/src/homeModules/wezterm.nix
@@ -1,8 +1,10 @@
-_: _: {
+{ perSystem }: {
   programs.wezterm = {
     enable = true;
     enableZshIntegration = true;
 
+    package = perSystem.self.wezterm-patched;
+
     extraConfig = ''
       return {
         font = wezterm.font("JetBrainsMono Nerd Font"),