From d9ef8832991c6317e0b1237865b2c4b6f5cc84db Mon Sep 17 00:00:00 2001 From: kB01 Date: Tue, 23 Sep 2025 21:03:58 +0200 Subject: [PATCH] Changed Lix to nixpkgs, Removed Nvidia Drivers, Updated Systems --- flake.lock | 115 +++------------------- flake.nix | 12 --- systems/x86_64-linux/HyperC/default.nix | 2 +- systems/x86_64-linux/LoyAdjo/default.nix | 5 +- systems/x86_64-linux/LoyAdjo/hardware.nix | 15 +-- systems/x86_64-linux/Ohybke/default.nix | 2 +- 6 files changed, 21 insertions(+), 130 deletions(-) diff --git a/flake.lock b/flake.lock index 5d8ce45..81d38a0 100644 --- a/flake.lock +++ b/flake.lock @@ -52,7 +52,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1715533576, @@ -73,24 +73,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -105,21 +87,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -127,11 +94,11 @@ ] }, "locked": { - "lastModified": 1757920978, - "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", + "lastModified": 1758653055, + "narHash": "sha256-v2Pue/Xa9cDbKcrsOmhD8fiYR4No65z+ReAUBBvvE7g=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", + "rev": "131f4e22c30c114378dcf6191cb75c97eba673d0", "type": "github" }, "original": { @@ -140,57 +107,20 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1757791852, - "narHash": "sha256-G7QPn4gnKeXuecVfiglVSUqxufgB4Z4dlO/1zygXsBA=", - "rev": "8981fb5a18ae15f664b27fde437dce3e17030874", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8981fb5a18ae15f664b27fde437dce3e17030874.tar.gz?rev=8981fb5a18ae15f664b27fde437dce3e17030874" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756511062, - "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", - "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz?rev=3f09a5eb772e02d98bb8878ab687d5b721f00d16" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1757555667, - "narHash": "sha256-09403AZgH/TR1bpilDm8yJucZ2hYcZm8bzY3t8NgPJQ=", + "lastModified": 1758592316, + "narHash": "sha256-1RXYdsASXZsnwhegIzT7+zmnpIrCQCM+8nfv40M3Yio=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "d6d19d54dcec2a6afac3b9442643dd18e8b0566d", + "rev": "f6f93f79b9337ccc089beda439d2a8d5920a9812", "type": "github" }, "original": { @@ -253,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -270,8 +200,6 @@ "root": { "inputs": { "home-manager": "home-manager", - "lix": "lix", - "lix-module": "lix-module", "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", @@ -309,11 +237,11 @@ ] }, "locked": { - "lastModified": 1757847158, - "narHash": "sha256-TumOaykhZO8SOs/faz6GQhqkOcFLoQvESLSF1cJ4mZc=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ee6f91c1c11acf7957d94a130de77561ec24b8ab", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -351,21 +279,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0c9bc21..c5227ef 100644 --- a/flake.nix +++ b/flake.nix @@ -6,15 +6,6 @@ snowfall-lib.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - }; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; @@ -47,17 +38,14 @@ # Modules for Host HyperC systems.hosts.HyperC.modules = with inputs; [ - lix-module.nixosModules.default ]; # Modules for Host LoyAdjo systems.hosts.LoyAdjo.modules = with inputs; [ - lix-module.nixosModules.default ]; # Modules for Host Rubtrm systems.hosts.Rubtrm.modules = with inputs; [ - # lix-module.nixosModules.default ]; # Modules that get imported to every NixOS system diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index 9aad75a..368cadd 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -11,7 +11,7 @@ ]; # Configure Nix - nix.package = pkgs.lix; + nix.package = pkgs.lixPackageSets.stable.lix; nix.settings.experimental-features = [ "nix-command" "flakes" ]; nixpkgs.config.permittedInsecurePackages = [ ]; diff --git a/systems/x86_64-linux/LoyAdjo/default.nix b/systems/x86_64-linux/LoyAdjo/default.nix index 5f7853c..14a1340 100644 --- a/systems/x86_64-linux/LoyAdjo/default.nix +++ b/systems/x86_64-linux/LoyAdjo/default.nix @@ -7,7 +7,7 @@ ]; # Configure Nix - nix.package = pkgs.lix.override { aws-sdk-cpp = null; }; + nix.package = pkgs.lixPackageSets.stable.lix; nix.settings = { experimental-features = [ "nix-command" "flakes" ]; trusted-users = [ "remotebuild" ]; @@ -17,8 +17,6 @@ "ungoogled-chromium" "ungoogled-chromium-unwrapped" "widevine-cdm" - "nvidia-x11" - "nvidia-settings" "veracrypt" "castlabs-electron" "steam" @@ -53,7 +51,6 @@ # GUI services.xserver.enable = true; - services.xserver.videoDrivers = [ "nvidia" ]; services.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; diff --git a/systems/x86_64-linux/LoyAdjo/hardware.nix b/systems/x86_64-linux/LoyAdjo/hardware.nix index 8b21b67..3abae9b 100644 --- a/systems/x86_64-linux/LoyAdjo/hardware.nix +++ b/systems/x86_64-linux/LoyAdjo/hardware.nix @@ -18,17 +18,10 @@ boot.zfs.forceImportRoot = false; networking.hostId = "22d12b46"; - # Setup Nvidia Driver + # Setup Graphics Driver hardware.graphics.enable = true; - hardware.nvidia = - { - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; - }; + hardware.amdgpu.initrd.enable = true; + # Enable Bosto Tochpad Support (See ../../../modules/nixos/hardware/bosto-touchpad/default.nix) hardware.bosto-touchpad.enable = true; @@ -46,7 +39,7 @@ options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; + swapDevices = [ { device = "/swapfile"; size = 32 * 1024; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking networking.useDHCP = lib.mkDefault true; diff --git a/systems/x86_64-linux/Ohybke/default.nix b/systems/x86_64-linux/Ohybke/default.nix index c1c590f..d077930 100644 --- a/systems/x86_64-linux/Ohybke/default.nix +++ b/systems/x86_64-linux/Ohybke/default.nix @@ -6,7 +6,7 @@ ]; # Configure Nix - nix.package = pkgs.lix; + nix.package = pkgs.lixPackageSets.stable.lix; nix.settings = { experimental-features = [ "nix-command" "flakes" ]; };