chore: Merge remote-tracking branch 'origin/main'

packages/hosts/default.nix

@@ -6,6 +6,7 @@ in
   beefcake = stableHost ./beefcake.nix { };
   dragon = host ./dragon.nix { };
   foxtrot = host ./foxtrot.nix { };
+  thinker = host ./thinker.nix { };
   htpc = stableHost ./htpc.nix { };
   # arm-dragon = host ./dragon.nix { system = "aarch64-linux"; };
 }

packages/hosts/thinker.nix

@@ -1,19 +1,13 @@
-{ ... }:
+{ diskoConfigurations, hardware, ... }:
 {
-  networking.hostName = "thinker";
+  system.stateVersion = "24.11";
+  networking.hostName = "foxtrot";
 
   boot = {
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
-    /*
-      sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}'
-      the above won't work for btrfs, instead you need
-      btrfs inspect-internal map-swapfile -r /swap/swapfile
-      https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file
-    */
-    # kernelParams = ["boot.shell_on_fail"];
     initrd.availableKernelModules = [
       "xhci_pci"
       "nvme"
@@ -21,57 +15,32 @@
     ];
   };
 
-  home-manager.users.daniel = {
-    programs.hyprlock.settings = {
-      label = [
-        {
-          monitor = "";
-          font_size = 32;
-
-          halign = "center";
-          valign = "center";
-          text_align = "center";
-          color = "rgba(255, 255, 255, 0.5)";
-
-          position = "0 -500";
-          font_family = "IosevkaLyteTerm";
-          text = "cmd[update:30000] acpi";
-
-          shadow_passes = 3;
-          shadow_size = 1;
-          shadow_color = "rgba(0, 0, 0, 1.0)";
-          shadow_boost = 1.0;
-        }
-      ];
-    };
-    services.hypridle =
-      let
-        secondsPerMinute = 60;
-        lockSeconds = 10 * secondsPerMinute;
-      in
-      {
-        settings = {
-          listener = [
-            {
-              timeout = lockSeconds + 55;
-              on-timeout = ''systemctl suspend'';
-            }
-          ];
-        };
-      };
-
-    wayland.windowManager.hyprland = {
-      settings = {
-        exec-once = [
-          "eww open bar0"
-        ];
-        # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-        monitor = [
-          "eDP-1,1920x1080@60Hz,0x0,1.0"
-        ];
-      };
-    };
-  };
+  imports = with hardware; [
+    diskoConfigurations.foxtrot
+    lenovo-thinkpad-t480
+    common-pc-laptop-ssd
+  ];
 
   hardware.bluetooth.enable = true;
+  programs.steam.enable = true;
+  networking.wifi.enable = true;
+  lyte.desktop.enable = true;
+  home-manager.users.daniel = {
+    lyte.shell.enable = true;
+    lyte.desktop.enable = true;
+    home = {
+      stateVersion = "24.11";
+      file.".config/easyeffects/output" = {
+        enable = true;
+        source = fetchGit {
+          url = "https://github.com/ceiphr/ee-framework-presets";
+          rev = "27885fe00c97da7c441358c7ece7846722fd12fa";
+        };
+      };
+    };
+    services.easyeffects = {
+      enable = true;
+      preset = "philonmetal";
+    };
+  };
 }

packages/machines.nix

@@ -173,45 +173,6 @@ in
     };
   */
 
-  thinker = nixpkgs-unstable.lib.nixosSystem {
-    system = "x86_64-linux";
-    modules = with nixosModules; [
-      home-manager-unstable-defaults
-
-      {
-        _module.args = {
-          disks = [ "/dev/nvme0n1" ];
-          swapSize = "32G";
-        };
-      }
-      outputs.diskoConfigurations.standard
-      hardware.nixosModules.lenovo-thinkpad-t480
-      hardware.nixosModules.common-pc-laptop-ssd
-
-      music-production
-      common
-      password-manager
-      graphical-workstation
-      # plasma6
-      laptop
-      gaming
-
-      ./nixos/thinker.nix
-
-      {
-        home-manager.users.daniel = {
-          imports = with homeManagerModules; [
-            senpai
-            iex
-            cargo
-            linux-desktop-environment-config
-            slippi.homeManagerModules.default
-          ];
-        };
-      }
-    ];
-  };
-
   musicbox = nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
     modules = with nixosModules; [