nix/configuration/configuration.nix

@@ -9,9 +9,9 @@
 {
   imports = [
     ./roles/reset
-    ./roles/global_options
     ./util/unfree_polyfill
     ./roles/iso
+    ./hosts/odo
     "${
       builtins.fetchTarball {
         url = "https://github.com/nix-community/disko/archive/refs/tags/v1.9.0.tar.gz";
@@ -55,8 +55,6 @@
     ./roles/wasm
     ./roles/vnc_client
     ./roles/chromecast
-    ./roles/memtest86
-    ./roles/kodi
   ];
 
   nix.settings.experimental-features = [

nix/configuration/flake.nix

@@ -81,19 +81,11 @@
       };
       systems = {
         odo = {
-          main = nixpkgs.lib.nixosSystem (
+          main = nixpkgs.lib.nixosSystem (base_x86_64_linux // { });
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/odo
-              ];
-            }
-          );
           iso = nixpkgs.lib.nixosSystem (
             base_x86_64_linux
             // {
               modules = base_x86_64_linux.modules ++ [
-                ./hosts/odo
                 (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
                 # TODO: Figure out how to do image based appliances
                 # (nixpkgs + "/nixos/modules/profiles/image-based-appliance.nix")
@@ -106,36 +98,10 @@
             }
           );
         };
-        neelix = {
-          main = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/neelix
-              ];
-            }
-          );
-          iso = nixpkgs.lib.nixosSystem (
-            base_x86_64_linux
-            // {
-              modules = base_x86_64_linux.modules ++ [
-                ./hosts/neelix
-                (nixpkgs + "/nixos/modules/installer/cd-dvd/iso-image.nix")
-                {
-                  isoImage.makeEfiBootable = true;
-                  isoImage.makeUsbBootable = true;
-                  me.buildingIso = true;
-                }
-              ];
-            }
-          );
-        };
       };
     in
     {
       nixosConfigurations.odo = systems.odo.main;
       iso.odo = systems.odo.iso.config.system.build.isoImage;
-      nixosConfigurations.neelix = systems.neelix.main;
-      iso.neelix = systems.neelix.iso.config.system.build.isoImage;
     };
 }

nix/configuration/hosts/neelix/default.nix

@@ -1,32 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    ./hardware-configuration.nix
-    ./disk-config.nix
-    ./optimized_build.nix
-    ./power_management.nix
-    ./screen_brightness.nix
-    ./wifi.nix
-  ];
-
-  # Generate with `head -c4 /dev/urandom | od -A none -t x4`
-  networking.hostId = "fbd233d8";
-
-  networking.hostName = "neelix"; # Define your hostname.
-
-  time.timeZone = "America/New_York";
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  me.secureBoot.enable = false;
-
-  # Early KMS
-  boot.initrd.kernelModules = [ "i915" ];
-
-  # Mount tmpfs at /tmp
-  boot.tmp.useTmpfs = true;
-
-  me.graphical = true;
-  me.graphicsCardType = "intel";
-
-  me.kodi.enable = true;
-}

nix/configuration/hosts/neelix/disk-config.nix

@@ -1,140 +0,0 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-lib.mkIf (!config.me.buildingIso) {
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [
-                  "umask=0077"
-                  "noatime"
-                  "discard"
-                ];
-              };
-            };
-            zfs = {
-              size = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            };
-          };
-        };
-      };
-    };
-    zpool = {
-      zroot = {
-        type = "zpool";
-        # mode = "mirror";
-        # Workaround: cannot import 'zroot': I/O error in disko tests
-        options.cachefile = "none";
-        options = {
-          ashift = "12";
-          compatibility = "openzfs-2.2-freebsd";
-          autotrim = "on";
-        };
-        rootFsOptions = {
-          acltype = "posixacl";
-          atime = "off";
-          relatime = "off";
-          xattr = "sa";
-          mountpoint = "none";
-          compression = "lz4";
-          canmount = "off";
-          utf8only = "on";
-          dnodesize = "auto";
-          normalization = "formD";
-        };
-
-        datasets = {
-          "linux/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "none";
-          };
-          "linux/nix/root" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/root@blank$' || zfs snapshot zroot/linux/nix/root@blank";
-          };
-          "linux/nix/nix" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/nix";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/nix@blank$' || zfs snapshot zroot/linux/nix/nix@blank";
-            options = {
-              recordsize = "1MiB";
-              compression = "lz4";
-            };
-          };
-          "linux/nix/home" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/home";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/home@blank$' || zfs snapshot zroot/linux/nix/home@blank";
-          };
-          "linux/nix/persist" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/persist";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/persist@blank$' || zfs snapshot zroot/linux/nix/persist@blank";
-          };
-          "linux/nix/state" = {
-            type = "zfs_fs";
-            options.mountpoint = "legacy";
-            mountpoint = "/state";
-            postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/linux/nix/state@blank$' || zfs snapshot zroot/linux/nix/state@blank";
-          };
-        };
-      };
-    };
-  };
-
-  # Make sure all persistent volumes are marked as neededForBoot
-  #
-  # Also mounts /home so it is mounted before the user home directories are created.
-  fileSystems."/persist".neededForBoot = true;
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/home".neededForBoot = true;
-
-  fileSystems."/".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/nix".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/persist".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/state".options = [
-    "noatime"
-    "norelatime"
-  ];
-  fileSystems."/home".options = [
-    "noatime"
-    "norelatime"
-  ];
-}

