tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Add nixpkgs-unstable in additon to nixos-unstable

Browse source
This commit is contained in:
Tristan D. 2023-10-17 13:37:50 +02:00
parent d84fe4f567
commit 8c7c84c129
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
7 changed files with 55 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
flake.lock generated
View file

@ -29,11 +29,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1697477745, "lastModified": 1697533697,
"narHash": "sha256-5oY028h/pBNhT8FBsqL6tOM8nPPICRLiCq1grcPLvAI=", "narHash": "sha256-rZfP1HrI+kCfgCwJKNu/RMuhXws0cguMkcRcIygrHG4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "35d46b0cb203c534ddbd1293a573468031000596", "rev": "c4804b8f1cf82bbe90436dcfb4ab113d9a9dbed2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,6 +212,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-unstable": {
"locked": {
"lastModified": 1697059129,
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697226376, "lastModified": 1697226376,
@ -262,16 +278,16 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1697059129, "lastModified": 1697379843,
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -294,11 +310,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1697496340, "lastModified": 1697539526,
"narHash": "sha256-u2RgKrd/54mXdJh/Iwu9KpZODZ3BsVzJFuff/2EyM3Q=", "narHash": "sha256-nGsThbNl/dUkhVB7TCsUIvPXYtqMtjmksvNdT6q6q6I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e12ac1f3da3af8568ff715dead8a9dfdce1b95f8", "rev": "33cebe2a585f90544f82e10061e490644c70fa1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,6 +382,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-ld": "nix-ld", "nix-ld": "nix-ld",
"nix-wallpaper": "nix-wallpaper", "nix-wallpaper": "nix-wallpaper",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",

16
flake.nix
View file

@ -12,6 +12,9 @@
inputs = { inputs = {
nixpkgs-unstable = { nixpkgs-unstable = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
};
nixos-unstable = {
url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
nixpkgs = { nixpkgs = {
@ -56,9 +59,9 @@
}; };
outputs = { outputs = {
self,
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
nixos-unstable,
home-manager, home-manager,
emacs-overlay, emacs-overlay,
nur, nur,
@ -67,12 +70,17 @@
... ...
} @ inputs: let } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
unstable-os = import nixos-unstable pkgs-args;
unstable-os-overlay = _final: _prev: {
unstable-os = unstable-os.pkgs;
};
unstable-pkgs = import nixpkgs-unstable pkgs-args; unstable-pkgs = import nixpkgs-unstable pkgs-args;
unstable-overlay = final: prev: { unstable-pkgs-overlay = _final: _prev: {
unstable = unstable-pkgs.pkgs; unstable-pkgs = unstable-pkgs.pkgs;
}; };
overlays = [ overlays = [
unstable-overlay unstable-os-overlay
unstable-pkgs-overlay
emacs-overlay.overlay emacs-overlay.overlay
]; ];
pkgs-args = { pkgs-args = {

16
home-mods/dev/default.nix
View file

@ -32,12 +32,12 @@ in {
programs.starship = { programs.starship = {
enable = true; enable = true;
package = pkgs.unstable.starship; package = pkgs.unstable-pkgs.starship;
}; };
programs.fish = { programs.fish = {
enable = true; enable = true;
package = pkgs.unstable.fish; package = pkgs.unstable-pkgs.fish;
interactiveShellInit = '' interactiveShellInit = ''
any-nix-shell fish --info-right | source any-nix-shell fish --info-right | source
@ -69,7 +69,7 @@ in {
commit.gpgsign = true; commit.gpgsign = true;
gpg.format = "ssh"; gpg.format = "ssh";
}; };
package = pkgs.unstable.git; package = pkgs.unstable-pkgs.git;
}; };
programs.nix-index = { programs.nix-index = {
@ -79,7 +79,7 @@ in {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
package = pkgs.unstable.openssh; package = pkgs.unstable-pkgs.openssh;
matchBlocks = { matchBlocks = {
"he3" = { "he3" = {
@ -106,7 +106,7 @@ in {
programs.gpg = { programs.gpg = {
enable = true; enable = true;
package = pkgs.unstable.gnupg; package = pkgs.unstable-pkgs.gnupg;
}; };
services.gpg-agent = { services.gpg-agent = {
@ -121,7 +121,7 @@ in {
services.emacs = { services.emacs = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
package = pkgs.unstable.emacs-unstable-pgtk; package = pkgs.unstable-pkgs.emacs-unstable-pgtk;
}; };
home = { home = {
@ -138,7 +138,7 @@ in {
TERMINAL = "alacritty"; TERMINAL = "alacritty";
}; };
packages = with pkgs.unstable; [ packages = with pkgs.unstable-pkgs; [
any-nix-shell any-nix-shell
atool atool
aspell aspell
@ -163,7 +163,7 @@ in {
(lib.mkIf (config.services.gpg-agent.enable) (lib.mkIf (config.services.gpg-agent.enable)
pinentry-emacs) pinentry-emacs)
(ripgrep.override {withPCRE2 = true;}) (ripgrep.override {withPCRE2 = true;})
rnix-lsp nil
shellcheck shellcheck
shfmt shfmt
texlive.combined.scheme-full texlive.combined.scheme-full

2
home-mods/firefox/default.nix
View file

@ -6,7 +6,7 @@
}: { }: {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.unstable.firefox; package = pkgs.unstable-pkgs.firefox;
profiles = { profiles = {
default = { default = {

6
os-mods/virt/default.nix
View file

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: { }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs.unstable-os; [
virtiofsd virtiofsd
virt-manager virt-manager
virt-viewer virt-viewer
@ -14,10 +14,14 @@
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
package = pkgs.unstable-os.docker;
storageDriver = "btrfs"; storageDriver = "btrfs";
}; };
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = true; enable = true;
package = pkgs.unstable-os.libvirt;
onShutdown = "suspend"; onShutdown = "suspend";
onBoot = "ignore"; onBoot = "ignore";

2
users/tester.nix
View file

@ -22,7 +22,7 @@ in {
home.username = "tester"; home.username = "tester";
home.homeDirectory = "/home/tester"; home.homeDirectory = "/home/tester";
home.packages = with pkgs.unstable; [ home.packages = with pkgs.unstable-pkgs; [
bitwarden bitwarden
brave brave
btop btop

2
users/tristand.nix
View file

@ -22,7 +22,7 @@ in {
home.username = "tristand"; home.username = "tristand";
home.homeDirectory = "/home/tristand"; home.homeDirectory = "/home/tristand";
home.packages = with pkgs.unstable; [ home.packages = with pkgs.unstable-pkgs; [
bitwarden bitwarden
brave brave
btop btop