diff --git a/flake.lock b/flake.lock index 10df4613..c21852e0 100644 --- a/flake.lock +++ b/flake.lock @@ -1141,11 +1141,11 @@ ] }, "locked": { - "lastModified": 1740839257, - "narHash": "sha256-rHEB0JnNyXJ1lvxUZZiRYV5elNil5hXO1792Fl807zc=", + "lastModified": 1741460499, + "narHash": "sha256-+162iWgwCKkkvrse9CBatsj4O0IyHj2SquBldXB3qsk=", "ref": "refs/heads/main", - "rev": "53406ca30dca3007caf57fdc940506e64f605f17", - "revCount": 20, + "rev": "a3a90b3f485e677a096199c04c6e1cf48fdc8464", + "revCount": 24, "type": "git", "url": "file://path:/etc/nixos.secrets" }, diff --git a/hosts/polarias/README.org b/hosts/duskfall/README.org similarity index 100% rename from hosts/polarias/README.org rename to hosts/duskfall/README.org diff --git a/hosts/polarias/configuration.nix b/hosts/duskfall/configuration.nix similarity index 96% rename from hosts/polarias/configuration.nix rename to hosts/duskfall/configuration.nix index d9871de7..32fce15d 100644 --- a/hosts/polarias/configuration.nix +++ b/hosts/duskfall/configuration.nix @@ -17,7 +17,7 @@ flatpak.enable = false; virtualization = { docker.enable = true; - virtualMachines.enable = true; + virtualMachines.enable = false; }; # wm diff --git a/hosts/polarias/default.nix b/hosts/duskfall/default.nix similarity index 100% rename from hosts/polarias/default.nix rename to hosts/duskfall/default.nix diff --git a/hosts/polarias/hardware-configuration.nix b/hosts/duskfall/hardware-configuration.nix similarity index 61% rename from hosts/polarias/hardware-configuration.nix rename to hosts/duskfall/hardware-configuration.nix index db9c7cd6..8a39a009 100644 --- a/hosts/polarias/hardware-configuration.nix +++ b/hosts/duskfall/hardware-configuration.nix @@ -17,57 +17,25 @@ enable32Bit = lib.mkDefault true; }; - # my stupid usb hub crashes systemct suspend half of the time now - # https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Sleep_hooks - systemd.services.root-suspend = { - enable = true; - description = "Root systemd suspend prehook"; - unitConfig = { - Description = "Root systemd suspend prehook"; - Before = "sleep.target"; - }; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a off"; - }; - wantedBy = [ "sleep.target" ]; - }; - systemd.services.root-resume = { - enable = true; - description = "Root systemd suspend posthook"; - unitConfig = { - Description = "Root systemd suspend posthook"; - After = "suspend.target"; - }; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.uhubctl}/bin/uhubctl -a on"; - }; - wantedBy = [ "suspend.target" ]; - }; - - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" "hid_generic" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/3618968f-1717-4c8e-b0d8-2556d18d2c4b"; + { device = "/dev/disk/by-uuid/9982bd44-cfaa-4959-8e30-3341f728c29a"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-06fa6e93-9bde-4703-830e-7ee1a7292a19".device = "/dev/disk/by-uuid/06fa6e93-9bde-4703-830e-7ee1a7292a19"; + boot.initrd.luks.devices."luks-3165c377-6b98-498c-bd86-20a8fc530e9d".device = "/dev/disk/by-uuid/3165c377-6b98-498c-bd86-20a8fc530e9d"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E1BC-04BB"; + { device = "/dev/disk/by-uuid/4DA8-3F95"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/d52b7852-f35f-4325-9adc-24aa5d3da2a3"; - } - ]; + swapDevices = [ ]; services.pipewire.enable = lib.mkForce false; hardware.pulseaudio.enable = true; diff --git a/hosts/polarias/home.nix b/hosts/duskfall/home.nix similarity index 83% rename from hosts/polarias/home.nix rename to hosts/duskfall/home.nix index 768e389e..3fea033c 100644 --- a/hosts/polarias/home.nix +++ b/hosts/duskfall/home.nix @@ -37,12 +37,14 @@ bluetooth.enable = true; }; + home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable { + AQ_DRM_DEVICES = lib.mkForce "/dev/dri/card0"; + }; + wayland.windowManager.hyprland = lib.mkIf config.userSettings.hyprland.enable { settings = { monitor = [ - "eDP-1,1920x1080@300,900x1080,1" - "HDMI-A-1,1920x1080,1920x0,1" - "DP-1,1920x1080,0x0,1" + "eDP-1,1920x1080@60,0x0,1" ]; }; diff --git a/modules/system/phoenix/default.nix b/modules/system/phoenix/default.nix index a920f231..4df3ea65 100644 --- a/modules/system/phoenix/default.nix +++ b/modules/system/phoenix/default.nix @@ -71,7 +71,7 @@ nixos-rebuild build --flake .#snowfire; attic push emmet ./result; rm ./result; - nixos-rebuild build --flake .#polarias; + nixos-rebuild build --flake .#duskfall; attic push emmet ./result; rm ./result; nixos-rebuild build --flake .#zenith;