nix/configuration/hosts/neelix/hardware-configuration.nix

@@ -1,32 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

nix/configuration/hosts/neelix/optimized_build.nix

@@ -1,78 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ];
-
-  config = lib.mkMerge [
-    { }
-    (lib.mkIf (!config.me.buildingIso) {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-alderlake"
-        "gccarch-x86-64-v3"
-        "benchmark"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-
-      # nixpkgs.hostPlatform = {
-      #   gcc.arch = "alderlake";
-      #   gcc.tune = "alderlake";
-      #   system = "x86_64-linux";
-
-      # };
-
-      nixpkgs.overlays = [
-        (
-          self: super:
-          let
-            optimizeWithFlags =
-              pkg: flags:
-              pkg.overrideAttrs (old: {
-                NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-              });
-            addConfig =
-              additionalConfig: pkg:
-              pkg.override (oldconfig: {
-                structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
-              });
-          in
-          {
-            linux_alderlake =
-              addConfig
-                {
-                  # Full preemption
-                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
-                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
-
-                  # Google's BBRv3 TCP congestion Control
-                  TCP_CONG_BBR = lib.kernel.yes;
-                  DEFAULT_BBR = lib.kernel.yes;
-
-                  # Preemptive Full Tickless Kernel at 300Hz
-                  HZ = lib.kernel.freeform "300";
-                  HZ_300 = lib.kernel.yes;
-                  HZ_1000 = lib.kernel.no;
-                }
-                (
-                  optimizeWithFlags super.linux_6_12 [
-                    "-march=alderlake"
-                    "-mtune=alderlake"
-                  ]
-                );
-          }
-        )
-      ];
-
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_alderlake;
-    })
-    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_12;
-      boot.supportedFilesystems = [ "zfs" ];
-    })
-  ];
-}

nix/configuration/hosts/neelix/power_management.nix

@@ -1,46 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  environment.systemPackages = with pkgs; [
-    powertop
-  ];
-
-  # pcie_aspm=force pcie_aspm.policy=powersupersave :: Enable PCIe active state power management for power reduction.
-  # nowatchdog :: Disable watchdog for power savings (related to disable_sp5100_watchdog above).
-  boot.kernelParams = [
-    "pcie_aspm=force"
-    # "pcie_aspm.policy=powersupersave"
-    "nowatchdog"
-  ];
-
-  # systemd.tmpfiles.rules = [
-  #   "w- /sys/firmware/acpi/platform_profile - - - - low-power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy1/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy2/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy3/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy4/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy5/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy6/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy7/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy8/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy9/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy10/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy11/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy12/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy13/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy14/energy_performance_preference - - - - power"
-  #   "w- /sys/devices/system/cpu/cpufreq/policy15/energy_performance_preference - - - - power"
-  # ];
-
-  boot.extraModprobeConfig = ''
-    options snd_hda_intel power_save=1
-  '';
-}

nix/configuration/hosts/neelix/screen_brightness.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  # systemd.tmpfiles.rules = [
-  #   "w- /sys/class/backlight/amdgpu_bl1/brightness - - - - 85"
-  # ];
-}

nix/configuration/hosts/neelix/wifi.nix

@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  # config = {
-  #   environment.loginShellInit = lib.mkIf (!config.me.buildingIso) ''
-  #     doas iw dev wlan0 set power_save off
-  #   '';
-  # };
-}

