diff options
Diffstat (limited to '')
| -rw-r--r-- | configurations/default.nix | 14 | ||||
| -rw-r--r-- | configurations/eonwe/default.nix | 84 | ||||
| -rw-r--r-- | configurations/melian/default.nix | 67 |
3 files changed, 91 insertions, 74 deletions
diff --git a/configurations/default.nix b/configurations/default.nix index 684b4e4..a488cf1 100644 --- a/configurations/default.nix +++ b/configurations/default.nix @@ -46,13 +46,13 @@ in }; }; - # Planned: a beefy tower desktop PC. - # eonwe.modules = with inputs; [ - # nixos-hardware.nixosModules.common-cpu-amd - # nixos-hardware.nixosModules.common-gpu-amd - # nixos-hardware.nixosModules.common-pc-ssd - # nixpkgs.nixosModules.notDetected - # ]; + # A beefy desktop PC: 7950x/rx6750xt/128GB. + eonwe.modules = with inputs; [ + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-gpu-amd + nixos-hardware.nixosModules.common-pc-ssd + nixpkgs.nixosModules.notDetected + ]; # ThinkPad T480. melian.modules = with inputs; [ diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix new file mode 100644 index 0000000..c9af8e5 --- /dev/null +++ b/configurations/eonwe/default.nix @@ -0,0 +1,84 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; { + nixfiles.modules = { + wireguard.client.enable = true; + + syncthing.enable = true; + + openssh.server.enable = true; + + games = { + lutris.enable = true; + steam.enable = true; + }; + android.enable = true; + bluetooth.enable = true; + libvirtd.enable = true; + qutebrowser.enable = true; + }; + + hm.programs = { + firefox.profiles.default.settings."media.ffmpeg.vaapi.enabled" = true; + + mpv.config = { + hwdec = "vdpau"; + vo = "vdpau"; + profile = "gpu-hq"; + }; + }; + + networking = { + interfaces = { + eth0.useDHCP = true; + wlan0.useDHCP = true; + }; + + networkmanager = { + enable = true; + wifi.backend = "iwd"; + }; + + wireless = { + enable = false; + iwd.enable = true; + userControlled.enable = true; + allowAuxiliaryImperativeNetworks = true; + }; + }; + + boot = { + initrd.availableKernelModules = ["ahci" "nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci"]; + + loader = { + efi.canTouchEfiVariables = true; + + systemd-boot = { + enable = true; + configurationLimit = 10; + }; + }; + }; + + fileSystems = { + "/boot" = { + device = "/dev/disk/by-uuid/FF1E-9CFD"; + fsType = "vfat"; + }; + + "/" = { + device = "/dev/disk/by-uuid/20276c1b-7e46-430b-b741-2f4aeb76bc51"; + fsType = "xfs"; + options = ["noatime"]; + }; + }; + + zramSwap = { + enable = true; + memoryPercent = 25; + }; +} diff --git a/configurations/melian/default.nix b/configurations/melian/default.nix index bfdc42e..f296546 100644 --- a/configurations/melian/default.nix +++ b/configurations/melian/default.nix @@ -6,21 +6,11 @@ }: with lib; { nixfiles.modules = { - games = { - lutris.enable = true; - steam.enable = true; - }; - wireguard.client.enable = true; syncthing.enable = true; - android.enable = true; - beets.enable = true; bluetooth.enable = true; - libvirtd.enable = true; - mpd.enable = true; - qutebrowser.enable = true; throttled.enable = true; }; @@ -34,63 +24,6 @@ with lib; { networkmanager = { enable = true; wifi.backend = "iwd"; - - # Spent three days trying to make this work but still getting "No SSO - # handler" even on the HEAD version that 100% has SSO support baked in. - # It's all so tiresome[1]... aaand KDE is not supported[2]. - # - # I fucking hate AnyConnect, truly an example of how shit is is non-free - # software. SAML also sucks balls. I also hate my company for using this - # shit, guess I have no other choice but to use the absolute dogshit - # Ubuntu laptop they gave me. - # - # [1]: https://gitlab.gnome.org/GNOME/NetworkManager-openconnect - # [1]: https://gitlab.com/openconnect/openconnect/-/issues/424 - # [2]: https://groups.google.com/g/linux.debian.bugs.dist/c/lK8u-LMY7n4 - # [2]: https://bugs.kde.org/show_bug.cgi?id=448153 - # - # plugins = with pkgs; [ - # ((networkmanager-openconnect.override { - # withGnome = false; - # openconnect = openconnect.overrideAttrs (_: super: { - # version = "unstable-2022-10-23"; - # src = fetchFromGitLab { - # owner = "openconnect"; - # repo = "openconnect"; - # rev = "acdfc753f7885b2a539f99036ac41ba1b78cc7ae"; - # hash = "sha256-ub+Z4WFD77h5YMQTb+TLc7EyY2KjBWglF1QVTirCHJM="; - # }; - # }); - # }).overrideAttrs (_: super: { - # version = "unstable-2022-09-10"; - # src = fetchFromGitLab { - # domain = "gitlab.gnome.org"; - # owner = "GNOME"; - # repo = "NetworkManager-openconnect"; - # rev = "3c1590786518e9acca33c250660ad21cae565acd"; - # hash = "sha256-YTUN46QHsHkXPAhImPG/MMLMqjlSRknapVO8u43nnWk="; - # }; - # buildInputs = super.buildInputs ++ [ - # (webkitgtk_4_1.override { - # libsoup = gnome.libsoup; - # }) - # ]; - # nativeBuildInputs = super.nativeBuildInputs ++ [ - # autoreconfHook - # ]; - # postPatch = '' - # substituteInPlace configure.ac \ - # --replace "PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)" "" - # ''; - # preAutoreconf = '' - # autoupdate - # ''; - # preConfigure = '' - # NOCONFIGURE=x ./autogen.sh - # touch gtk4/nm-openconnect-dialog.ui - # ''; - # })) - # ]; }; wireless = { |