Revert "flake: switch to nixpkgs unstable by default"
This reverts commit a024dad386.
This commit is contained in:
parent
e7e9f167d7
commit
42b5fcf970
62
flake.lock
62
flake.lock
|
|
@ -427,11 +427,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687595284,
|
||||
"narHash": "sha256-W4bGX7yCjWLeAugWpCMURlXxgPmXBJGTr/isGyd6Uew=",
|
||||
"lastModified": 1685599623,
|
||||
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "05a584b4f63f5de442f59c8cec01dddc77312856",
|
||||
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -445,17 +445,17 @@
|
|||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
"nixpkgs-unstable"
|
||||
],
|
||||
"wlroots": "wlroots",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687613903,
|
||||
"narHash": "sha256-ACv2/IL/dQzEOipcmji1nKP0fdAlSAe9MNCn5V9VtKo=",
|
||||
"lastModified": 1685729674,
|
||||
"narHash": "sha256-i5+/bAZVmCbeIKmnwyd2DG3mGrP4LOJWbsU7nJ1lzuA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "a82559f185666484da98baa8384eb3811934bdef",
|
||||
"rev": "871ab24c6e9d2fb6e48cbf990ddddf0c46a950af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -547,11 +547,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687097842,
|
||||
"narHash": "sha256-NPAaRZx5foWLgIPfEaiEZMr9JIlEQhLEVEXpx09341Q=",
|
||||
"lastModified": 1683638468,
|
||||
"narHash": "sha256-tQEaGZfZ2Hpw+XIVEHaJ8FaF1yNQyMDDhUyIQ7LTIEg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "c8210cb3fcde6860255b54ddba74dc177e6232cd",
|
||||
"rev": "219067a5e3cf4b9581c8b4fcfc59ecd5af953d07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -614,6 +614,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1685655444,
|
||||
"narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1673796341,
|
||||
|
|
@ -632,26 +647,26 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1687502512,
|
||||
"narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=",
|
||||
"lastModified": 1685620773,
|
||||
"narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f",
|
||||
"rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-23.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1687635956,
|
||||
"narHash": "sha256-JLt0pf4T3CLREHKoVBRBlNsEDSTUKQT5Rkq4Bm/ZoTw=",
|
||||
"lastModified": 1685752884,
|
||||
"narHash": "sha256-2OvX7nU9OI+/5Trsdnf7Z0qzWca0601fLmfKUCOzM9Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "327e357880bfc640bcd22e77ac45869c1f6c860d",
|
||||
"rev": "b9b4c6c683b344fe0990c18f22f20530d8cf5e81",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -679,11 +694,11 @@
|
|||
"ranger-icons": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1687100646,
|
||||
"narHash": "sha256-MMPbYXlSLwECf/Li4KqYbSmKZ8n8LfTdkOfZKshJ30w=",
|
||||
"lastModified": 1673142324,
|
||||
"narHash": "sha256-97u8yNyfN9vbv4JAvqgFekno3dUyYu265TvpU3ZZqg4=",
|
||||
"owner": "alexanderjeurissen",
|
||||
"repo": "ranger_devicons",
|
||||
"rev": "1b5780117eeebdfcd221ce45823a1ddef8399848",
|
||||
"rev": "5bb1c32f649055c2d9143c8371c2bf06d5e574f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -725,6 +740,7 @@
|
|||
"nix-software-center": "nix-software-center",
|
||||
"nixos-conf-editor": "nixos-conf-editor",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nur": "nur",
|
||||
"plymouth-themes": "plymouth-themes",
|
||||
"ranger-icons": "ranger-icons",
|
||||
|
|
@ -970,11 +986,11 @@
|
|||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"lastModified": 1686753331,
|
||||
"narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=",
|
||||
"lastModified": 1685723274,
|
||||
"narHash": "sha256-mjETVZbVheaSO0VRKQHWYAHcoKwYu0WZ0vhKVN7vyRo=",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "7e7633abf09b362d0bad9e3fc650fd692369291d",
|
||||
"rev": "6668c822b3bf58ca5af5d370ef03b075be3e4d27",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
description = "My system config";
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "nixpkgs/nixos-23.05";
|
||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nur.url = "github:nix-community/NUR";
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
|
||||
alacritty-sixel.url = "github:ayosec/alacritty";
|
||||
|
|
@ -71,7 +72,7 @@
|
|||
nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
|
||||
nix-software-center.url = "github:vlinkz/nix-software-center";
|
||||
};
|
||||
outputs = inputs@{ nixpkgs, home-manager, nur, ... }:
|
||||
outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager, nur, ... }:
|
||||
let
|
||||
inherit (import ./user/variables.nix) desktop;
|
||||
system = "x86_64-linux";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
nur
|
||||
scripts
|
||||
sway
|
||||
unstable
|
||||
sixel-patches
|
||||
themes
|
||||
new-packages
|
||||
|
|
@ -16,6 +17,12 @@
|
|||
|
||||
sway = (import ./sway.nix);
|
||||
|
||||
unstable = (final: prev: {
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (prev) system config;
|
||||
};
|
||||
});
|
||||
|
||||
sixel-patches = (import ./sixel-patches.nix (inputs));
|
||||
|
||||
themes = (final: prev: {
|
||||
|
|
@ -26,10 +33,13 @@
|
|||
install -D material-wifi.ttf $out/share/fonts/${name}
|
||||
'';
|
||||
};
|
||||
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||
papirus_red = (final.unstable.papirus-icon-theme.override { color = "red"; });
|
||||
orchis_theme_compact = (final.orchis-theme.override {
|
||||
border-radius = 0;
|
||||
tweaks = [ "compact" "solid" ];
|
||||
}).overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++
|
||||
[ ../patches/orchis-fix-warnings.patch ];
|
||||
});
|
||||
nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
|
||||
});
|
||||
|
|
@ -41,10 +51,10 @@
|
|||
maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
|
||||
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
||||
|
||||
webcord = (prev.webcord or prev.webcord).overrideAttrs (old: {
|
||||
webcord = (prev.webcord or prev.unstable.webcord).overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
|
||||
});
|
||||
mullvad = final.mullvad;
|
||||
mullvad = final.unstable.mullvad;
|
||||
});
|
||||
|
||||
patches = (final: prev: {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
inputs: (final: prev: {
|
||||
alacritty = (prev.alacritty.overrideAttrs (old-alacritty: rec {
|
||||
alacritty = (prev.unstable.alacritty.overrideAttrs (old-alacritty: rec {
|
||||
src = inputs.alacritty-sixel;
|
||||
cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
|
||||
inherit src;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ in {
|
|||
obs-studio
|
||||
imagemagick
|
||||
mpc-cli
|
||||
helvum
|
||||
pkgs.unstable.helvum
|
||||
gimp
|
||||
inkscape
|
||||
kdenlive
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
||||
];
|
||||
};
|
||||
package = pkgs.unstable.nixFlakes; # or versioned attributes like nixVersions.nix_2_8
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ in
|
|||
config = {
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.helix;
|
||||
settings = {
|
||||
theme = "my-theme";
|
||||
editor = {
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
# steam # It's enabled in the system config
|
||||
tlauncher
|
||||
gamescope
|
||||
amdgpu_top
|
||||
unstable.amdgpu_top
|
||||
glxinfo
|
||||
vulkan-tools
|
||||
|
||||
|
|
|
|||
Reference in New Issue