diff --git a/flake.lock b/flake.lock index 14aecb2..18884d1 100644 --- a/flake.lock +++ b/flake.lock @@ -125,11 +125,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1739435854, - "narHash": "sha256-0dvbmn2FSYZB8vrsHYyYX8KnaZyg6ONLrNPb6D7nw+8=", + "lastModified": 1739608391, + "narHash": "sha256-0s/EyM/9nYG3Ftn6hPFArW9zc5jKrTk+M9nFLDdyQDs=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "f0e4efb293956f494459eef713e8e82512314a00", + "rev": "2ff18c6589aea7a749c83957c6b65a64d0b0a2de", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1739414090, - "narHash": "sha256-a3RrKwEPoNh68CPqNIhTqhmd8gFwyF16LGuc3jT2W7s=", + "lastModified": 1739585438, + "narHash": "sha256-gyPjqDLiZ8MM0bo6hpNv/aqhrKPCGaasUWpc8vQIfnA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8a91f48b10b4ef312f483af4fc2ca768f05118b6", + "rev": "119c1e609911a1a24af83e342fa4e2b11faa2096", "type": "github" }, "original": { @@ -412,11 +412,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739571712, + "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", "type": "github" }, "original": { @@ -522,11 +522,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739446679, - "narHash": "sha256-W4/dpSdDzsqw2diGefNHlhYFhx18oX4k7GLDjvGc96E=", + "lastModified": 1739646242, + "narHash": "sha256-v4ub7niyjjFs6T6QCtuw2jDHED/gWGOxz38DtFEjPfI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "40adb3dfb4b6f8cf0c5093f095954e3ef162a8eb", + "rev": "94a30889a78fa7c7f87fe8134c18357855824c35", "type": "github" }, "original": { @@ -735,11 +735,11 @@ ] }, "locked": { - "lastModified": 1739410808, - "narHash": "sha256-hnQFEeTs3G9dCvbBjCUF7WuPyGdUwppOhqJUhepzjjc=", + "lastModified": 1739497168, + "narHash": "sha256-gKF/ZZRAHYvCXwZRDopPfy/kQrL1W7HqiAjjnDn3WSo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "78967efda12abfb171fa837c7b9f9d1043277a15", + "rev": "78c53283c9c7a4f1ac83ac0354e5f74ef8eacc01", "type": "github" }, "original": { @@ -750,11 +750,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739319052, - "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", + "lastModified": 1739451785, + "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", + "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", "type": "github" }, "original": { @@ -792,13 +792,29 @@ "type": "github" } }, - "nixpkgs11": { + "nixpkgs-small": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739611738, + "narHash": "sha256-3bnOIZz8KXtzcaXGuH9Eriv0HiQyr1EIfcye+VHLQZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "31ff66eb77d02e9ac34b7256a02edb1c43fb9998", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs11": { + "locked": { + "lastModified": 1739484910, + "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "type": "github" }, "original": { @@ -810,11 +826,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -854,11 +870,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739467343, - "narHash": "sha256-isYgWK2YxUdJn9gPHeQAmGuBPrLHAp0GLOygKsov32c=", + "lastModified": 1739654605, + "narHash": "sha256-Y7Jd4gZRQfKUZ5T6NnrPiLdnJZAeTAjW5mTN0BGx6RA=", "owner": "nix-community", "repo": "nur", - "rev": "9716d3d51de1eaa8fc75a66d446e1d8d4c4e4cc5", + "rev": "e0218a5bbb7e8b1789fa79e4a0693ca507b97919", "type": "github" }, "original": { @@ -898,6 +914,7 @@ "jawz-scripts": "jawz-scripts", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", + "nixpkgs-small": "nixpkgs-small", "nixpkgs11": "nixpkgs11", "nixtendo-switch": "nixtendo-switch", "nur": "nur", diff --git a/flake.nix b/flake.nix index 9c18996..fd1fc2a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "JawZ NixOS flake setup"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11"; ucodenix.url = "github:e-tho/ucodenix"; doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened"; @@ -50,9 +51,11 @@ inherit system; config.allowUnfree = true; }; - lib = inputs.nixpkgs.lib // inputs.home-manager.lib; createConfig = - name: + name: local-nixpkgs: + let + lib = local-nixpkgs.lib // inputs.home-manager.lib; + in lib.nixosSystem { inherit system; specialArgs = { @@ -75,9 +78,9 @@ in { nixosConfigurations = { - workstation = "workstation" |> createConfig; - miniserver = "miniserver" |> createConfig; - server = "server" |> createConfig; + workstation = createConfig "workstation" inputs.nixpkgs; + miniserver = createConfig "miniserver" inputs.nixpkgs-small; + server = createConfig "server" inputs.nixpkgs-small; }; }; } diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix index c9421e1..1c30828 100644 --- a/modules/apps/internet.nix +++ b/modules/apps/internet.nix @@ -34,8 +34,7 @@ tor-browser-bundle-bin # dark web, so dark! telegram-desktop # furry chat nicotine-plus # remember Ares? - vesktop # screen share with audio discord - discord-ptb # :3 + discord # :3 ; }; }; diff --git a/overlay.nix b/overlay.nix index 4be6827..0dcf4c9 100644 --- a/overlay.nix +++ b/overlay.nix @@ -34,7 +34,10 @@ _final: prev: { ]); }; handbrake = prev.handbrake.override { useGtk = true; }; - discord-ptb = prev.discord.override { withVencord = true; }; + discord = prev.discord.override { + withVencord = true; + withOpenASAR = true; + }; ripgrep = prev.ripgrep.override { withPCRE2 = true; }; papirus-icon-theme = prev.papirus-icon-theme.override { color = "orange"; }; blender = pkgs11.blender.override { cudaSupport = true; };