nix/configuration/hosts/odo/default.nix

@@ -31,6 +31,4 @@
 
   me.graphical = true;
   me.graphicsCardType = "amd";
-
-  me.sway.enable = true;
 }

nix/configuration/hosts/odo/disk-config.nix

@@ -1,6 +1,3 @@
-# Manual Step:
-#   Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
-#   Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
 {
   config,
   lib,

nix/configuration/hosts/odo/optimized_build.nix

@@ -7,75 +7,65 @@
 {
   imports = [ ];
 
-  config = lib.mkMerge [
+  nix.settings.system-features = lib.mkForce [
-    { }
+    "gccarch-znver4"
-    (lib.mkIf (!config.me.buildingIso) {
+    "gccarch-skylake"
-      nix.settings.system-features = lib.mkForce [
+    # "gccarch-alderlake" missing WAITPKG
-        "gccarch-znver4"
+    "gccarch-x86-64-v3"
-        "gccarch-skylake"
+    "gccarch-x86-64-v4"
-        # "gccarch-alderlake" missing WAITPKG
+    "benchmark"
-        "gccarch-x86-64-v3"
+    "big-parallel"
-        "gccarch-x86-64-v4"
+    "kvm"
-        "benchmark"
+    "nixos-test"
-        "big-parallel"
-        "kvm"
-        "nixos-test"
-      ];
-
-      # nixpkgs.hostPlatform = {
-      #   gcc.arch = "znver4";
-      #   gcc.tune = "znver4";
-      #   system = "x86_64-linux";
-
-      # };
-
-      nixpkgs.overlays = [
-        (
-          self: super:
-          let
-            optimizeWithFlags =
-              pkg: flags:
-              pkg.overrideAttrs (old: {
-                NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
-              });
-            addConfig =
-              additionalConfig: pkg:
-              pkg.override (oldconfig: {
-                structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
-              });
-          in
-          {
-            linux_znver4 =
-              addConfig
-                {
-                  # Full preemption
-                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
-                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
-
-                  # Google's BBRv3 TCP congestion Control
-                  TCP_CONG_BBR = lib.kernel.yes;
-                  DEFAULT_BBR = lib.kernel.yes;
-
-                  # Preemptive Full Tickless Kernel at 300Hz
-                  HZ = lib.kernel.freeform "300";
-                  HZ_300 = lib.kernel.yes;
-                  HZ_1000 = lib.kernel.no;
-                }
-                (
-                  optimizeWithFlags super.linux_6_12 [
-                    "-march=znver4"
-                    "-mtune=znver4"
-                  ]
-                );
-          }
-        )
-      ];
-
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_znver4;
-    })
-    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_12;
-      boot.supportedFilesystems.zfs = true;
-    })
   ];
+
+  # nixpkgs.hostPlatform = {
+  #   gcc.arch = "znver4";
+  #   gcc.tune = "znver4";
+  #   system = "x86_64-linux";
+  # };
+
+  nixpkgs.overlays = [
+    (
+      self: super:
+      let
+        optimizeWithFlags =
+          pkg: flags:
+          pkg.overrideAttrs (old: {
+            NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
+          });
+        addConfig =
+          additionalConfig: pkg:
+          pkg.override (oldconfig: {
+            structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
+          });
+      in
+      {
+        linux_znver4 =
+          addConfig
+            {
+              # Full preemption
+              PREEMPT = lib.mkOverride 60 lib.kernel.yes;
+              PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
+
+              # Google's BBRv3 TCP congestion Control
+              TCP_CONG_BBR = lib.kernel.yes;
+              DEFAULT_BBR = lib.kernel.yes;
+
+              # Preemptive Full Tickless Kernel at 300Hz
+              HZ = lib.kernel.freeform "300";
+              HZ_300 = lib.kernel.yes;
+              HZ_1000 = lib.kernel.no;
+            }
+            (
+              optimizeWithFlags super.linux_6_12 [
+                "-march=znver4"
+                "-mtune=znver4"
+              ]
+            );
+      }
+    )
+  ];
+
+  boot.kernelPackages = lib.mkIf (!config.me.buildingIso) (pkgs.linuxPackagesFor pkgs.linux_znver4);
 }

nix/configuration/roles/blank/default.nix

