diff --git a/flake.lock b/flake.lock index 9f6e7f770..bfcdd6238 100644 --- a/flake.lock +++ b/flake.lock @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1720599442, - "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -871,11 +871,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1720731503, - "narHash": "sha256-Qlm0IRnOrI64RW/SEvW9rA1ytVvPS1CsVvRataNvStI=", + "lastModified": 1720818319, + "narHash": "sha256-HCjjU259K+7fD/l12u8CkBM9VjQqXleEGpmbdZ0r3oY=", "ref": "refs/heads/main", - "rev": "e728e56cbc6af0a9be1276b2cf8e019a894016e7", - "revCount": 4917, + "rev": "f85c6416c6f5e56c75178ecb24c11e346069197d", + "revCount": 4918, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1272,11 +1272,11 @@ ] }, "locked": { - "lastModified": 1720518322, - "narHash": "sha256-isTUoKDWTeDBN1fPuMTyPdYcTn1823LMr+Uy1wODe/0=", + "lastModified": 1720830151, + "narHash": "sha256-5m2CnO1fM1Ek7UAxWCMT4Wy3St9LOSAc4cJUJauLpWE=", "owner": "nix-community", "repo": "nix-ld-rs", - "rev": "ce02bc08397af64ba2487e229f3b67498581a884", + "rev": "971bf6fe2d8134b4ea0501b374be60fc2c7f22fb", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ ] }, "locked": { - "lastModified": 1720428387, - "narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=", + "lastModified": 1720787015, + "narHash": "sha256-U3IqoGmIzBKEJ0ihRQ10GRRtdoDBI6Oxl6aiGbUA59A=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "30ebd0beb2ed26e09bcd245d757504029f807cce", + "rev": "371b5076d718f7f637d3959d0203061f06af1263", "type": "github" }, "original": { @@ -1341,6 +1341,22 @@ "type": "github" } }, + "nixpkgs-small": { + "locked": { + "lastModified": 1720801720, + "narHash": "sha256-PjXn2DUkwcN+58/C5XCOqsitGwN2u/WkYdC/ugP+3jQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2d419e7e0024cb7448aace8faf64b2c6ff26a70d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1678872516, @@ -1391,11 +1407,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -1605,11 +1621,11 @@ }, "nur": { "locked": { - "lastModified": 1720447811, - "narHash": "sha256-3rHeN+lEeBwn1hQ272VkhYB9tagRkf9ozqCsD6VEbLo=", + "lastModified": 1720843460, + "narHash": "sha256-iUA+xNeyVZOAApZ+6hnueGQgNU3JybcRgsHwBttStcc=", "owner": "nix-community", "repo": "NUR", - "rev": "f094b615f438e148da6d069d85155637e1c3dd91", + "rev": "3aa39365e8468ecb3bad4494b37a784c325b986e", "type": "github" }, "original": { @@ -1692,6 +1708,7 @@ "nix-ld-rs": "nix-ld-rs", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_10", + "nixpkgs-small": "nixpkgs-small", "nixvim": "nixvim", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", @@ -1866,11 +1883,11 @@ ] }, "locked": { - "lastModified": 1720671189, - "narHash": "sha256-mV9V19JmBqMYT3JYatskF7jCP0DsZRwpPvWdOiK8gNQ=", + "lastModified": 1720757491, + "narHash": "sha256-ctJJF0+SMA6ctYcmsYudGsWlYo8CvA3x/a0gW0M/bM8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "4debee7f160b746f6262285130ca533ef22ee024", + "rev": "45c8a1d76c34d95ff6f948fff8356f46bc8ef48c", "type": "github" }, "original": { @@ -2151,11 +2168,11 @@ ] }, "locked": { - "lastModified": 1720724512, - "narHash": "sha256-zyRSXNCXEKxlSMGanrPHh+XCk38ZYez6LUg7Vi3xN80=", + "lastModified": 1720847119, + "narHash": "sha256-Lss9JGxfnEcmIYI/JDh2t2zU8GBZg9XI6saJ7xnB5T0=", "owner": "Alexays", "repo": "Waybar", - "rev": "265566050984bb2364ecb72b0abd18e8868205b7", + "rev": "3d0fd14f3f26085d2669b0197ab23c241100a2b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ed78ec443..68c9c1b52 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,11 @@ url = "github:nixos/nixpkgs/nixos-unstable"; }; + # NixPkgs (nixos-unstable-small) + nixpkgs-small = { + url = "github:nixos/nixpkgs/nixos-unstable-small"; + }; + # NixOS WSL Support nixos-wsl = { url = "github:nix-community/nixos-wsl"; diff --git a/modules/darwin/suites/music/default.nix b/modules/darwin/suites/music/default.nix index b11bfe0f4..08a68e772 100644 --- a/modules/darwin/suites/music/default.nix +++ b/modules/darwin/suites/music/default.nix @@ -19,7 +19,8 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ spicetify-cli - youtube-dl + # TODO: replace? don't use and marked insecure + # youtube-dl ]; homebrew = { diff --git a/modules/home/suites/desktop/default.nix b/modules/home/suites/desktop/default.nix index 30ffc3e97..7182a5b03 100644 --- a/modules/home/suites/desktop/default.nix +++ b/modules/home/suites/desktop/default.nix @@ -22,7 +22,8 @@ in bitwarden bleachbit dropbox - dupeguru + # TODO: remove override after https://github.com/NixOS/nixpkgs/pull/325740 is in unstable + (dupeguru.override { python3Packages = pkgs.python311Packages; }) filelight fontpreview gparted diff --git a/modules/nixos/suites/common/default.nix b/modules/nixos/suites/common/default.nix index fa99888b0..66629a290 100644 --- a/modules/nixos/suites/common/default.nix +++ b/modules/nixos/suites/common/default.nix @@ -46,7 +46,8 @@ in security = { auditd = enabled; - clamav = enabled; + # FIXME: broken nixpkgs + # clamav = enabled; gpg = enabled; usbguard = enabled; }; diff --git a/overlays/nixos-unstable-small/default.nix b/overlays/nixos-unstable-small/default.nix new file mode 100644 index 000000000..abef1b588 --- /dev/null +++ b/overlays/nixos-unstable-small/default.nix @@ -0,0 +1,10 @@ +{ channels, ... }: +_final: _prev: { + inherit (channels.nixpkgs-small) + blender + clamav + mysql-workbench + rocmPackages + swiftPackages + ; +} diff --git a/overlays/spectre/default.nix b/overlays/spectre/default.nix deleted file mode 100644 index 638314165..000000000 --- a/overlays/spectre/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -_: _final: prev: { - # TODO: remove once https://github.com/NixOS/nixpkgs/pull/324952 hits unstable - vimPlugins = prev.vimPlugins // { - nvim-spectre = - let - version = "2024-06-25"; - - src = prev.fetchFromGitHub { - owner = "nvim-pack"; - repo = "nvim-spectre"; - rev = "49fae98ef2bfa8342522b337892992e3495065d5"; - sha256 = "027jfxxmccfjyn2g9pzsyrx9ls9lg8fg28rac8bqrwa95v5z5dgn"; - }; - - spectre_oxi = prev.rustPlatform.buildRustPackage { - pname = "spectre_oxi"; - inherit version src; - sourceRoot = "${src.name}/spectre_oxi"; - - cargoHash = "sha256-SqbU9YwZ5pvdFUr7XBAkkfoqiLHI0JwJRwH7Wj1JDNg="; - - preCheck = '' - mkdir tests/tmp/ - ''; - }; - in - prev.vimUtils.buildVimPlugin { - inherit version src; - pname = "nvim-spectre"; - meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; - - postInstall = '' - ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so - ''; - }; - }; -}