all repos — nixfiles @ 140c75b83a3074c69c562fd0d788a00cad25b8e3

System and user configuration, managed by nix and home-manager

Reduce number of unstable packages installed
Alan Pearce alan@alanpearce.eu
Wed, 18 Oct 2017 12:41:14 +0200
commit

140c75b83a3074c69c562fd0d788a00cad25b8e3

parent

90ee1170898bcef3975e9f6adff5a86530ec2506

5 files changed, 10 insertions(+), 22 deletions(-)

jump to
M modules/hardware/nitrokey.nix → modules/hardware/nitrokey.nix
@@ -1,9 +1,5 @@-{ config, nixpkgs, ... }:
+{ config, pkgs, ... }:
 
-let
-  pkgsUnstable = import <nixos-unstable> {};
-  # pkgsUnstable = pkgs;
-in
 { programs.ssh.startAgent = false;
 
   programs.gnupg = {
@@ -31,8 +27,8 @@ enable = true;     };
   };
 
-  environment.systemPackages = [
-    pkgsUnstable.gnupg
-    pkgsUnstable.nitrokey-app
+  environment.systemPackages = with pkgs; [
+    gnupg
+    nitrokey-app
   ];
 }
M modules/programs/accounting.nix → modules/programs/accounting.nix
@@ -1,14 +1,10 @@ { config, pkgs, ... }:
 
-let
-  pkgsUnstable = import <nixos-unstable> {};
-  # pkgsUnstable = pkgs;
-in
 { environment.systemPackages = with pkgs; [
     aqbanking
     ledger
-    pkgsUnstable.bean-add
-    pkgsUnstable.beancount
-    pkgsUnstable.fava
+    bean-add
+    beancount
+    fava
   ];
 }
M modules/programs/dotfiles.nix → modules/programs/dotfiles.nix
@@ -1,13 +1,9 @@ { config, pkgs, ... }:
 
-let
-  pkgsUnstable = import <nixos-unstable> {};
-  # pkgsUnstable = pkgs;
-in
 { environment.systemPackages = with pkgs; [
     git
     stow
     fzf
-    pkgsUnstable.ghq
+    ghq
   ];
 }
M modules/satoshipay.nix → modules/satoshipay.nix
@@ -32,7 +32,7 @@ };   systemd.services.redis.wantedBy = lib.mkForce [];
 
   services.printing.drivers = with pkgs; [
-    pkgsUnstable.cups-toshiba-estudio
+    cups-toshiba-estudio
   ];
 
   networking.domain = "satoshipay.io";
M modules/user-interface.nix → modules/user-interface.nix
@@ -43,7 +43,7 @@ mosh     aspell
     aspellDicts.en
 
-    pkgsUnstable.alacritty
+    alacritty
     st
 
     trash-cli