aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

Move to nixpkgs/master

Browse source 
For that 5.9.2 kernel goodness. Since I can track nixpkgs myself, I'm
using nixpkgs/master now (and twice, so I can track them at separate
rates).

Though, for now, nixpkgs == nixpkgs.unstable
This commit is contained in:
Henrik Lissner 2020-10-30 01:39:45 -04:00
parent 8f46696789
commit d5c807a4f9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
9 changed files with 69 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
default.nix
View file

@ -17,11 +17,11 @@ with inputs;
# Configure nix and nixpkgs # Configure nix and nixpkgs
environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
nix = { nix = {
package = pkgs.unstable.nixFlakes; package = pkgs.nixFlakes;
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
nixPath = [ nixPath = [
"nixpkgs=${nixos}" "nixpkgs=${nixpkgs}"
"nixpkgs-unstable=${nixos-unstable}" "nixpkgs-unstable=${nixpkgs-unstable}"
"nixpkgs-overlays=${dotFilesDir}/overlays" "nixpkgs-overlays=${dotFilesDir}/overlays"
"home-manager=${home-manager}" "home-manager=${home-manager}"
"dotfiles=${dotFilesDir}" "dotfiles=${dotFilesDir}"
@ -34,9 +34,10 @@ with inputs;
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
registry = { registry = {
nixos.flake = nixos; nixos.flake = nixpkgs;
nixpkgs.flake = nixos-unstable; nixpkgs.flake = nixpkgs-unstable;
}; };
useSandbox = true;
}; };
system.configurationRevision = mkIf (self ? rev) self.rev; system.configurationRevision = mkIf (self ? rev) self.rev;
system.stateVersion = "20.09"; system.stateVersion = "20.09";
@ -48,7 +49,7 @@ with inputs;
fileSystems."/".device = "/dev/disk/by-label/nixos"; fileSystems."/".device = "/dev/disk/by-label/nixos";
# Use the latest kernel # Use the latest kernel
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_5_9;
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
@ -58,7 +59,7 @@ with inputs;
# Just the bear necessities... # Just the bear necessities...
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
unstable.cached-nix-shell cached-nix-shell
coreutils coreutils
git git
vim vim

68
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1603643126, "lastModified": 1604032123,
"narHash": "sha256-gpvbYrdN0LOS5C6jdhMSDI53MwvAm2GY+VtHUuCjFvI=", "narHash": "sha256-zFPYmFFXoKTF+dBxjwKd4fFJD9Z0VbBEPr8LKeQT5FA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7b5dea6b1493fd3b065878364f0bfc5aa4363306", "rev": "4e45953b184dc1029fbbc60c70f37b40bf8d08c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,15 +18,15 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1603403461, "lastModified": 1603922580,
"narHash": "sha256-1BBTgps384veCOtCuHLdg8vuRNYyYPssWDQxsYQ5Lg8=", "narHash": "sha256-rPJ3YxsVm5YYHzIRLy1w3jSXIQvVXK1KydraC7m/2xc=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "9bf1f40af124573a54fd208b1f539eb694ef31a6", "rev": "a98ec6ec158686387d66654ea96153ec06be33d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,48 +36,48 @@
"type": "github" "type": "github"
} }
}, },
"nixos": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1603528673, "lastModified": 1603995690,
"narHash": "sha256-iFrxF9GMes1jH7v8qjep1BsQYEq/admkEv/gJoqQsHo=", "narHash": "sha256-aqDvu6Im9uglnKboMKYwH8D8h1dLwlSOaEDqPxEfKf4=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "46a68df837414dcdfb1c240c88d5fff1b6ef805c",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1604033338,
"narHash": "sha256-u08n7zy1Y6+JLILAKas+dLKJ1dwJri1OaECbJEbT6v8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "95d26c9a9f2a102e25cf318a648de44537f42e09", "rev": "fcc6849bcd58073b365848031335abf58c7331cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-20.09", "ref": "master",
"type": "indirect" "type": "indirect"
} }
}, },
"nixos-hardware": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1603168674, "lastModified": 1604033338,
"narHash": "sha256-nX7t9jtzX96xieiwsKf/AL3yBiMl20Z2/IFyc1GQZk4=", "narHash": "sha256-u08n7zy1Y6+JLILAKas+dLKJ1dwJri1OaECbJEbT6v8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "e8c5f886b05178367c6a86903921c1e934303075",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixos-unstable": {
"locked": {
"lastModified": 1603214869,
"narHash": "sha256-gmiZPO8nOkeCpmJ060F80VGDxGFO1lMV3Obocwxrp2U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd017760509492a1774b0ea2fc5c1bbb4b2d98af", "rev": "fcc6849bcd58073b365848031335abf58c7331cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "master",
"type": "indirect" "type": "indirect"
} }
}, },
@ -85,9 +85,9 @@
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable" "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

31
flake.nix
View file

