From 42ae19e4dfc9cca93fa7030a98939de3528457c2 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 21 Oct 2019 21:45:24 +0200 Subject: Don't use pkgsUnstable unnecessarily --- user/settings/emacs.nix | 10 +--------- user/settings/gaming.nix | 6 +++--- user/settings/javascript.nix | 8 ++++---- user/settings/passwords.nix | 2 +- user/settings/satoshipay.nix | 20 ++++++++++---------- user/settings/user-interface.nix | 6 +++--- 6 files changed, 22 insertions(+), 30 deletions(-) (limited to 'user') diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 4cdd4d58..2e43606c 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -3,8 +3,6 @@ let inherit (pkgs) stdenv; - pkgsUnstable = if stdenv.isDarwin then import {} else import {}; - editorScript = pkgs.writeScriptBin "edit" '' #!${pkgs.runtimeShell} if [ -z "$1" ]; then @@ -138,18 +136,12 @@ in which-key yaml-mode ] ++ lib.optionals (!stdenv.isDarwin) [ - pkgs.unstable.mu + pkgs.mu ]); }; home.packages = [ editorScript ]; - nixpkgs.overlays = [ - (self: super: { - emacsPackagesNgGen = pkgsUnstable.emacsPackagesNgGen; - emacs = pkgsUnstable.emacs; - }) - ]; home.sessionVariables = { EDITOR = "${editorScript}/bin/edit"; }; diff --git a/user/settings/gaming.nix b/user/settings/gaming.nix index 022846ca..78b35406 100644 --- a/user/settings/gaming.nix +++ b/user/settings/gaming.nix @@ -2,9 +2,9 @@ { home.packages = with pkgs; [ - unstable.steam + steam ( - unstable.winePackages.unstable.override { + winePackages.override { pngSupport = true; jpegSupport = true; tiffSupport = true; @@ -40,6 +40,6 @@ sdlSupport = true; } ) - unstable.lutris + lutris ]; } diff --git a/user/settings/javascript.nix b/user/settings/javascript.nix index 4c75ea10..205dde83 100644 --- a/user/settings/javascript.nix +++ b/user/settings/javascript.nix @@ -1,14 +1,14 @@ { config, pkgs, ... }: let - node = pkgs.unstable.nodejs-10_x; - npmPackages = pkgs.unstable.nodePackages_10_x; + node = pkgs.nodejs-10_x; + npmPackages = pkgs.nodePackages_10_x; node2nixPackages = import ../packages/node2nix/default.nix { - pkgs = pkgs.unstable; + inherit pkgs; nodejs = node; }; in -{ home.packages = (with pkgs.unstable; [ +{ home.packages = (with pkgs; [ node ] ++ ( if stdenv.isDarwin diff --git a/user/settings/passwords.nix b/user/settings/passwords.nix index aef8d6f4..72d4a0c6 100644 --- a/user/settings/passwords.nix +++ b/user/settings/passwords.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - home.packages = with pkgs.unstable; [ + home.packages = with pkgs; [ keepassx-community rofi-pass pass-otp diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index 5d30f909..8194488b 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -22,20 +22,20 @@ in s3cmd sops - unstable.mkcert - unstable.google-cloud-sdk - unstable.docker_compose - unstable.kubernetes - unstable.kubectx - unstable.kubernetes-helm - unstable.helmfile + mkcert + google-cloud-sdk + docker_compose + kubernetes + kubectx + kubernetes-helm + helmfile ] ++ (lib.optionals (!stdenv.isDarwin) [ pgadmin - unstable.redis-desktop-manager - unstable.robo3t - unstable.slack + redis-desktop-manager + robo3t + slack ])); programs.git.includes = [ diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix index d8d95900..9bb3c82e 100644 --- a/user/settings/user-interface.nix +++ b/user/settings/user-interface.nix @@ -5,14 +5,14 @@ let in { home.sessionVariables = { - TERMINAL = "${pkgs.unstable.xst}/bin/xst"; + TERMINAL = "${pkgs.xst}/bin/xst"; }; home.packages = with pkgs; [ firefox - unstable.xst # st, but with support for XResources + xst # st, but with support for XResources ] ++ lib.optionals (!stdenv.isDarwin) [ pkgs.sshfs - pkgs.unstable.mu + pkgs.mu ]; } -- cgit 1.4.1