diff options
| author | Alan Pearce | 2017-10-18 12:41:14 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-10-18 12:41:14 +0200 |
| commit | 140c75b83a3074c69c562fd0d788a00cad25b8e3 (patch) | |
| tree | b1d5a69aaf6ceb4dc8c93eccd8ea652b7ed3f492 | |
| parent | 90ee1170898bcef3975e9f6adff5a86530ec2506 (diff) | |
| download | nixfiles-140c75b83a3074c69c562fd0d788a00cad25b8e3.tar.lz nixfiles-140c75b83a3074c69c562fd0d788a00cad25b8e3.tar.zst nixfiles-140c75b83a3074c69c562fd0d788a00cad25b8e3.zip | |
Reduce number of unstable packages installed
| -rw-r--r-- | modules/hardware/nitrokey.nix | 12 | ||||
| -rw-r--r-- | modules/programs/accounting.nix | 10 | ||||
| -rw-r--r-- | modules/programs/dotfiles.nix | 6 | ||||
| -rw-r--r-- | modules/satoshipay.nix | 2 | ||||
| -rw-r--r-- | modules/user-interface.nix | 2 |
5 files changed, 10 insertions, 22 deletions
diff --git a/modules/hardware/nitrokey.nix b/modules/hardware/nitrokey.nix index a0a27b0f..ec25d8e0 100644 --- a/modules/hardware/nitrokey.nix +++ b/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 @@ in }; }; - environment.systemPackages = [ - pkgsUnstable.gnupg - pkgsUnstable.nitrokey-app + environment.systemPackages = with pkgs; [ + gnupg + nitrokey-app ]; } diff --git a/modules/programs/accounting.nix b/modules/programs/accounting.nix index bcd33b8f..5882436f 100644 --- a/modules/programs/accounting.nix +++ b/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 ]; } diff --git a/modules/programs/dotfiles.nix b/modules/programs/dotfiles.nix index eed22233..467665ff 100644 --- a/modules/programs/dotfiles.nix +++ b/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 ]; } diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 12633969..ac9d5f21 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -32,7 +32,7 @@ in systemd.services.redis.wantedBy = lib.mkForce []; services.printing.drivers = with pkgs; [ - pkgsUnstable.cups-toshiba-estudio + cups-toshiba-estudio ]; networking.domain = "satoshipay.io"; diff --git a/modules/user-interface.nix b/modules/user-interface.nix index 56490cc8..b3c175fa 100644 --- a/modules/user-interface.nix +++ b/modules/user-interface.nix @@ -43,7 +43,7 @@ in aspell aspellDicts.en - pkgsUnstable.alacritty + alacritty st trash-cli |