Don't follow unstable for most stuff
This commit is contained in:
parent
42c2a7f327
commit
ba994115b4
3 changed files with 35 additions and 11 deletions
|
|
@ -54,8 +54,8 @@
|
|||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
unstable.firefox
|
||||
unstable.google-chrome
|
||||
update.firefox
|
||||
update.google-chrome
|
||||
bitwarden
|
||||
vlc
|
||||
mpv
|
||||
|
|
@ -64,13 +64,13 @@
|
|||
audacity
|
||||
|
||||
qdirstat
|
||||
unstable.signal-desktop
|
||||
update.signal-desktop
|
||||
parsec-bin
|
||||
unstable.discord
|
||||
unstable.telegram-desktop
|
||||
update.discord
|
||||
update.telegram-desktop
|
||||
dunst
|
||||
shutter
|
||||
# unstable.rustdesk
|
||||
# update.rustdesk
|
||||
|
||||
pcmanfm
|
||||
libsForQt5.dolphin
|
||||
|
|
|
|||
19
flake.lock
19
flake.lock
|
|
@ -134,7 +134,8 @@
|
|||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"unstable": "unstable"
|
||||
"unstable": "unstable",
|
||||
"update": "update"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
@ -167,6 +168,22 @@
|
|||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"update": {
|
||||
"locked": {
|
||||
"lastModified": 1713013257,
|
||||
"narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
15
flake.nix
15
flake.nix
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
update.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay/master";
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, unstable, home-manager, nixos-hardware, ... }@inputs:
|
||||
outputs = { self, nixpkgs, update, unstable, home-manager, nixos-hardware, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
|
|
@ -28,6 +29,12 @@
|
|||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
update-overlay = final: prev: {
|
||||
update = import update {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
# Perhaps this could've been presented as an overlay?
|
||||
# bashcfg-overlay = final: prev: {
|
||||
# };
|
||||
|
|
@ -38,7 +45,7 @@
|
|||
inherit system;
|
||||
# specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
{ nixpkgs.overlays = [ unstable-overlay ]; }
|
||||
{ nixpkgs.overlays = [ unstable-overlay update-overlay ]; }
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
./hosts/NixFrame/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
|
|
@ -55,7 +62,7 @@
|
|||
inherit system;
|
||||
# specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
{ nixpkgs.overlays = [ unstable-overlay ]; }
|
||||
{ nixpkgs.overlays = [ unstable-overlay update-overlay ]; }
|
||||
./hosts/NixDawn/configuration.nix
|
||||
home-manager.nixosModule
|
||||
{
|
||||
|
|
@ -73,7 +80,7 @@
|
|||
inherit system;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
{ nixpkgs.overlays = [ unstable-overlay ]; }
|
||||
{ nixpkgs.overlays = [ unstable-overlay update-overlay ]; }
|
||||
./hosts/NixGate/configuration.nix
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue