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

removed pkgs5 input and pinned packages that can now compile

Browse Source
This commit is contained in:
Danilo Reyes 2025-01-18 01:18:56 -06:00
parent 30c5bbbf8d
commit 1c9be455d8
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.lock generated
View File

@ -734,22 +734,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs5": {
"locked": {
"lastModified": 1735563628,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1737062831,
@ -820,7 +804,6 @@
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs11": "nixpkgs11", "nixpkgs11": "nixpkgs11",
"nixpkgs5": "nixpkgs5",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",

4
flake.nix
View File

@ -2,7 +2,6 @@
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-unstable";
nixpkgs5.url = "github:nixos/nixpkgs?ref=nixos-24.05";
nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11"; nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
ucodenix.url = "github:e-tho/ucodenix"; ucodenix.url = "github:e-tho/ucodenix";
doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened"; doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened";
@ -48,7 +47,6 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs = mkpkgs inputs.nixpkgs; pkgs = mkpkgs inputs.nixpkgs;
pkgs5 = mkpkgs inputs.nixpkgs5;
pkgs11 = mkpkgs inputs.nixpkgs11; pkgs11 = mkpkgs inputs.nixpkgs11;
lib = inputs.nixpkgs.lib // inputs.home-manager.lib; lib = inputs.nixpkgs.lib // inputs.home-manager.lib;
createConfig = createConfig =
@ -61,7 +59,7 @@
modules = [ modules = [
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ./overlay.nix { inherit pkgs pkgs5 pkgs11; }) (import ./overlay.nix { inherit pkgs pkgs11; })
inputs.doom-emacs.overlays.default inputs.doom-emacs.overlays.default
]; ];
} }

1
modules/shell/tools.nix
View File

@ -80,7 +80,6 @@
inherit (inputs.jawz-scripts.packages.x86_64-linux) inherit (inputs.jawz-scripts.packages.x86_64-linux)
rmlint # amazing dupe finder that integrates well with BTRFS rmlint # amazing dupe finder that integrates well with BTRFS
; ;
}; };
environment.variables = { environment.variables = {
HISTFILE = "\${XDG_STATE_HOME}/bash/history"; HISTFILE = "\${XDG_STATE_HOME}/bash/history";

12
overlay.nix
View File

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
pkgs5,
pkgs11, pkgs11,
}: }:
_final: prev: { _final: prev: {
@ -33,17 +32,8 @@ _final: prev: {
discord-ptb = prev.discord.override { withVencord = true; }; discord-ptb = prev.discord.override { withVencord = true; };
ripgrep = prev.ripgrep.override { withPCRE2 = true; }; ripgrep = prev.ripgrep.override { withPCRE2 = true; };
papirus-icon-theme = prev.papirus-icon-theme.override { color = "green"; }; papirus-icon-theme = prev.papirus-icon-theme.override { color = "green"; };
blender = pkgs11.blender.override { cudaSupport = true; }; blender = prev.blender.override { cudaSupport = true; };
inherit (pkgs5)
mypaint
mypaint-brushes
mypaint-brushes1
;
inherit (pkgs11) inherit (pkgs11)
torrenttools torrenttools
gimp
shipwright
libreoffice
lime3ds
; ;
} }