diff --git a/flake.lock b/flake.lock index 19c0928..520c537 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "cp": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1783637983, @@ -21,7 +23,7 @@ }, "ctp": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1783545128, @@ -89,7 +91,7 @@ "gl": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1762090880, @@ -129,7 +131,7 @@ "mc": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "systems": "systems_2" }, "locked": { @@ -150,7 +152,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -204,17 +206,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", - "type": "github" + "lastModified": 1782918843, + "narHash": "sha256-mFP086y1bNA1g9AsY/pCue3H3W2R7ayroHyRbZrcMf0=", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1025900.e8273b29fe13/nixexprs.tar.xz" }, "original": { - "id": "nixpkgs", - "ref": "nixos-25.05", - "type": "indirect" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, "nixpkgs-stable": { @@ -234,19 +234,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1782918843, - "narHash": "sha256-mFP086y1bNA1g9AsY/pCue3H3W2R7ayroHyRbZrcMf0=", - "rev": "e8273b29fe1390ec8d4603f2477357555291432e", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1025900.e8273b29fe13/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1746378225, "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", @@ -261,7 +248,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1769461804, "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", @@ -277,7 +264,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1783224372, "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", @@ -293,7 +280,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1783224372, "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", @@ -317,7 +304,7 @@ "hm": "hm", "mc": "mc", "niri": "niri", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" } }, "systems": { diff --git a/flake.nix b/flake.nix index 10f586b..4e43887 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,10 @@ niri.url = "github:sodiboo/niri-flake"; mc.url = "github:Infinidoge/nix-minecraft"; - cp.url = "github:9001/copyparty"; + cp = { + url = "github:9001/copyparty"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: let diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix index c976402..f7e193a 100644 --- a/modules/hardware/thinkpad.nix +++ b/modules/hardware/thinkpad.nix @@ -28,13 +28,6 @@ "nvme_core.default_ps_max_latency_us=0" ]; }; - nixpkgs.overlays = [ - (final: prev: { - throttled = prev.throttled.overrideAttrs (old: { - pythonPath = (old.pythonPath or []) ++ [ final.python3Packages.dbus-next ]; - }); - }) - ]; hardware.bluetooth = { enable = true; powerOnBoot = false; diff --git a/modules/home/rice/cursor.nix b/modules/home/rice/cursor.nix index 293907a..d2f0963 100644 --- a/modules/home/rice/cursor.nix +++ b/modules/home/rice/cursor.nix @@ -2,10 +2,9 @@ catppuccin.cursors.enable = false; # managed manually below to use the "Light" cursor variant home.pointerCursor = { - enable = true; gtk.enable = true; package = pkgs.catppuccin-cursors."${ctp-opt.flavor}Light"; name = lib.mkOverride 30 "catppuccin-${ctp-opt.flavor}-light-cursors"; size = 24; }; -} +} \ No newline at end of file diff --git a/modules/system/desktop.nix b/modules/system/desktop.nix index ec264eb..04cb286 100644 --- a/modules/system/desktop.nix +++ b/modules/system/desktop.nix @@ -11,12 +11,6 @@ ]; programs = { - nix-ld = { - enable = true; - libraries = with pkgs; [ - libxcursor libx11 libxi libxkbcommon - ]; - }; niri = { enable = true; package = pkgs.niri-unstable; diff --git a/modules/system/homelab/cdn.nix b/modules/system/homelab/cdn.nix index 7ec0b81..85b4537 100644 --- a/modules/system/homelab/cdn.nix +++ b/modules/system/homelab/cdn.nix @@ -1,5 +1,6 @@ { inputs, pkgs, ... }: { environment.systemPackages = with pkgs; [ copyparty-most ]; + nixpkgs.overlays = [ inputs.cp.overlays.default ]; imports = [ inputs.cp.nixosModules.default ]; systemd.services.copyparty = { @@ -8,7 +9,7 @@ after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.copyparty-most}/bin/copyparty -c /mnt/share/cfg/files.conf"; + ExecStart = "${pkgs.copyparty}/bin/copyparty -c /mnt/share/cfg/files.conf"; Restart = "on-failure"; }; }; diff --git a/modules/system/homelab/mc/mc0-vanilla-plus.nix b/modules/system/homelab/mc/mc0-vanilla-plus.nix index 79f86bc..bbcc0e0 100644 --- a/modules/system/homelab/mc/mc0-vanilla-plus.nix +++ b/modules/system/homelab/mc/mc0-vanilla-plus.nix @@ -18,7 +18,7 @@ in { }; services.minecraft-servers.servers.${name} = { - enable = true; + enable = false; autoStart = true; restart = "always"; diff --git a/modules/system/user.nix b/modules/system/user.nix index 74a8b45..5f50a54 100644 --- a/modules/system/user.nix +++ b/modules/system/user.nix @@ -17,8 +17,6 @@ "plugdev" "adbusers" "kvm" - "video" - "render" ]; }; }