From 8c7c84c12908b6b5bbc460b9a737fec4476e0c32 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Tue, 17 Oct 2023 13:37:50 +0200 Subject: [PATCH] Add nixpkgs-unstable in additon to nixos-unstable --- flake.lock | 37 +++++++++++++++++++++++++---------- flake.nix | 16 +++++++++++---- home-mods/dev/default.nix | 16 +++++++-------- home-mods/firefox/default.nix | 2 +- os-mods/virt/default.nix | 6 +++++- users/tester.nix | 2 +- users/tristand.nix | 2 +- 7 files changed, 55 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 2d26f9d..16573be 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697477745, - "narHash": "sha256-5oY028h/pBNhT8FBsqL6tOM8nPPICRLiCq1grcPLvAI=", + "lastModified": 1697533697, + "narHash": "sha256-rZfP1HrI+kCfgCwJKNu/RMuhXws0cguMkcRcIygrHG4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "35d46b0cb203c534ddbd1293a573468031000596", + "rev": "c4804b8f1cf82bbe90436dcfb4ab113d9a9dbed2", "type": "github" }, "original": { @@ -212,6 +212,22 @@ "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": { "locked": { "lastModified": 1697226376, @@ -262,16 +278,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1697379843, + "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -294,11 +310,11 @@ }, "nur": { "locked": { - "lastModified": 1697496340, - "narHash": "sha256-u2RgKrd/54mXdJh/Iwu9KpZODZ3BsVzJFuff/2EyM3Q=", + "lastModified": 1697539526, + "narHash": "sha256-nGsThbNl/dUkhVB7TCsUIvPXYtqMtjmksvNdT6q6q6I=", "owner": "nix-community", "repo": "NUR", - "rev": "e12ac1f3da3af8568ff715dead8a9dfdce1b95f8", + "rev": "33cebe2a585f90544f82e10061e490644c70fa1a", "type": "github" }, "original": { @@ -366,6 +382,7 @@ "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", "nix-wallpaper": "nix-wallpaper", + "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", diff --git a/flake.nix b/flake.nix index f70b0d7..aa98ca9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,9 @@ inputs = { nixpkgs-unstable = { + url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + }; + nixos-unstable = { url = "github:NixOS/nixpkgs/nixos-unstable"; }; nixpkgs = { @@ -56,9 +59,9 @@ }; outputs = { - self, nixpkgs, nixpkgs-unstable, + nixos-unstable, home-manager, emacs-overlay, nur, @@ -67,12 +70,17 @@ ... } @ inputs: let 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-overlay = final: prev: { - unstable = unstable-pkgs.pkgs; + unstable-pkgs-overlay = _final: _prev: { + unstable-pkgs = unstable-pkgs.pkgs; }; overlays = [ - unstable-overlay + unstable-os-overlay + unstable-pkgs-overlay emacs-overlay.overlay ]; pkgs-args = { diff --git a/home-mods/dev/default.nix b/home-mods/dev/default.nix index 0783e38..89ca576 100644 --- a/home-mods/dev/default.nix +++ b/home-mods/dev/default.nix @@ -32,12 +32,12 @@ in { programs.starship = { enable = true; - package = pkgs.unstable.starship; + package = pkgs.unstable-pkgs.starship; }; programs.fish = { enable = true; - package = pkgs.unstable.fish; + package = pkgs.unstable-pkgs.fish; interactiveShellInit = '' any-nix-shell fish --info-right | source @@ -69,7 +69,7 @@ in { commit.gpgsign = true; gpg.format = "ssh"; }; - package = pkgs.unstable.git; + package = pkgs.unstable-pkgs.git; }; programs.nix-index = { @@ -79,7 +79,7 @@ in { programs.ssh = { enable = true; - package = pkgs.unstable.openssh; + package = pkgs.unstable-pkgs.openssh; matchBlocks = { "he3" = { @@ -106,7 +106,7 @@ in { programs.gpg = { enable = true; - package = pkgs.unstable.gnupg; + package = pkgs.unstable-pkgs.gnupg; }; services.gpg-agent = { @@ -121,7 +121,7 @@ in { services.emacs = { enable = true; defaultEditor = true; - package = pkgs.unstable.emacs-unstable-pgtk; + package = pkgs.unstable-pkgs.emacs-unstable-pgtk; }; home = { @@ -138,7 +138,7 @@ in { TERMINAL = "alacritty"; }; - packages = with pkgs.unstable; [ + packages = with pkgs.unstable-pkgs; [ any-nix-shell atool aspell @@ -163,7 +163,7 @@ in { (lib.mkIf (config.services.gpg-agent.enable) pinentry-emacs) (ripgrep.override {withPCRE2 = true;}) - rnix-lsp + nil shellcheck shfmt texlive.combined.scheme-full diff --git a/home-mods/firefox/default.nix b/home-mods/firefox/default.nix index fea8e11..211d941 100644 --- a/home-mods/firefox/default.nix +++ b/home-mods/firefox/default.nix @@ -6,7 +6,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.unstable.firefox; + package = pkgs.unstable-pkgs.firefox; profiles = { default = { diff --git a/os-mods/virt/default.nix b/os-mods/virt/default.nix index c786e81..f6ef888 100644 --- a/os-mods/virt/default.nix +++ b/os-mods/virt/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: { - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs.unstable-os; [ virtiofsd virt-manager virt-viewer @@ -14,10 +14,14 @@ virtualisation.docker = { enable = true; + package = pkgs.unstable-os.docker; + storageDriver = "btrfs"; }; + virtualisation.libvirtd = { enable = true; + package = pkgs.unstable-os.libvirt; onShutdown = "suspend"; onBoot = "ignore"; diff --git a/users/tester.nix b/users/tester.nix index 0d3308b..76c9696 100644 --- a/users/tester.nix +++ b/users/tester.nix @@ -22,7 +22,7 @@ in { home.username = "tester"; home.homeDirectory = "/home/tester"; - home.packages = with pkgs.unstable; [ + home.packages = with pkgs.unstable-pkgs; [ bitwarden brave btop diff --git a/users/tristand.nix b/users/tristand.nix index 706ad0a..dba2336 100644 --- a/users/tristand.nix +++ b/users/tristand.nix @@ -22,7 +22,7 @@ in { home.username = "tristand"; home.homeDirectory = "/home/tristand"; - home.packages = with pkgs.unstable; [ + home.packages = with pkgs.unstable-pkgs; [ bitwarden brave btop