diff --git a/configs/alacritty.nix b/configs/alacritty.nix index f5da359..53c2f0a 100644 --- a/configs/alacritty.nix +++ b/configs/alacritty.nix @@ -36,7 +36,7 @@ in { environment.variables.TERMINAL = "alacritty"; environment.systemPackages = [ - pkgs.unstable.alacritty + pkgs.alacritty ]; home-manager.users.me.xdg.configFile = { diff --git a/configs/git.nix b/configs/git.nix index c39cf03..8439597 100644 --- a/configs/git.nix +++ b/configs/git.nix @@ -6,7 +6,7 @@ pkgs.gitAndTools.hub pkgs.gitAndTools.gh pkgs.gitAndTools.git-extras - pkgs.unstable.gitAndTools.git-trim + pkgs.gitAndTools.git-trim pkgs.gitstats pkgs.patch pkgs.patchutils diff --git a/configs/nixpkgs-unstable.nix b/configs/nixpkgs-unstable.nix deleted file mode 100644 index 0ffc620..0000000 --- a/configs/nixpkgs-unstable.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, ... }: { - nixpkgs.config.packageOverrides = pkgs: { - unstable = import { config = config.nixpkgs.config; }; - }; -} diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index 193d6a9..076e3e9 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -1,5 +1,9 @@ { pkgs, lib, config, ... }: let + inherit (import ) nixpkgs-unstable; + + unstable = import nixpkgs-unstable {}; + zoteroStyle = { name, sha256 }: { name = "${name}.csl"; path = pkgs.fetchurl { diff --git a/deploy.nix b/deploy.nix index 1fcfa02..213daec 100644 --- a/deploy.nix +++ b/deploy.nix @@ -17,7 +17,6 @@ let nixos-config.symlink = "system/configuration.nix"; nixpkgs.git = gitFromJson .versions/nixpkgs.json; - nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json; home-manager.git = gitFromJson .versions/home-manager.json; stockholm.git = gitFromJson .versions/stockholm.json; retiolum.git = gitFromJson .versions/retiolum.json; diff --git a/lib/default.nix b/lib/default.nix index d26eba0..862b5ea 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -9,4 +9,9 @@ officejet = "192.168.178.27"; fritzbox = "192.168.178.1"; }; + + nixpkgs-unstable = builtins.fetchGit { + url = "https://github.com/NixOS/nixpkgs"; + rev = "4512dac960f3833cf24cdbd742b63cb447bbdd9a"; + }; } diff --git a/shell.nix b/shell.nix index d80c508..9df831e 100644 --- a/shell.nix +++ b/shell.nix @@ -10,11 +10,6 @@ let url = "https://github.com/NixOS/nixpkgs.git"; path = toString .versions/nixpkgs.json; }; - nixpkgs-unstable = { - ref = "refs/heads/master"; - url = "https://github.com/NixOS/nixpkgs.git"; - path = toString .versions/nixpkgs-unstable.json; - }; home-manager = { ref = "refs/heads/release-${release}"; url = "https://github.com/rycee/home-manager.git"; diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix index 309f1e0..05b0682 100644 --- a/systems/wilde/configuration.nix +++ b/systems/wilde/configuration.nix @@ -1,5 +1,10 @@ { config, pkgs, lib, ... }: - +let + inherit (import ) nixpkgs-unstable; + unstable = import nixpkgs-unstable { + config.allowUnfree = true; + }; +in { imports = [ @@ -33,7 +38,7 @@ nix.maxJobs = 2; - environment.systemPackages = [ pkgs.unstable.minecraft ]; + environment.systemPackages = [ unstable.minecraft ]; boot.loader.systemd-boot = { enable = true;