From 3c85ea051551ca939ed5de750265b947a0032070 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Sat, 13 Dec 2025 14:31:21 -0600 Subject: [PATCH] winboat --- .../x86_64-linux/matt@matt-nixos/default.nix | 34 +++--- modules/home/home/default.nix | 1 + systems/x86_64-linux/matt-nixos/default.nix | 3 +- .../matt-nixos/hardware-configuration.nix | 100 ------------------ 4 files changed, 18 insertions(+), 120 deletions(-) delete mode 100755 systems/x86_64-linux/matt-nixos/hardware-configuration.nix diff --git a/homes/x86_64-linux/matt@matt-nixos/default.nix b/homes/x86_64-linux/matt@matt-nixos/default.nix index 7744d57..a472e20 100755 --- a/homes/x86_64-linux/matt@matt-nixos/default.nix +++ b/homes/x86_64-linux/matt@matt-nixos/default.nix @@ -2,7 +2,6 @@ lib, pkgs, namespace, - config, ... }: let @@ -17,7 +16,6 @@ let resolution = "3840x2160"; refreshRate = "240.00000"; }; - theme = config.mjallen.theme.palette; in { home.username = "matt"; @@ -42,14 +40,14 @@ in position = "0x0"; scale = 1.0; extra = [ - "bitdepth" - "10" - "cm" - "hdr" - "sdrbrightness" - "1.2" - "sdrsaturation" - "0.98" + # "bitdepth" + # "10" + # "cm" + # "hdredid" + # "sdrbrightness" + # "1.2" + # "sdrsaturation" + # "0.98" ]; } { @@ -58,14 +56,14 @@ in position = "3840x0"; scale = 1.0; extra = [ - "bitdepth" - "10" - "cm" - "hdr" - "sdrbrightness" - "1.5" - "sdrsaturation" - "0.98" + # "bitdepth" + # "10" + # "cm" + # "hdredid" + # "sdrbrightness" + # "1.5" + # "sdrsaturation" + # "0.98" ]; } ]; diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 5479b83..5d394ff 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -47,6 +47,7 @@ in goverlay mission-center vesktop + winboat ] else [ ] diff --git a/systems/x86_64-linux/matt-nixos/default.nix b/systems/x86_64-linux/matt-nixos/default.nix index 4168df2..240e217 100644 --- a/systems/x86_64-linux/matt-nixos/default.nix +++ b/systems/x86_64-linux/matt-nixos/default.nix @@ -16,14 +16,13 @@ # systems, # An attribute map of your defined hosts. # All other arguments come from the system system. - # config, + config, ... }: { imports = [ ./boot.nix ./filesystems.nix - # ./hardware-configuration.nix ./sops.nix ./services/lsfg-vk ./services/ratbagd diff --git a/systems/x86_64-linux/matt-nixos/hardware-configuration.nix b/systems/x86_64-linux/matt-nixos/hardware-configuration.nix deleted file mode 100755 index 4e43a00..0000000 --- a/systems/x86_64-linux/matt-nixos/hardware-configuration.nix +++ /dev/null @@ -1,100 +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, - modulesPath, - ... -}: -let - defeaultBtrfsOptions = [ - "compress=zstd" - "autodefrag" - ]; -in -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - options = [ - "defaults" - "size=25%" - "mode=755" - ]; - }; - - fileSystems."/nix" = { - device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d"; - fsType = "btrfs"; - options = [ - "subvol=nix" - "noatime" - ] - ++ defeaultBtrfsOptions; - }; - - fileSystems."/etc" = { - device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d"; - fsType = "btrfs"; - options = [ - "subvol=etc" - "noatime" - ] - ++ defeaultBtrfsOptions; - }; - - fileSystems."/root" = { - device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d"; - fsType = "btrfs"; - options = [ - "subvol=root" - "noatime" - ] - ++ defeaultBtrfsOptions; - }; - - fileSystems."/var/log" = { - device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d"; - fsType = "btrfs"; - options = [ - "subvol=log" - "noatime" - ] - ++ defeaultBtrfsOptions; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/c6cf43cb-d0d2-4111-bc81-994e41b2632d"; - fsType = "btrfs"; - options = [ - "subvol=home" - ] - ++ defeaultBtrfsOptions; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/216E-A7AC"; - fsType = "vfat"; - }; - - swapDevices = [ - { - device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5P2NS0T307907H-part2"; - randomEncryption.enable = true; - } - ]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp10s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}