@ -12,42 +12,43 @@
inputs = inputs =
{ {
# Core dependencies # Core dependencies.
nixos.url = "nixpkgs/nixos-20.09"; # Two inputs so I can track them separately at different rates.
nixos-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/master";
nixpkgs-unstable.url = "nixpkgs/master";
home-manager.url = "github:rycee/home-manager/master"; home-manager.url = "github:rycee/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixos-unstable"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Extras # Extras
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
}; };
outputs = inputs @ { self, nixos, nixos-unstable, home-manager, ... }: outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, ... }:
let let
inherit (builtins) baseNameOf; inherit (lib) attrValues;
inherit (lib) nixosSystem mkIf removeSuffix attrNames attrValues; inherit (lib.my) mapModules mapModulesRec mapHosts;
inherit (lib.my) dotFilesDir mapModules mapModulesRec mapHosts;
system = "x86_64-linux"; system = "x86_64-linux";
lib = nixos.lib.extend
(self: super: { my = import ./lib { inherit pkgs inputs; lib = self; }; });
mkPkgs = pkgs: extraOverlays: import pkgs { mkPkgs = pkgs: extraOverlays: import pkgs {
inherit system; inherit system;
config.allowUnfree = true; # forgive me Stallman senpai config.allowUnfree = true; # forgive me Stallman senpai
overlays = extraOverlays ++ (attrValues self.overlays); overlays = extraOverlays ++ (attrValues self.overlays);
}; };
pkgs = mkPkgs nixos [ self.overlay ]; pkgs = mkPkgs nixpkgs [ self.overlay ];
unstable = mkPkgs nixos-unstable []; uPkgs = mkPkgs nixpkgs-unstable [];
lib = nixpkgs.lib.extend
(self: super: { my = import ./lib { inherit pkgs inputs; lib = self; }; });
in { in {
lib = lib.my; lib = lib.my;
overlay = overlay =
final: prev: { final: prev: {
inherit unstable; unstable = uPkgs;
user = self.packages."${system}"; my = self.packages."${system}";
}; };
overlays = overlays =

12
hosts/linode.nix
View file

@ -29,18 +29,16 @@
with lib; with lib;
{ {
imports = filter pathExists ["/etc/nixos/configuration.nix"];
environment.systemPackages = environment.systemPackages =
with pkgs; [ inetutils mtr sysstat git ]; with pkgs; [ inetutils mtr sysstat git ];
modules = { modules = {
# editors = { editors = {
# default = "nvim"; default = "nvim";
# vim.enable = true; vim.enable = true;
# }; };
shell = { shell = {
# git.enable = true; git.enable = true;
zsh.enable = true; zsh.enable = true;
}; };
services.ssh.enable = true; services.ssh.enable = true;

6
modules/desktop/apps/discord.nix
View file

@ -10,11 +10,9 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = with pkgs; [ user.packages = with pkgs; [
# If not installed from unstable, Discord will sometimes soft-lock itself # If not installed from the bleeding edge, Discord will sometimes
# on a "there's an update for discord" screen. # soft-lock itself on a "there's an update for discord" screen.
unstable.discord unstable.discord
# unstable.ripcord
]; ];
}; };
} }

2
modules/desktop/default.nix
View file

@ -38,7 +38,7 @@ in {
]; ];
fonts = { fonts = {
enableFontDir = true; fontDir.enable = true;
enableGhostscriptFonts = true; enableGhostscriptFonts = true;
fonts = with pkgs; [ fonts = with pkgs; [
ubuntu_font_family ubuntu_font_family

2
modules/desktop/media/daw.nix
View file

@ -19,7 +19,7 @@ in {
user.packages = with pkgs; [ user.packages = with pkgs; [
# lmms on stable is broken due to 'Could not find the Qt platform plugin # lmms on stable is broken due to 'Could not find the Qt platform plugin
# "xcb" in ""' error: https://github.com/NixOS/nixpkgs/issues/76074 # "xcb" in ""' error: https://github.com/NixOS/nixpkgs/issues/76074
unstable.lmms # for making music lmms # for making music
audacity # for recording and remastering audio audacity # for recording and remastering audio
# sunvox # for making music (where LMMS is overkill) # sunvox # for making music (where LMMS is overkill)

2
modules/desktop/media/graphics.nix
View file

@ -28,7 +28,7 @@ in {
# replaces illustrator & indesign # replaces illustrator & indesign
(if cfg.vector.enable then [ (if cfg.vector.enable then [
unstable.inkscape inkscape
] else []) ++ ] else []) ++
# Replaces photoshop # Replaces photoshop

2
modules/themes/alucard/default.nix
View file

@ -40,7 +40,7 @@ in {
# Desktop (X11) theming # Desktop (X11) theming
(mkIf config.services.xserver.enable { (mkIf config.services.xserver.enable {
user.packages = with pkgs; [ user.packages = with pkgs; [
unstable.dracula-theme dracula-theme
paper-icon-theme # for rofi paper-icon-theme # for rofi
]; ];
fonts = { fonts = {