From a308923512de25a7525991b07565cb1965472e43 Mon Sep 17 00:00:00 2001 From: kenji Date: Sat, 13 Dec 2025 09:35:21 -0600 Subject: [PATCH] a --- config.nix | 6 +++--- flake.lock | 8 ++++---- hosts/hakase/configuration.nix | 1 + hosts/hakase/hardware-configuration.nix | 8 ++++---- modules/default/apps.nix | 2 +- modules/home/desktop.nix | 10 ++++++++++ 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/config.nix b/config.nix index 8c80ca3..1b80c65 100644 --- a/config.nix +++ b/config.nix @@ -20,10 +20,10 @@ nixos = { Hostname = "hakase"; Timezone = "America/Chicago"; - enableSteamOS = true; + enableSteamOS = false; Boot = { - mode = "limine"; # systemd or grub + mode = "systemd"; # systemd or grub }; Apps = { packages = pkgs: @@ -44,7 +44,7 @@ # "DP-2, highres@165,0x1080,1,vrr,1" # "DP-2, highres@180,0x1080,1,cm,hdr, sdrbrightness, 1.5, sdrsaturation, 0.98" "DP-2, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98" - "DP-1, highres@highrr,0x0,1" + "DP-1, highres@highrr,760x0,1" "HDMI-A-1, 1920x1080@120, 20000x20000,1" # "HDMI-A-1, disabled" ]; diff --git a/flake.lock b/flake.lock index cc815f9..dc6c57e 100644 --- a/flake.lock +++ b/flake.lock @@ -1421,11 +1421,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1765553301, - "narHash": "sha256-3lmVVCbRvPR0JurxSIuLBNl4olcQZrumwMOS491pMKI=", + "lastModified": 1765590160, + "narHash": "sha256-yPQvWKXLacx12xb5yGHuWkS9dcjti0J+lXRVP88191M=", "ref": "refs/heads/main", - "rev": "6335cdce16e3b3ca493b4432bc62312d989321f5", - "revCount": 3766, + "rev": "c8d0cec782e26fc7b0eda80be940216e1b25bd02", + "revCount": 3772, "type": "git", "url": "https://git.sakamoto.dev/kenji/illogical-impulse.git" }, diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 5c3361b..2c40137 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -75,6 +75,7 @@ powerOnBoot = true; settings = { General = { + Enable = "Source,Sink,Media,Socket"; # AutoEnable = true; Experimental = true; MultiProfile = "multiple"; diff --git a/hosts/hakase/hardware-configuration.nix b/hosts/hakase/hardware-configuration.nix index 8997e37..caf22fa 100644 --- a/hosts/hakase/hardware-configuration.nix +++ b/hosts/hakase/hardware-configuration.nix @@ -8,20 +8,20 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/mapper/luks-9091013c-0763-40a6-8316-d44d52df3530"; + { device = "/dev/mapper/luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-9091013c-0763-40a6-8316-d44d52df3530".device = "/dev/disk/by-uuid/9091013c-0763-40a6-8316-d44d52df3530"; + boot.initrd.luks.devices."luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714".device = "/dev/disk/by-uuid/f8bd85aa-b08e-472a-b7f6-5e190b9b9714"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B332-BF84"; + { device = "/dev/disk/by-uuid/72BA-AF9B"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; diff --git a/modules/default/apps.nix b/modules/default/apps.nix index 69585c0..37abdc5 100644 --- a/modules/default/apps.nix +++ b/modules/default/apps.nix @@ -14,7 +14,7 @@ grim ]; imports = [ - ../../packages/virtualbox/default.nix + # ../../packages/virtualbox/default.nix # ../../packages/lact/default.nix ]; hardware.amdgpu.overdrive.enable = true; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index a31bc89..0de5ce3 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -1,6 +1,7 @@ { inputs, pkgs, + lib, ... }: { imports = [ @@ -12,6 +13,15 @@ hyprland.useNixForConf = false; simpleStarship.enable = true; }; + + # wayland.windowManager.hyprland = { + # settings = { + # monitor = lib.mkForce [ + # "DP-1, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98" + # "DP-2, highres@highrr,760x0,1" + # ]; + # }; + # }; # programs.illogical-impulse.settings.simpleStarship.enable = true; home.packages = [ ];