diff --git a/bathtub/programs.nix b/bathtub/programs.nix index 312e810..65fbc4b 100644 --- a/bathtub/programs.nix +++ b/bathtub/programs.nix @@ -11,5 +11,4 @@ ]; programs.dconf.enable = true; - programs.steam.enable = lib.mkForce false; } diff --git a/flake.lock b/flake.lock index 304d796..afaad12 100644 --- a/flake.lock +++ b/flake.lock @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1775268934, + "narHash": "sha256-Sa5tW5kYPJornQEkFVD43F/0d4/WP+/GLTNktTFe2qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "9dc93220c1c9a410ef6277d6dc55c571d9e592d0", "type": "github" }, "original": { @@ -276,11 +276,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774921404, - "narHash": "sha256-oHqaEduwYqXx3itq7ckP+iuC9nU6DzfCVery4YhUjAU=", + "lastModified": 1775089852, + "narHash": "sha256-zcX3hf2cTOQ06kRP+FCYbuaWhy+FLruLFp+D79Enjo4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3d02f5c53d09af97a7d66065b8c058d0599bc547", + "rev": "cfa91d98691d91cc604ab8f4e224819524c496ad", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775020384, - "narHash": "sha256-3XiHDhiNxb2vWI0en8ug7WBMEPj9mcaWcMhaFFfhfJY=", + "lastModified": 1775231746, + "narHash": "sha256-EFaDQ0rnuSjKfC/DUKHS4toV4rEBuWhSgyX2Yy0kp00=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9971bfbabf2fa3f3b7e6e4cbeaa2abd6295b478", + "rev": "0eac666efaa8a9afea2821f9efc7921b4ef39b4e", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1774799055, - "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", + "lastModified": 1775002709, + "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", + "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", "type": "github" }, "original": { @@ -422,11 +422,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774802402, - "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=", + "lastModified": 1775268911, + "narHash": "sha256-3Ro4qz3HXgos0mvAkrTWsBTpIgPO6K+fogUYoO3c/UA=", "owner": "nix-community", "repo": "nixvim", - "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb", + "rev": "0166a4a54c0430e59308e9a3b0ab95f42293ac4e", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1774910634, - "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", + "lastModified": 1775188331, + "narHash": "sha256-/0BoSi0Dg0ON7IW0oscM12WSPBaMSCn36XTt0lHZoy8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", + "rev": "8f093d0d2f08f37317778bd94db5951d6cce6c46", "type": "github" }, "original": { diff --git a/forest/default.nix b/forest/default.nix index 77dcaf2..096c316 100644 --- a/forest/default.nix +++ b/forest/default.nix @@ -12,6 +12,8 @@ ++ [ ./programs.nix ./disk-config.nix + ./specialisation.nix + ../modules/steam.nix (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/forest/specialisation.nix b/forest/specialisation.nix new file mode 100644 index 0000000..4727604 --- /dev/null +++ b/forest/specialisation.nix @@ -0,0 +1,16 @@ +{ lib, ... }: +{ + specialisation = { + gaming.configuration = { + containers.minecraft.autoStart = lib.mkForce false; + services.anki-sync-server.enable = lib.mkForce false; + services.jellyfin.enable = lib.mkForce false; + services.prowlarr.enable = lib.mkForce false; + services.qbittorrent.enable = lib.mkForce false; + services.radarr.enable = lib.mkForce false; + services.searx.enable = lib.mkForce false; + services.seerr.enable = lib.mkForce false; + services.sonarr.enable = lib.mkForce false; + }; + }; +} diff --git a/home/desktop/awww.nix b/home/desktop/awww.nix index 5b1a763..535d52c 100644 --- a/home/desktop/awww.nix +++ b/home/desktop/awww.nix @@ -1,5 +1,4 @@ { ... }: { - # TODO: fix this - services.swww.enable = true; + services.awww.enable = true; } diff --git a/modules/server/jellyfin.nix b/modules/server/jellyfin.nix index 07207c3..97dd171 100644 --- a/modules/server/jellyfin.nix +++ b/modules/server/jellyfin.nix @@ -1,9 +1,11 @@ { config, lib, ... }: { - users.users.jellyfin.extraGroups = [ - "video" - "render" - ]; + users.users = lib.mkIf (config.services.jellyfin.enable) { + jellyfin.extraGroups = [ + "video" + "render" + ]; + }; services.jellyfin.enable = true; diff --git a/modules/core/steam.nix b/modules/steam.nix similarity index 100% rename from modules/core/steam.nix rename to modules/steam.nix