From 47ff5618e9054871987e276d617a5827a9408f7f Mon Sep 17 00:00:00 2001 From: Andreas Schaafsma Date: Sun, 30 Nov 2025 03:48:43 +0100 Subject: [PATCH] changes --- flake.lock | 258 +++++------------- flake.nix | 3 +- modules/nixos/nixos/default.nix | 2 +- shell.nix | 2 +- .../drivebystation-nix/configuration.nix | 23 +- .../drivebystation-nix/default.nix | 4 +- .../hardware/graphics/intel_nvidia.nix | 4 +- 7 files changed, 83 insertions(+), 213 deletions(-) diff --git a/flake.lock b/flake.lock index 0fe6518..36e0546 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -16,38 +16,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -63,7 +31,23 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -87,11 +71,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -184,11 +168,11 @@ ] }, "locked": { - "lastModified": 1752467539, - "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e54837569e0b80797c47be4720fab19e0db1616", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -205,11 +189,11 @@ ] }, "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -226,11 +210,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1751809810, - "narHash": "sha256-DNI/IxfFRNDrGPdpwsEsmXCYFeKdRDRKDLcDimZWrVE=", + "lastModified": 1755098995, + "narHash": "sha256-6FN7XEf27DenQHDIKjrjOW3tGIaJlyqRlXarmt1v+M0=", "owner": "taj-ny", "repo": "kwin-effects-forceblur", - "rev": "26ea1b6830143b15dba114fce754f6253e9eb5a5", + "rev": "51a1d49d7fd7df3ce40ccf6ba4c4410cf6f510e1", "type": "github" }, "original": { @@ -251,52 +235,31 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", + "ref": "v0.4.3", "repo": "lanzaboote", "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1751591814, - "narHash": "sha256-A4lgvuj4v+Pr8MniXz1FBG0DXOygi8tTECR+j53FMhM=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "fef2d0c78c4e4d6c600a88795af193131ff51bdc", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_3" + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752199438, - "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=", + "lastModified": 1764072830, + "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "d34d9412556d3a896e294534ccd25f53b6822e80", + "rev": "c7832dd786175e20f2697179e0e03efadffe4201", "type": "github" }, "original": { @@ -322,45 +285,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1751048012, - "narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a684c58d46ebbede49f280b653b9e56100aa3877", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -372,11 +303,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -388,27 +319,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1743448293, - "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -428,15 +343,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -451,13 +365,11 @@ "home-manager": "home-manager", "kwin-effects-forceblur": "kwin-effects-forceblur", "lanzaboote": "lanzaboote", - "nixos-cosmic": "nixos-cosmic", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", "trilium-next-pr": "trilium-next-pr", - "wallpaper-engine-plugin-src": "wallpaper-engine-plugin-src", "zen-browser": "zen-browser" } }, @@ -469,32 +381,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751251399, - "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -505,7 +396,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" @@ -532,11 +423,11 @@ ] }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1764021963, + "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "owner": "mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "type": "github" }, "original": { @@ -609,34 +500,17 @@ "type": "github" } }, - "wallpaper-engine-plugin-src": { - "flake": false, - "locked": { - "lastModified": 1751185984, - "narHash": "sha256-tKeYJvVa8jzbyZ7MQaOuCUJa+UqABolTNe3e5XNw998=", - "owner": "catsout", - "repo": "wallpaper-engine-kde-plugin", - "rev": "9e60b364e268814a1a778549c579ad45a9b9c7bb", - "type": "github" - }, - "original": { - "owner": "catsout", - "ref": "main", - "repo": "wallpaper-engine-kde-plugin", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1752557104, - "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=", + "lastModified": 1764414951, + "narHash": "sha256-pZ2m2JmTTMyqiKB8WSigsSvAeoShI6OSRhzBuRO9SVY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "dca4ebb877124f9f3d797da30cb19f8b958ef7f5", + "rev": "10d2aa53ada9b14f6df2f9877d6a057f0a2b262f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 72c006e..d82cf9e 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; game-of-life.url = "github:local-interloper/game-of-life"; - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; # Add sops-nix for secrets management sops-nix = { url = "github:mic92/sops-nix"; @@ -24,7 +23,7 @@ }; trilium-next-pr.url = "github:FliegendeWurst/nixpkgs/trilium-next"; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.2"; + url = "github:nix-community/lanzaboote/v0.4.3"; # Optional but recommended to limit the size of your system closure. inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/nixos/nixos/default.nix b/modules/nixos/nixos/default.nix index 8cccffc..25f6b29 100644 --- a/modules/nixos/nixos/default.nix +++ b/modules/nixos/nixos/default.nix @@ -43,7 +43,7 @@ in age wget sops - bitwarden + bitwarden-desktop #replaced bitwarden bitwarden-cli cowsay remmina diff --git a/shell.nix b/shell.nix index b96d5cb..f799dc4 100644 --- a/shell.nix +++ b/shell.nix @@ -7,7 +7,7 @@ pkgs.mkShellNoCC { packages = with pkgs; [ cowsay lolcat - bitwarden + bitwarden-desktop #replaced bitwarden bitwarden-cli sops ]; diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix index 418313f..d4656b3 100644 --- a/systems/x86_64-linux/drivebystation-nix/configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix @@ -47,18 +47,16 @@ desktopManager.gnome.enable = true; displayManager.gdm.enable = false; displayManager.sddm.enable = true; + displayManager.sddm.wayland.enable = true; displayManager.defaultSession = "gnome"; desktopManager.plasma6.enable = true; + xserver = { enable = true; # Enable the deprecated X11 teletype terminal connection system. desktopManager = { # Disable xterm xterm.enable = false; - # Enable xfce session - xfce = { - enable = true; - }; # Disable fuckshit plasma }; # Configure Display Manager @@ -145,6 +143,8 @@ # Install firefox. programs.firefox.enable = true; + programs.xwayland.enable = true; + # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -156,14 +156,18 @@ (python312.withPackages (ps: with ps; [ websockets ])) kdePackages.qtwebsockets kdePackages.qtwebchannel + kdePackages.wallpaper-engine-plugin qt6.qtwebengine - xfce.xfce4-whiskermenu-plugin gnome-tweaks qemu mpv krita - qemu ]; + environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = '' + [Desktop Entry] + Hidden=true + ''; + virtualisation.libvirtd = { enable = true; @@ -171,13 +175,6 @@ package = pkgs.qemu_kvm; runAsRoot = true; swtpm.enable = true; - ovmf = { - enable = true; - packages = [(pkgs.OVMF.override { - secureBoot = true; - tpmSupport = true; - }).fd]; - }; }; }; diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix index 5dff924..2e29ba1 100644 --- a/systems/x86_64-linux/drivebystation-nix/default.nix +++ b/systems/x86_64-linux/drivebystation-nix/default.nix @@ -60,7 +60,7 @@ in vscode spotify appimage-run - minecraft + prismlauncher #replaces broken minecraft package trilium-desktop terraform virt-manager @@ -117,7 +117,7 @@ in ++ installedPackages.packages; programs.nix-ld = { enable = true; - package = pkgs.nix-ld-rs; + package = pkgs.nix-ld; #replaces nix-ld-rs }; services.flatpak.enable = true; systemd.services.flatpak-repo = { diff --git a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel_nvidia.nix b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel_nvidia.nix index bf090f3..24d5fca 100644 --- a/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel_nvidia.nix +++ b/systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel_nvidia.nix @@ -9,7 +9,7 @@ hardware.firmware = [ pkgs.linux-firmware - pkgs.firmwareLinuxNonfree + # pkgs.firmwareLinuxNonfree # pkgs.firmwareLinuxStrict # pkgs.firmwareLinuxLatest ]; @@ -29,7 +29,7 @@ extraPackages = with pkgs; [ intel-media-driver # Intel VAAPI vpl-gpu-rt # oneVPL runtime - vaapiIntel # fallback + intel-vaapi-driver # fallback ]; };