From 1ec9efc0ece5efcc5200a891c502615dee46da94 Mon Sep 17 00:00:00 2001 From: caem Date: Sat, 6 Jul 2024 01:23:37 +0200 Subject: [PATCH] The sex update --- flake.lock | 24 +++++++++---------- machines/workstation/configuration.nix | 8 +++---- .../workstation/hardware-configuration.nix | 6 ++--- packages/sets/games.nix | 7 +++++- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index be8367c..afbac60 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1719675517, - "narHash": "sha256-QXMYL1ay66M7T/JdaO4wR8K58GkV5CNN8U15gwifdbY=", + "lastModified": 1720211568, + "narHash": "sha256-Uph6rcbiuOD6bGEySonDFozdO+mznTug08x27WG4BIg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "4688aa9f107d6d7ac46a98a01f7105cac8e7dbe6", + "rev": "ce7e02b20fe45425bbdbebc6fe0fdcc018c9efc6", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1720188602, + "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nur": { "locked": { - "lastModified": 1719827999, - "narHash": "sha256-cmF1I0IIESCwtUlCvTbb1kd12VvYwoFdsf0os/YMYJ8=", + "lastModified": 1720208481, + "narHash": "sha256-RtLovYSWt6p8ustpxjm0dNwAqxGwFVGeCWeIidw1i0U=", "owner": "nix-community", "repo": "NUR", - "rev": "a8b6cf4d203414cd130e9a32487f9b4e3eba9e2d", + "rev": "3f937d15f3218fa58e1c0683e839cd72fcad641a", "type": "github" }, "original": { diff --git a/machines/workstation/configuration.nix b/machines/workstation/configuration.nix index ccabf58..831d009 100644 --- a/machines/workstation/configuration.nix +++ b/machines/workstation/configuration.nix @@ -42,15 +42,13 @@ nixpkgs.config.allowUnfree = true; services.xserver.videoDrivers = [ "nvidia" ]; hardware = { - opengl = { + graphics = { enable = true; - driSupport32Bit = true; + enable32Bit = true; }; nvidia = { modesetting.enable = true; - nvidiaSettings = true; - powerManagement.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; }; diff --git a/machines/workstation/hardware-configuration.nix b/machines/workstation/hardware-configuration.nix index 18b8310..7619752 100644 --- a/machines/workstation/hardware-configuration.nix +++ b/machines/workstation/hardware-configuration.nix @@ -6,20 +6,20 @@ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/fe866aa8-706b-4a92-a3c3-c97c7c332c59"; + device = "/dev/disk/by-uuid/5cc0482e-ac92-41c7-b2fc-2d9b4a19eeec"; fsType = "btrfs"; options = [ "subvol=root" "compress=zstd" "noatime" ]; }; fileSystems."/nix" = { - device = "/dev/disk/by-uuid/fe866aa8-706b-4a92-a3c3-c97c7c332c59"; + device = "/dev/disk/by-uuid/5cc0482e-ac92-41c7-b2fc-2d9b4a19eeec"; fsType = "btrfs"; options = [ "subvol=nix" "compress=zstd" "noatime" ]; neededForBoot = true; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/959D-5D4F"; + device = "/dev/disk/by-uuid/3012-B13E"; fsType = "vfat"; }; diff --git a/packages/sets/games.nix b/packages/sets/games.nix index b40d5da..ecb13b8 100644 --- a/packages/sets/games.nix +++ b/packages/sets/games.nix @@ -7,7 +7,12 @@ dedicatedServer.openFirewall = true; }; - programs.honkers-railway-launcher.enable = true; + nix.settings = { + substituters = [ "https://ezkea.cachix.org" ]; + trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; + }; +# programs.honkers-railway-launcher.enable = true; + programs.sleepy-launcher.enable = true; environment.systemPackages = with pkgs; [ prismlauncher