Config bombadil

Author: vic

Diff for: flake.lock

@@ -1,29 +1,52 @@
-#  nix build .#.nixosConfigurations.installer.config.system.build.isoImage
+#  nix build .#.nixosConfigurations.bombadil.config.system.build.isoImage
 {
   modulesPath,
   pkgs,
   config,
+  lib,
+  inputs,
   ...
 }:
 {
-  imports = [
-    "${toString modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
-  ];
-  boot.initrd.kernelModules = [ "wl" ];
-  boot.kernelModules = [
-    "kvm-intel"
-    "wl"
-  ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-  nixpkgs.hostPlatform = "x86_64-linux";
-  nixpkgs.config.allowUnfree = true;
-  environment.systemPackages = [
-    pkgs.vim
-    pkgs.git
-    pkgs.sops
-  ];
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
+  imports = with inputs.self.nixosModules; [
+    "${toString modulesPath}/installer/cd-dvd/installation-cd-base.nix"
+    nix-features
+    vic
+    vic-autologin
+    macos-keys
+    kvm-intel
+    wl-broadcom
+    all-firmware
+    ./static.nix
   ];
+
+  lib.isoFileSystems."/home/vic" = {
+    device = "/dev/disk/by-label/vic";
+    fsType = "ext4";
+  };
+
+
+  vix.features.macos-keys.enable = true;
+
+  isoImage.edition = lib.mkDefault config.networking.hostName;
+  networking.networkmanager.enable = true;
+  networking.wireless.enable = lib.mkImageMediaOverride false;
+
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
+  services.blueman.enable = true;
+  services.pulseaudio.enable = false;
+
+  # https://gist.github.com/nat-418/1101881371c9a7b419ba5f944a7118b0
+  services.xserver = {
+    enable = true;
+    desktopManager = {
+      xterm.enable = false;
+      xfce.enable = true;
+    };
+  };
+  services.displayManager = {
+    defaultSession = "xfce";
+    enable = true;
+  };
 }

Diff for: hosts/bombadil/configuration.nix

@@ -0,0 +1,5 @@
+{
+  networking.hostName = "bombadil";
+  nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "25.05";
+}

Diff for: hosts/bombadil/static.nix

@@ -0,0 +1,8 @@
+{ inputs, ... }:
+{
+  imports = with inputs.self.homeModules; [
+    vic
+    vic-desktop
+  ];
+  home.stateVersion = with import ./../static.nix; system.stateVersion;
+}

Diff for: hosts/bombadil/users/vic.nix

@@ -6,26 +6,26 @@
 {
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/28a29cc4-7325-4911-a96a-9d82d1fb2021";
+    device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/856A-9AB5";
+    device = "/dev/disk/by-label/boot";
     fsType = "vfat";
     options = [
       "fmask=0077"
       "dmask=0077"
     ];
   };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/fc6e67f6-3b0f-4a6b-b7ee-6977b5fc98d6";
-    fsType = "ext4";
-  };
+  # fileSystems."/home" = {
+  #   device = "/dev/disk/by-uuid/fc6e67f6-3b0f-4a6b-b7ee-6977b5fc98d6";
+  #   fsType = "ext4";
+  # };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/6f9b9136-d3aa-4c2d-9e7e-b5aea574bca0"; }
-  ];
+  # swapDevices = [
+  #   { device = "/dev/disk/by-uuid/6f9b9136-d3aa-4c2d-9e7e-b5aea574bca0"; }
+  # ];
 
 }

Diff for: hosts/smaug/filesystems.nix

@@ -1,13 +1,14 @@
-{ pkgs, ... }:
+{ pkgs, osConfig, lib, ... }:
 {
 
-  home.packages = with pkgs; [
-    librewolf
-    vscode
-    wezterm
-    ghostty
-    code-cursor
-    zed-editor
-  ];
+  home.packages = ([
+    pkgs.librewolf
+    pkgs.vscode
+    pkgs.wezterm
+    pkgs.ghostty
+  ]) ++ (lib.optionals (osConfig.networking.hostName != "bombadil") [
+    pkgs.code-cursor
+    pkgs.zed-editor
+  ]);
 
 }

Diff for: modules/home/vic-desktop.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   perSystem,
   osConfig,
@@ -7,9 +8,7 @@
 {
 
   imports = [
-    ./devshells.nix
     ./nix-registry.nix
-    ./nix-index.nix
     ./vic/secrets.nix
     ./vic/ssh.nix
     ./vic/fish.nix
@@ -18,35 +17,41 @@
     ./vic/doom.nix
     ./vic/nvim.nix
     ./vic/dots.nix
-  ];
+  ] ++ (lib.optionals (osConfig.networking.hostName != "bombadil") [
+    ./devshells.nix
+    ./nix-index.nix
+  ]);
 
   home.packages =
     let
-      anywhere = [
-        perSystem.nix-versions.default
+      nonBombadil = lib.optionals (osConfig.networking.hostName != "bombadil") [
         perSystem.nox.default
         perSystem.self.devicon-lookup # for eee
         perSystem.self.leader
+        pkgs.yazi # file tui
+        pkgs.zoxide # cd
+        pkgs.nix-search-cli
+        pkgs.nixd # lsp
+        pkgs.nixfmt-rfc-style
+        pkgs.ispell
+      ];
+
+      anywhere = nonBombadil ++ [
+        perSystem.nix-versions.default
         perSystem.self.vic-sops-get
         pkgs.tree
         pkgs.fzf
         pkgs.ripgrep # grep
         pkgs.bat # cat
         pkgs.bottom
         pkgs.htop
-        pkgs.yazi # file tui
         pkgs.eza # ls
-        pkgs.zoxide # cd
         pkgs.fd # find
         pkgs.lazygit # no magit
         pkgs.tig # alucard
         pkgs.cachix
         pkgs.gh
         pkgs.jq
-        pkgs.nix-search-cli
-        pkgs.nixd # lsp
-        pkgs.nixfmt-rfc-style
-        pkgs.ispell
       ];
 
       perHost = {