aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock54
-rw-r--r--machines/common/base.nix4
-rw-r--r--machines/common/default.nix1
-rw-r--r--machines/common/steam.nix47
-rw-r--r--machines/hierophant/configuration.nix12
-rw-r--r--machines/hierophant/hardware-configuration.nix8
6 files changed, 64 insertions, 62 deletions
diff --git a/flake.lock b/flake.lock
index 5d30c9b..14ac1f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
]
},
"locked": {
- "lastModified": 1778716662,
- "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+ "lastModified": 1788450739,
+ "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+ "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
"type": "github"
},
"original": {
@@ -89,11 +89,11 @@
]
},
"locked": {
- "lastModified": 1785119570,
- "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+ "lastModified": 1790996401,
+ "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+ "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
"type": "github"
},
"original": {
@@ -110,11 +110,11 @@
]
},
"locked": {
- "lastModified": 1787144466,
- "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=",
+ "lastModified": 1791128201,
+ "narHash": "sha256-rlsYY/Dg/LhbIj51Aa6TLvRpZeb3KZgUTd7llQ5XcJE=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "0471accf8d0a8210b31d947497d179ecc99e0021",
+ "rev": "31cc5f4d9b9ba601071e8b8504601b9b176e2756",
"type": "github"
},
"original": {
@@ -125,11 +125,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1786089803,
- "narHash": "sha256-ZuvZfVW2tB5tXYEcpcfhVXB3N4OhdZLOqOviy4OD4b4=",
+ "lastModified": 1791031588,
+ "narHash": "sha256-/FGDr01siZ8txrVzkOz6CYjiz0XR27JuVJP+aWchi4s=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ee48b147c18c7de1e6ec97dc74792be42724bed1",
+ "rev": "825e2028c29b702a4a5f085f08095d12099784f2",
"type": "github"
},
"original": {
@@ -141,11 +141,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1786106723,
- "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
+ "lastModified": 1791048980,
+ "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
+ "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed",
"type": "github"
},
"original": {
@@ -157,11 +157,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1781216227,
- "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+ "lastModified": 1789749394,
+ "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+ "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
"type": "github"
},
"original": {
@@ -173,11 +173,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1785318670,
- "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=",
+ "lastModified": 1790578696,
+ "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5",
+ "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
"type": "github"
},
"original": {
@@ -194,11 +194,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1782919967,
- "narHash": "sha256-pRwjfB5HQJ3m8J8bOR43pPHtHI7VUJSqwLA3P06cOY0=",
+ "lastModified": 1789959143,
+ "narHash": "sha256-9oBHyJtUyunZL+6v0Ub8Y759cXcejQiTHpXtGcx5RLs=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "667c8471f4a0fb24d702d1a61af8609f1a5f1ba6",
+ "rev": "4836e77b1798cd42e2de28593bec4c1788da08f5",
"type": "github"
},
"original": {
@@ -224,11 +224,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1785827118,
- "narHash": "sha256-tS2eSSpa1uLPUyIAJBpf00+A9KSHpC92gKMLavmHuio=",
+ "lastModified": 1791104287,
+ "narHash": "sha256-rTICOIpGoV+QRyzWJNFZACpVHOLyL77gcCL64erjvOg=",
"owner": "wimpysworld",
"repo": "sidra",
- "rev": "0597e5438fe98fef935cb528c2c9aa5db60171c9",
+ "rev": "d752e7c5f602c84bc25006c358bd7df93b2a7d5f",
"type": "github"
},
"original": {
diff --git a/machines/common/base.nix b/machines/common/base.nix
index fbef8ae..9ee5dfb 100644
--- a/machines/common/base.nix
+++ b/machines/common/base.nix
@@ -13,10 +13,6 @@
nixpkgs.config.allowUnfree = true;
- programs.steam.enable = true;
- hardware.steam-hardware.enable = true;
- programs.gamescope.enable = true;
-
time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8";
diff --git a/machines/common/default.nix b/machines/common/default.nix
index 9af7dc0..1922bad 100644
--- a/machines/common/default.nix
+++ b/machines/common/default.nix
@@ -7,6 +7,7 @@
./printer.nix
./rip.nix
./tailscale.nix
+ ./steam.nix
./user.nix
];
}
diff --git a/machines/common/steam.nix b/machines/common/steam.nix
index aa4ad84..0f68ca8 100644
--- a/machines/common/steam.nix
+++ b/machines/common/steam.nix
@@ -1,35 +1,28 @@
-{lib, pkgs, ...}: {
- users.users.steam = {
- isNormalUser = true;
- uid = 1001;
- home = "/home/steam";
- extraGroups = [
- "wheel"
- "video"
- "docker"
- "input"
- "audio"
- ];
- };
+{...}: {
+ programs.steam = {
+ enable = true;
- programs = {
- gamescope = {
+ gamescopeSession = {
enable = true;
- capSysNice = true;
+ args = [
+ "-W"
+ "3840"
+ "-H"
+ "2160"
+ "-f"
+ "-e"
+ "--xwayland-count"
+ "2"
+ "--hdr-enabled"
+ "--hdr-itm-enabled"
+ ];
};
- steam.gamescopeSession.enable = true;
};
-
- programs.steam.enable = true;
- hardware.steam-hardware.enable = true;
- services.greetd = {
+ programs.gamescope = {
enable = true;
- settings = {
- default_session = {
- command = "${lib.getExe pkgs.gamescope} -W 3840 -H 2160 -f -e --xwayland-count 2 --hdr-enabled --hdr-itm-enabled -- steam -pipewire-dmabuf -gamepadui -steamdeck -steamos3 > /dev/null 2>&1";
- user = "steam";
- };
- };
+ capSysNice = false;
};
+
+ hardware.steam-hardware.enable = true;
}
diff --git a/machines/hierophant/configuration.nix b/machines/hierophant/configuration.nix
index 8e04e44..6360204 100644
--- a/machines/hierophant/configuration.nix
+++ b/machines/hierophant/configuration.nix
@@ -12,10 +12,16 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
+ boot.loader.efi.efiSysMountPoint = "/efi";
+ boot.loader.systemd-boot.xbootldrMountPoint = "/boot";
+ boot.loader.systemd-boot.configurationLimit = 20;
hardware.graphics.enable = true;
services.xserver.videoDrivers = [ "nvidia" ];
- hardware.nvidia.open = true;
+ hardware.nvidia = {
+ open = true;
+ modesetting.enable = true;
+ };
services.xserver.displayManager.sessionCommands = ''
xrandr --output DP-0 --mode 3840x2160 --rate 159.98
@@ -40,8 +46,8 @@
];
};
- networking.hostName = "hierophant";
-
+ networking.hostName = "hierophant";
+
# This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
#
diff --git a/machines/hierophant/hardware-configuration.nix b/machines/hierophant/hardware-configuration.nix
index fec933d..123d29f 100644
--- a/machines/hierophant/hardware-configuration.nix
+++ b/machines/hierophant/hardware-configuration.nix
@@ -18,12 +18,18 @@
fsType = "ext4";
};
- fileSystems."/boot" =
+ fileSystems."/efi" =
{ device = "/dev/disk/by-uuid/34EF-0D81";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
+ fileSystems."/boot" =
+ { device = "/dev/disk/by-uuid/12CE-A600";
+ fsType = "vfat";
+ options = [ "fmask=0077" "dmask=0077" ];
+ };
+
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
generated by cgit v1.3.1 (git 2.54.0) at 2026-11-12 14:40:20 +0000