diff --git a/flake.nix b/flake.nix index 82d765b..fb54dd6 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,7 @@ pkgsUnfree = unfree.legacyPackages.${system}; pkgsUnstable = import unstable { inherit system; }; - overlays = import ./overlays.nix { inherit inputs system; }; + overlays = import ./overlays.nix { inherit inputs system pkgsUnfree; }; specialArgs = { inherit diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix index d726697..d6be30a 100644 --- a/hosts/hermes/configuration.nix +++ b/hosts/hermes/configuration.nix @@ -3,7 +3,8 @@ inputs, pkgsUnstable, ... -}: { +}: +{ imports = [ ./tlp.nix ./hardware-configuration.nix @@ -16,7 +17,7 @@ networking = { hostName = "hermes"; hostId = "b7d14532"; - networkmanager.enable = true; #TODO this is a bugfix, evaluate later + networkmanager.enable = true; # TODO this is a bugfix, evaluate later firewall.enable = false; }; @@ -30,7 +31,7 @@ ]; }; - services.udev.packages = [inputs.mypkgs.legacyPackages.x86_64-linux.edl]; + services.udev.packages = [ inputs.mypkgs.legacyPackages.x86_64-linux.edl ]; components = { desktop = { @@ -43,15 +44,34 @@ tailscale = { enable = true; initialAuthKey = "tskey-auth-k5VoMt2CNTRL-C4sAH3gN4u596AcSmBdwz5ZDXZnX1vHM"; - tags = ["ajax" "nixos"]; + tags = [ + "ajax" + "nixos" + ]; advertiseExitNode = false; }; }; - home-manager.users.${user} = {...}: { - imports = [./home.nix]; + home-manager.users.${user} = + { ... }: + { + imports = [ ./home.nix ]; + }; + home-manager.extraSpecialArgs = { + inherit inputs pkgsUnstable; + }; + + nixpkgs.config.allowUnfree = true; + programs.steam = { + enable = true; + gamescopeSession.enable = true; }; - home-manager.extraSpecialArgs = {inherit inputs pkgsUnstable;}; + programs.gamemode.enable = true; + environment.systemPackages = with pkgsUnstable; [ + mangohud + protonup + seventeenlands + ]; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/hermes/hardware-configuration.nix b/hosts/hermes/hardware-configuration.nix index 32d387b..f097ac8 100644 --- a/hosts/hermes/hardware-configuration.nix +++ b/hosts/hermes/hardware-configuration.nix @@ -5,7 +5,8 @@ lib, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") inputs.nixos-hardware.nixosModules.dell-xps-15-9560-intel @@ -21,9 +22,9 @@ "sd_mod" "rtsx_pci_sdmmc" ]; - initrd.kernelModules = []; - kernelModules = ["kvm-intel"]; - extraModulePackages = []; + initrd.kernelModules = [ ]; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; kernel.sysctl = { "fs.inotify.max_user_watches" = "1048576"; }; @@ -46,7 +47,11 @@ fileSystems."/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; - options = ["noatime" "nodiratime" "discard"]; + options = [ + "noatime" + "nodiratime" + "discard" + ]; }; fileSystems."/boot" = { device = "/dev/disk/by-label/ESP"; @@ -58,7 +63,7 @@ services.fstrim.enable = true; services.fstrim.interval = "daily"; - swapDevices = [{device = "/dev/disk/by-label/swap";}]; + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/overlays.nix b/overlays.nix index 4f6227a..ad81480 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,8 +1,10 @@ { inputs, system, + pkgsUnfree, ... -}: { +}: +{ caddy = _self: _super: { caddy-patched = inputs.caddy.packages.${system}.caddy; }; @@ -10,4 +12,10 @@ neovim = inputs.neovim.packages.${system}.default; }; nur = inputs.nur.overlay; + steam = _self: _super: { + inherit (pkgsUnfree) steam; + }; + steam-orig = _self: _super: { + inherit (pkgsUnfree) steam-orig; + }; }