jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to channel 25.05

Browse Source
This commit is contained in:
Danilo Reyes 2025-05-18 11:41:39 -06:00
parent fe2d3286b0
commit 25a7435724
5 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flake.lock generated
View File

@ -491,15 +491,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747565775, "lastModified": 1747556831,
"narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -923,48 +924,32 @@
}, },
"nixpkgs-small": { "nixpkgs-small": {
"locked": { "locked": {
"lastModified": 1747554148, "lastModified": 1747428706,
"narHash": "sha256-aeAOz1/fSKEjEJG6eVjLC4RmxzTe2RkUERPD9yUQIGc=", "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0afebfe3e464cf20f0952275f8220a9502af465", "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable-small", "ref": "nixos-25.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs11": {
"locked": {
"lastModified": 1747335874,
"narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1747327360, "lastModified": 1747428706,
"narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1071,7 +1056,6 @@
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-small": "nixpkgs-small", "nixpkgs-small": "nixpkgs-small",
"nixpkgs11": "nixpkgs11",
"nixtendo-switch": "nixtendo-switch", "nixtendo-switch": "nixtendo-switch",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

7
flake.nix
View File

@ -1,9 +1,8 @@
{ {
description = "JawZ NixOS flake setup"; description = "JawZ NixOS flake setup";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-25.05-small";
nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
ucodenix.url = "github:e-tho/ucodenix"; ucodenix.url = "github:e-tho/ucodenix";
doom-emacs = { doom-emacs = {
@ -27,7 +26,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager?ref=release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix = { sops-nix = {

1
hosts/workstation/configuration.nix
View File

@ -86,7 +86,6 @@
inherit (pkgs) inherit (pkgs)
distrobox # install packages from other os distrobox # install packages from other os
gocryptfs # encrypted filesystem! shhh!!! gocryptfs # encrypted filesystem! shhh!!!
torrenttools # create torrent files from the terminal!
vcsi # video thumbnails for torrents, can I replace it with ^? vcsi # video thumbnails for torrents, can I replace it with ^?
; ;
}; };

2
modules/apps/gaming.nix
View File

@ -52,7 +52,7 @@
dolphin-emu # wii dolphin-emu # wii
snes9x-gtk # snes snes9x-gtk # snes
ryubing # switch ryubing # switch
lime3ds # 3Ds azahar # 3Ds
prismlauncher # minecraft launcher with jdk overlays prismlauncher # minecraft launcher with jdk overlays
; ;
inherit (inputs.jawz-scripts.packages.x86_64-linux) inherit (inputs.jawz-scripts.packages.x86_64-linux)

11
overlay.nix
View File

@ -5,7 +5,6 @@
}: }:
let let
pkgs = mkpkgs inputs.nixpkgs; pkgs = mkpkgs inputs.nixpkgs;
pkgs11 = mkpkgs inputs.nixpkgs11;
in in
_final: prev: { _final: prev: {
nautilus = prev.nautilus.overrideAttrs (old: { nautilus = prev.nautilus.overrideAttrs (old: {
@ -48,18 +47,8 @@ _final: prev: {
handbrake = prev.handbrake.override { useGtk = true; }; handbrake = prev.handbrake.override { useGtk = true; };
ripgrep = prev.ripgrep.override { withPCRE2 = true; }; ripgrep = prev.ripgrep.override { withPCRE2 = true; };
papirus-icon-theme = prev.papirus-icon-theme.override { color = "orange"; }; papirus-icon-theme = prev.papirus-icon-theme.override { color = "orange"; };
blender = pkgs11.blender.override { cudaSupport = true; };
discord = prev.discord.override { discord = prev.discord.override {
withVencord = true; withVencord = true;
withOpenASAR = true; withOpenASAR = true;
}; };
inherit (pkgs11)
torrenttools
cemu
open-webui
lime3ds
shipwreck
rpcs3
resilio-sync
;
} }