From 91fa4bf48a3d780e5a9ac0acde6dac747ff8d9c3 Mon Sep 17 00:00:00 2001 From: harry123 Date: Thu, 24 Jul 2025 18:40:01 +0200 Subject: [PATCH 01/10] removed vulnerable packages and enabled lix --- flake.nix | 5 +++-- hosts/goober/hardware-configuration.nix | 2 +- shared/isos/goober.nix | 11 +++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 1a0134d..cb6b639 100644 --- a/flake.nix +++ b/flake.nix @@ -52,12 +52,13 @@ }; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgsUnstable"; inputs.lix.follows = "lix"; }; musnix = { url = "github:musnix/musnix"; + inputs.nixpkgs.follows = "nixpkgsUnstable"; }; moonlight = { url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly. @@ -119,7 +120,7 @@ specialArgs = specialArgs; modules = [ ./hosts/goober/configuration.nix - lix-module.nixosModules.default + # lix-module.nixosModules.default nix-flatpak.nixosModules.nix-flatpak musnix.nixosModules.musnix catppuccin.nixosModules.catppuccin diff --git a/hosts/goober/hardware-configuration.nix b/hosts/goober/hardware-configuration.nix index f7c0f20..8361a76 100644 --- a/hosts/goober/hardware-configuration.nix +++ b/hosts/goober/hardware-configuration.nix @@ -27,7 +27,7 @@ "kvm-intel" "wl" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; + # boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; fileSystems."/" = { device = "/dev/disk/by-uuid/4efbf111-4cbb-4e1e-b3ee-dc3fca1f6f4a"; diff --git a/shared/isos/goober.nix b/shared/isos/goober.nix index e8165ee..3d69539 100644 --- a/shared/isos/goober.nix +++ b/shared/isos/goober.nix @@ -48,10 +48,9 @@ pkg: builtins.elem (lib.getName pkg) [ "nvidia" - "broadcom-sta" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; + boot.extraModulePackages = [ ]; environment.systemPackages = with pkgs; [ # Add your own packages here neovim @@ -68,7 +67,7 @@ # Nvidia power management. Experimental, and can cause sleep/suspend to fail. # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead # of just the bare essentials. powerManagement.enable = false; @@ -78,9 +77,9 @@ # Use the NVidia open source kernel module (not to be confused with the # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # Only available from driver 515.43.04+ # Currently "beta quality", so false is currently the recommended setting. open = false; From b615595b14d614eb2e7d9189f5d375e0980d76cc Mon Sep 17 00:00:00 2001 From: harry123 Date: Thu, 24 Jul 2025 18:41:27 +0200 Subject: [PATCH 02/10] fixed conflicts --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 4f6e053..e700b93 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -87,6 +87,7 @@ obsidian papirus-icon-theme nvimpager + mpc # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: From 76fb6a05318be867492311fc97380a7e32380a87 Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 25 Jul 2025 20:47:57 +0200 Subject: [PATCH 03/10] enabled jack --- hosts/goober/features/hardware/pipewire.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/goober/features/hardware/pipewire.nix b/hosts/goober/features/hardware/pipewire.nix index 9407451..3ac6609 100644 --- a/hosts/goober/features/hardware/pipewire.nix +++ b/hosts/goober/features/hardware/pipewire.nix @@ -8,6 +8,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + jack.enable = true; }; environment.systemPackages = [ pkgs.pwvucontrol From e9d297b9ac54690a5e1559a24efaf3c237da0209 Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 25 Jul 2025 21:06:28 +0200 Subject: [PATCH 04/10] solved conflicts --- flake.lock | 105 ++++++------------ .../goober/features/software/workstation.nix | 3 +- 2 files changed, 36 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 4807b49..c64df72 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753260820, - "narHash": "sha256-hh7QESW339Wp0YqgcFIFL66JPN8SV3j2zdGShfQH+Fw=", + "lastModified": 1753284130, + "narHash": "sha256-qadXtVNH5qFiD3zIAk7mk6E8kV+TuK86a7TUhs0kouc=", "owner": "catppuccin", "repo": "nix", - "rev": "227c41fd57210559a05720bece5453369d7abe0f", + "rev": "6365c59e7506fd3e6e5050c8184b41aa7410d6e7", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1753181343, - "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", + "lastModified": 1753373145, + "narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", + "rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753239105, - "narHash": "sha256-b6kNz4HI/K/XANrGbBLwE4e0c9DsJ+PkKfAPpZMX1mE=", - "rev": "8a2d25054ddff44dd8878154b702365eb1966a78", + "lastModified": 1753372565, + "narHash": "sha256-C6hTlYrguEZzc02JDAsht0i/wxAxgqvv2MGhJrHzNbw=", + "rev": "e88a85bd928afe02adaaea254eecde44d59c769d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a2d25054ddff44dd8878154b702365eb1966a78.tar.gz?rev=8a2d25054ddff44dd8878154b702365eb1966a78" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e88a85bd928afe02adaaea254eecde44d59c769d.tar.gz" }, "original": { "type": "tarball", @@ -381,15 +381,15 @@ ] }, "locked": { - "lastModified": 1751909859, - "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", - "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", + "lastModified": 1751240025, + "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", + "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" } }, "miovim": { @@ -412,32 +412,12 @@ "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" } }, - "moonlight": { + "musnix": { "inputs": { - "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgsUnstable" ] }, - "locked": { - "lastModified": 1753392240, - "narHash": "sha256-4U0ABI8mT/C4mySei6nlkvsvr62dA+5BdTSEFrZkMlM=", - "owner": "moonlight-mod", - "repo": "moonlight", - "rev": "7248b01a141412f7cc0b4224eead0f90443780aa", - "type": "github" - }, - "original": { - "owner": "moonlight-mod", - "ref": "develop", - "repo": "moonlight", - "type": "github" - } - }, - "musnix": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, "locked": { "lastModified": 1741303672, "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", @@ -463,11 +443,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1753258173, - "narHash": "sha256-a7ri+24SEelYz1P1VyO2joZrXQgWhc4g6Iy5i/YROI0=", + "lastModified": 1753343196, + "narHash": "sha256-o9veRunwEQOhokmU9J+sQao/TRGtgwK20CGCiHtzKdM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5c2f79eef3dbe9522b6e79fb7f1d99dd593e478a", + "rev": "e2091f21d83fd357ebb79ff566428826bbb4f565", "type": "github" }, "original": { @@ -479,11 +459,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1753225057, - "narHash": "sha256-/Z6FyO4cZ9SGa8X7l7MmEXoKlZWCXgv65qZ9HYbuDvw=", + "lastModified": 1753271847, + "narHash": "sha256-RuuJ3b4otjQGraffcktEvP6Wk54MCHWwXnvoIy01dyo=", "owner": "neovim", "repo": "neovim", - "rev": "1685c44dd463217db01643a97163420ed9f5b177", + "rev": "0dcdd65dcc08483d9a5c106f62b862a9de30983e", "type": "github" }, "original": { @@ -613,11 +593,11 @@ }, "nixpkgsSmall": { "locked": { - "lastModified": 1753208034, - "narHash": "sha256-w24+7Iu031O5iAcWY+exrtRkc60Q9Q3qs+LqhBxQiTg=", + "lastModified": 1753328706, + "narHash": "sha256-Ho3kXSPtqLGRlvW3SeOc0QyB7fGyHXB2EuieEpe+U4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f7a24d6c01fc1875650ff6f7849126910fe9369", + "rev": "25ff20a127c4136c63c44d718db4d82695cb999a", "type": "github" }, "original": { @@ -629,11 +609,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -676,22 +656,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1753151930, "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", @@ -709,11 +673,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -810,7 +774,6 @@ "lix": "lix", "lix-module": "lix-module", "miovim": "miovim", - "moonlight": "moonlight", "musnix": "musnix", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", @@ -973,11 +936,11 @@ ] }, "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", + "lastModified": 1753374305, + "narHash": "sha256-z+NsaMTaEbt+ZyDoPF9WQOtHrDnBPeFrvzmXIXXljoo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", + "rev": "6b8585d94444d6f13e59524e7f8e5d27016e92ac", "type": "github" }, "original": { diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix index 02176e8..96b295f 100644 --- a/hosts/goober/features/software/workstation.nix +++ b/hosts/goober/features/software/workstation.nix @@ -23,6 +23,7 @@ musnix.rtcqs.enable = true; environment.systemPackages = with pkgs; [ zathura + qutebrowser # music editing software reaper surge @@ -65,7 +66,7 @@ kicad ente-auth ente-web - jetbrains.rider + # jetbrains.rider revolt-desktop exactaudiocopy picard From 3e64801e8c056717c16320c920d80b541cc3ba39 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 2 Aug 2025 10:15:01 +0200 Subject: [PATCH 05/10] better moonlight override --- flake.lock | 105 ++++++++++++++------- hosts/goober/features/software/discord.nix | 15 +-- 2 files changed, 79 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index c64df72..4807b49 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753284130, - "narHash": "sha256-qadXtVNH5qFiD3zIAk7mk6E8kV+TuK86a7TUhs0kouc=", + "lastModified": 1753260820, + "narHash": "sha256-hh7QESW339Wp0YqgcFIFL66JPN8SV3j2zdGShfQH+Fw=", "owner": "catppuccin", "repo": "nix", - "rev": "6365c59e7506fd3e6e5050c8184b41aa7410d6e7", + "rev": "227c41fd57210559a05720bece5453369d7abe0f", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1753373145, - "narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=", + "lastModified": 1753181343, + "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f", + "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753372565, - "narHash": "sha256-C6hTlYrguEZzc02JDAsht0i/wxAxgqvv2MGhJrHzNbw=", - "rev": "e88a85bd928afe02adaaea254eecde44d59c769d", + "lastModified": 1753239105, + "narHash": "sha256-b6kNz4HI/K/XANrGbBLwE4e0c9DsJ+PkKfAPpZMX1mE=", + "rev": "8a2d25054ddff44dd8878154b702365eb1966a78", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e88a85bd928afe02adaaea254eecde44d59c769d.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a2d25054ddff44dd8878154b702365eb1966a78.tar.gz?rev=8a2d25054ddff44dd8878154b702365eb1966a78" }, "original": { "type": "tarball", @@ -381,15 +381,15 @@ ] }, "locked": { - "lastModified": 1751240025, - "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", - "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", + "lastModified": 1751909859, + "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", + "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" } }, "miovim": { @@ -412,12 +412,32 @@ "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" } }, - "musnix": { + "moonlight": { "inputs": { + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgsUnstable" ] }, + "locked": { + "lastModified": 1753392240, + "narHash": "sha256-4U0ABI8mT/C4mySei6nlkvsvr62dA+5BdTSEFrZkMlM=", + "owner": "moonlight-mod", + "repo": "moonlight", + "rev": "7248b01a141412f7cc0b4224eead0f90443780aa", + "type": "github" + }, + "original": { + "owner": "moonlight-mod", + "ref": "develop", + "repo": "moonlight", + "type": "github" + } + }, + "musnix": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { "lastModified": 1741303672, "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", @@ -443,11 +463,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1753343196, - "narHash": "sha256-o9veRunwEQOhokmU9J+sQao/TRGtgwK20CGCiHtzKdM=", + "lastModified": 1753258173, + "narHash": "sha256-a7ri+24SEelYz1P1VyO2joZrXQgWhc4g6Iy5i/YROI0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e2091f21d83fd357ebb79ff566428826bbb4f565", + "rev": "5c2f79eef3dbe9522b6e79fb7f1d99dd593e478a", "type": "github" }, "original": { @@ -459,11 +479,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1753271847, - "narHash": "sha256-RuuJ3b4otjQGraffcktEvP6Wk54MCHWwXnvoIy01dyo=", + "lastModified": 1753225057, + "narHash": "sha256-/Z6FyO4cZ9SGa8X7l7MmEXoKlZWCXgv65qZ9HYbuDvw=", "owner": "neovim", "repo": "neovim", - "rev": "0dcdd65dcc08483d9a5c106f62b862a9de30983e", + "rev": "1685c44dd463217db01643a97163420ed9f5b177", "type": "github" }, "original": { @@ -593,11 +613,11 @@ }, "nixpkgsSmall": { "locked": { - "lastModified": 1753328706, - "narHash": "sha256-Ho3kXSPtqLGRlvW3SeOc0QyB7fGyHXB2EuieEpe+U4I=", + "lastModified": 1753208034, + "narHash": "sha256-w24+7Iu031O5iAcWY+exrtRkc60Q9Q3qs+LqhBxQiTg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25ff20a127c4136c63c44d718db4d82695cb999a", + "rev": "3f7a24d6c01fc1875650ff6f7849126910fe9369", "type": "github" }, "original": { @@ -609,11 +629,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -656,6 +676,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1753151930, "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", @@ -673,11 +709,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1753115646, + "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "92c2e04a475523e723c67ef872d8037379073681", "type": "github" }, "original": { @@ -774,6 +810,7 @@ "lix": "lix", "lix-module": "lix-module", "miovim": "miovim", + "moonlight": "moonlight", "musnix": "musnix", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", @@ -936,11 +973,11 @@ ] }, "locked": { - "lastModified": 1753374305, - "narHash": "sha256-z+NsaMTaEbt+ZyDoPF9WQOtHrDnBPeFrvzmXIXXljoo=", + "lastModified": 1753069499, + "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6b8585d94444d6f13e59524e7f8e5d27016e92ac", + "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", "type": "github" }, "original": { diff --git a/hosts/goober/features/software/discord.nix b/hosts/goober/features/software/discord.nix index 562702e..2b35f7f 100644 --- a/hosts/goober/features/software/discord.nix +++ b/hosts/goober/features/software/discord.nix @@ -4,14 +4,15 @@ pkgs, ... }: +let + discord = pkgs.discord.override { + withMoonlight = true; + moonlight = inputs.moonlight.packages.${pkgs.system}.moonlight; + }; +in { - environment.systemPackages = with pkgs; [ - discord.override - { - withMoonlight = true; - moonlight = inputs.moonlight.packages.${pkgs.system}.moonlight; - } - vesktop + environment.systemPackages = [ + discord ]; # screen record support xdg = { From c8aa3bbc7488cd8b77f38b9ed026f7167460f382 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 2 Aug 2025 10:15:23 +0200 Subject: [PATCH 06/10] fixed lutris --- hosts/goober/features/hardware/nvidia.nix | 4 +++ shared/client/games.nix | 44 +++++++++++++++-------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/hosts/goober/features/hardware/nvidia.nix b/hosts/goober/features/hardware/nvidia.nix index ade3976..88db6a0 100644 --- a/hosts/goober/features/hardware/nvidia.nix +++ b/hosts/goober/features/hardware/nvidia.nix @@ -1,6 +1,10 @@ { config, pkgs, ... }: { + environment.systemPackages = with pkgs; [ + glxinfo + ]; + boot.blacklistedKernelModules = [ "nouveau" ]; hardware.graphics = { enable = true; diff --git a/shared/client/games.nix b/shared/client/games.nix index 90d44c1..3771e06 100644 --- a/shared/client/games.nix +++ b/shared/client/games.nix @@ -1,18 +1,34 @@ -{config, pkgs, ...}: { - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; + config, + lib, + pkgs, + ... +}: +{ + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-run" - ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; - environment.systemPackages = with pkgs; [ - lutris - ]; - }; + environment.systemPackages = with pkgs; [ + lutris + ]; + systemd.extraConfig = "DefaultLimitNOFILE=524288"; + security.pam.loginLimits = [ + { + domain = "misschloe777"; + type = "hard"; + item = "nofile"; + value = "524288"; + } + ]; + }; } From 6ef751f330fdaeb90fb30e9937e8f8be7bd7754b Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 2 Aug 2025 10:15:43 +0200 Subject: [PATCH 07/10] start discord with moonlight instead of vesktop --- home-manager/dotfiles/niri/config.kdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index b8867de..9045ade 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -580,7 +580,7 @@ environment { // apps to launch at startup spawn-at-startup "qutebrowser" -spawn-at-startup "vesktop" +spawn-at-startup "discord" spawn-at-startup "beeper" spawn-at-startup "cinny" From d784f55702fbfb4620ae08c4aafa287ab1f1330a Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 2 Aug 2025 10:15:49 +0200 Subject: [PATCH 08/10] lutris fix --- hosts/goober/configuration.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix index 4441303..cdefbc7 100644 --- a/hosts/goober/configuration.nix +++ b/hosts/goober/configuration.nix @@ -110,6 +110,7 @@ slurp wl-clipboard udiskie + lutris ]; # Some programs need SUID wrappers, can be configured further or are @@ -132,6 +133,15 @@ }; documentation.dev.enable = true; + systemd.extraConfig = "DefaultLimitNOFILE=524288"; + security.pam.loginLimits = [ + { + domain = "misschloe777"; + type = "hard"; + item = "nofile"; + value = "524288"; + } + ]; # 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. From beffce096f4f18820c98b0bfacf77c41964cb397 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 2 Aug 2025 10:16:00 +0200 Subject: [PATCH 09/10] bump flake --- flake.lock | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 4807b49..7e93897 100644 --- a/flake.lock +++ b/flake.lock @@ -381,15 +381,15 @@ ] }, "locked": { - "lastModified": 1751909859, - "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", - "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", + "lastModified": 1751240025, + "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", + "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" } }, "miovim": { @@ -436,7 +436,9 @@ }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgsUnstable" + ] }, "locked": { "lastModified": 1741303672, @@ -459,7 +461,7 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -676,22 +678,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1753151930, "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", @@ -707,7 +693,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1753115646, "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", @@ -723,7 +709,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -739,7 +725,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1750605355, "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", @@ -817,7 +803,7 @@ "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix", @@ -848,7 +834,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1752544651, @@ -867,7 +853,7 @@ "swww": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay" }, "locked": { From 4d17f8d4bf6133d0d0af5814b33e10fa816f3269 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 2 Aug 2025 10:41:04 +0200 Subject: [PATCH 10/10] updated readme.md --- README.md | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index c1fcb1f..01a03a3 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,26 @@ -# my nix homelab config +# nix dotfiles -**THIS CONFIG IS STILL EXPERIMENTAL !! IT MIGHT WONT WORK OR JUST BREAK YOUR CURRENT INSTALL** -Hosted on a Proxmox VM (8Go RAM + 300Gb storage). It is not using the flake.nix because i don't see the use for it, as much than home-manager... +This repo hosts all my dotfiles. It includes two desktop config, one (terrible) computer config, and some server dots. It brings my own neovim config, called [miovim](https://git.rougebordeaux.xyz/misschloe/miovim). -The goal of this config is to include : +| name | description | +| ----------- | ------------------------------------------------- | +| `goober` | my main desktop config. Intel 9th gen + 1660 GPU. | +| `workspace` | my config for professional workspaces. | +| `sisyphe` | proxmox server vm | +| `labouse` | ASUS X75s (laptop) nix config. Highly experimental, as this is old hardware! | +| `dadarwin` | some basic iMac 2015 config. | -- [x] -arr suite -- [x] Authentik -- [x] slskd -- [ ] a cloud solution, to backup family files -- [x] crafty controller\* -- [x] a matrix server -- [x] tt-rss / freshrss\* -- [x] tailscale +`diva`, `strawberry` are WIP. Supposed to be two servers config. -\*Not using the "Nix" way (i prefer using Docker atm, i currently lack time) +`packages` also comes with some packages bundling i made for various software i use (and too shy to put in nixpkgs). -## Installation +# Installation +!! This config is not plug and play; it comes with some encrypted secrets and files that are not included here. !! -You will need to do a basic NixOS install with my config files placed @ `/etc/nixos`. -Then, setup and adapt the config with your secrets. I am using sops-nix here. +Make sure flakes and nix command is enabled first in your configuration, then run : + +```bash +git clone +# replace goober by whatever config interests you +sudo nixos-rebuild switch --flake .#goober +```