@@ -8,23 +8,6 @@
 {
   imports = [ ];
 
-  options.me = {
+  environment.systemPackages = with pkgs; [
-    blank.enable = lib.mkOption {
+  ];
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install blank.";
-    };
-  };
-
-  config = lib.mkIf config.me.blank.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-        ];
-      }
-      (lib.mkIf config.me.graphical {
-      })
-    ]
-  );
 }

nix/configuration/roles/global_options/default.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-
-  };
-
-  # options.me.graphicsCardType = lib.mkOption {
-  #   type = lib.types.nullOr (
-  #     lib.types.enum [
-  #       "amd"
-  #       "intel"
-  #       "nvidia"
-  #     ]
-  #   );
-  #   default = null;
-  #   example = "amd";
-  #   description = "What graphics card type is in the computer.";
-  # };
-
-  # options.me.graphical = lib.mkOption {
-  #   type = lib.types.bool;
-  #   default = false;
-  #   example = true;
-  #   description = "Whether we want to install graphical programs.";
-  # };
-}

nix/configuration/roles/kodi/default.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    kodi.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install kodi.";
-    };
-  };
-
-  config = lib.mkIf config.me.kodi.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-        ];
-      }
-      (lib.mkIf config.me.graphical {
-        users.extraUsers.kodi.isNormalUser = true;
-        services.cage.user = "kodi";
-        services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
-        services.cage.enable = true;
-      })
-    ]
-  );
-}

nix/configuration/roles/memtest86/default.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-  config = lib.mkMerge [
-    { }
-    (lib.mkIf (config.me.buildingIso) {
-      # boot.loader.systemd-boot.memtest86.enable = true;
-      boot.loader.grub.memtest86.enable = true;
-    })
-  ];
-}

nix/configuration/roles/network/default.nix

@@ -40,7 +40,6 @@
     10.216.1.1		homeserver
     10.216.1.6		media
     #10.216.1.12		odo
-    10.216.1.14		neelix
     10.217.1.1		drmario
     10.217.2.1		mrmanager
   '';

nix/configuration/roles/sway/default.nix

@@ -266,15 +266,6 @@ in
     ./notification.nix
   ];
 
-  options.me = {
-    sway.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install sway.";
-    };
-  };
-
   options.me.swayIncludes = lib.mkOption {
     type = lib.types.listOf lib.types.package;
     default = [ ];
@@ -286,7 +277,7 @@ in
     description = "List of packages to import as sway configs.";
   };
 
-  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
+  config = {
     environment.systemPackages = with pkgs; [
       alacritty
       pcmanfm

nix/configuration/roles/sway/force_focus.nix

@@ -19,7 +19,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
+  config = lib.mkIf config.me.graphical {
     me.swayIncludes = [
       force_focus_sway_config
     ];

nix/configuration/roles/sway/iso.nix

@@ -16,7 +16,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.buildingIso && config.me.graphical && config.me.sway.enable) {
+  config = lib.mkIf (config.me.buildingIso) {
     # Launch a terminal at boot in the live ISO for when hotkeys don't work.
     me.swayIncludes = [
       launch_terminal

nix/configuration/roles/sway/lockscreen.nix

@@ -25,7 +25,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
+  config = lib.mkIf config.me.graphical {
     me.swayIncludes = [
       lockscreen_sway_config
     ];

nix/configuration/roles/sway/notification.nix

@@ -24,7 +24,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
+  config = lib.mkIf config.me.graphical {
     me.swayIncludes = [
       notification_sway_config
     ];

nix/configuration/roles/sway/rofimoji.nix

@@ -17,7 +17,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
+  config = lib.mkIf config.me.graphical {
     me.swayIncludes = [
       rofimoji_sway_config
     ];
@@ -49,14 +49,14 @@ in
       })
       (final: prev: {
         tofi = pkgs.symlinkJoin {
-          name = "tofi";
+            name = "tofi";
-          paths = [ prev.tofi ];
+            paths = [ prev.tofi ];
-          buildInputs = [ pkgs.makeWrapper ];
+            buildInputs = [ pkgs.makeWrapper ];
-          postBuild = ''
+            postBuild = ''
-            wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
+              wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
-            wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
+              wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
-          '';
+            '';
-        };
+          };
       })
     ];
   };

nix/configuration/roles/sway/screenshot.nix

@@ -34,7 +34,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
+  config = lib.mkIf config.me.graphical {
     me.swayIncludes = [
       screenshot_sway_config
     ];