1
0
mirror of https://github.com/kmein/niveum synced 2026-03-20 12:01:06 +01:00

chore: remove nixpkgs-unstable

This commit is contained in:
2020-10-28 20:25:26 +01:00
parent fd8f5d3a5c
commit 5efcb813f0
8 changed files with 18 additions and 15 deletions

View File

@@ -36,7 +36,7 @@ in {
environment.variables.TERMINAL = "alacritty"; environment.variables.TERMINAL = "alacritty";
environment.systemPackages = [ environment.systemPackages = [
pkgs.unstable.alacritty pkgs.alacritty
]; ];
home-manager.users.me.xdg.configFile = { home-manager.users.me.xdg.configFile = {

View File

@@ -6,7 +6,7 @@
pkgs.gitAndTools.hub pkgs.gitAndTools.hub
pkgs.gitAndTools.gh pkgs.gitAndTools.gh
pkgs.gitAndTools.git-extras pkgs.gitAndTools.git-extras
pkgs.unstable.gitAndTools.git-trim pkgs.gitAndTools.git-trim
pkgs.gitstats pkgs.gitstats
pkgs.patch pkgs.patch
pkgs.patchutils pkgs.patchutils

View File

@@ -1,5 +0,0 @@
{ config, ... }: {
nixpkgs.config.packageOverrides = pkgs: {
unstable = import <nixpkgs-unstable> { config = config.nixpkgs.config; };
};
}

View File

@@ -1,5 +1,9 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
let let
inherit (import <niveum/lib>) nixpkgs-unstable;
unstable = import nixpkgs-unstable {};
zoteroStyle = { name, sha256 }: { zoteroStyle = { name, sha256 }: {
name = "${name}.csl"; name = "${name}.csl";
path = pkgs.fetchurl { path = pkgs.fetchurl {

View File

@@ -17,7 +17,6 @@ let
nixos-config.symlink = "system/configuration.nix"; nixos-config.symlink = "system/configuration.nix";
nixpkgs.git = gitFromJson .versions/nixpkgs.json; nixpkgs.git = gitFromJson .versions/nixpkgs.json;
nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json;
home-manager.git = gitFromJson .versions/home-manager.json; home-manager.git = gitFromJson .versions/home-manager.json;
stockholm.git = gitFromJson .versions/stockholm.json; stockholm.git = gitFromJson .versions/stockholm.json;
retiolum.git = gitFromJson .versions/retiolum.json; retiolum.git = gitFromJson .versions/retiolum.json;

View File

@@ -9,4 +9,9 @@
officejet = "192.168.178.27"; officejet = "192.168.178.27";
fritzbox = "192.168.178.1"; fritzbox = "192.168.178.1";
}; };
nixpkgs-unstable = builtins.fetchGit {
url = "https://github.com/NixOS/nixpkgs";
rev = "4512dac960f3833cf24cdbd742b63cb447bbdd9a";
};
} }

View File

@@ -10,11 +10,6 @@ let
url = "https://github.com/NixOS/nixpkgs.git"; url = "https://github.com/NixOS/nixpkgs.git";
path = toString .versions/nixpkgs.json; 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 = { home-manager = {
ref = "refs/heads/release-${release}"; ref = "refs/heads/release-${release}";
url = "https://github.com/rycee/home-manager.git"; url = "https://github.com/rycee/home-manager.git";

View File

@@ -1,5 +1,10 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let
inherit (import <niveum/lib>) nixpkgs-unstable;
unstable = import nixpkgs-unstable {
config.allowUnfree = true;
};
in
{ {
imports = [ imports = [
<niveum/configs/default.nix> <niveum/configs/default.nix>
@@ -33,7 +38,7 @@
nix.maxJobs = 2; nix.maxJobs = 2;
environment.systemPackages = [ pkgs.unstable.minecraft ]; environment.systemPackages = [ unstable.minecraft ];
boot.loader.systemd-boot = { boot.loader.systemd-boot = {
enable = true; enable = true;