Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.eu
Wed, 13 Sep 2017 15:57:39 +0200
12 files changed, 76 insertions(+), 33 deletions(-)
M marvin.nix → marvin.nix
@@ -22,7 +22,9 @@ ./modules/x250.nix ./modules/user.nix ./modules/user-interface.nix ./modules/dev.nix + ./modules/lisp.nix ./modules/javascript.nix + ./modules/infrastructure.nix ./modules/accounting.nix ./modules/passwords.nix ./modules/network-manager.nix
M modules/accounting.nix → modules/accounting.nix
@@ -1,6 +1,7 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ + aqbanking ledger bean-add beancount
M modules/dev.nix → modules/dev.nix
@@ -4,6 +4,8 @@ { environment.systemPackages = with pkgs; [ mercurial gitAndTools.hub + editorconfig-core-c + ag ripgrep
A modules/infrastructure.nix
@@ -0,0 +1,9 @@+{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + ansible + hugo + + nixops + ]; +}
M modules/javascript.nix → modules/javascript.nix
@@ -6,7 +6,10 @@ # pkgsUnstable = pkgs; in { environment.systemPackages = with pkgs; [ nodejs-8_x + pkgsUnstable.flow pkgsUnstable.nodePackages.yarn pkgsUnstable.nodePackages.tern + pkgsUnstable.nodePackages.node2nix + pkgsUnstable.nodePackages.nodemon ]; }
M modules/laptop.nix → modules/laptop.nix
@@ -1,4 +1,4 @@-{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { boot.kernelModules = [ "coretemp" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ @@ -62,7 +62,7 @@ ''; services.xserver = { libinput = { - enable = true; + enable = lib.mkDefault true; naturalScrolling = true; disableWhileTyping = true; };
A modules/lisp.nix
@@ -0,0 +1,11 @@+{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + ccl + sbcl + lispPackages.quicklisp + + dust + pixie + ]; +}
M modules/nitrokey.nix → modules/nitrokey.nix
@@ -4,7 +4,9 @@ let pkgsUnstable = import <nixos-unstable> {}; # pkgsUnstable = pkgs; in -{ services.pcscd.enable = true; +{ programs.ssh.startAgent = false; + + services.pcscd.enable = true; services.tor = { enable = true;
M modules/synaptics.nix → modules/synaptics.nix
@@ -1,24 +1,27 @@ { config, pkgs, ... }: -{ services.xserver.synaptics = { - enable = true; +{ services.xserver = { + libinput.enable = false; + synaptics = { + enable = true; - accelFactor = "0.001"; + accelFactor = "0.05"; - minSpeed = "0.4"; - maxSpeed = "2.0"; + minSpeed = "0.2"; + maxSpeed = "1.0"; - palmDetect = true; - palmMinWidth = 5; - palmMinZ = 20; + palmDetect = true; + palmMinWidth = 5; + palmMinZ = 20; - twoFingerScroll = true; - vertTwoFingerScroll = true; - horizTwoFingerScroll = true; - additionalOptions = '' - Option "RBCornerButton" "3" - Option "VertScrollDelta" "-111" - Option "HorizScrollDelta" "-111" - ''; + twoFingerScroll = true; + vertTwoFingerScroll = true; + horizTwoFingerScroll = true; + additionalOptions = '' + Option "RBCornerButton" "3" + Option "VertScrollDelta" "-111" + Option "HorizScrollDelta" "-111" + ''; + }; }; }
M modules/user-interface.nix → modules/user-interface.nix
@@ -1,8 +1,20 @@-{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let pkgsUnstable = import <nixos-unstable> {}; # pkgsUnstable = pkgs; + emacsPackage = import ../packages/emacs.nix { + inherit (pkgs) stdenv; + pkgs = pkgsUnstable; + emacs = pkgs.lib.overrideDerivation (pkgs.emacs.override { + withGTK2 = false; + withGTK3 = true; + }) (attrs: { + postInstall = attrs.postInstall + '' + rm $out/share/applications/emacs.desktop + ''; + }); + }; in { # programs.browserpass.enable = true; programs.info.enable = true; @@ -10,6 +22,9 @@ environment.systemPackages = with pkgs; [ firefox-bin pcmanfm + + epdfview + geeqie lxappearance @@ -46,19 +61,9 @@ services.emacs = { enable = true; defaultEditor = true; - package = import ../packages/emacs.nix { - inherit (pkgs) stdenv; - pkgs = pkgsUnstable; - emacs = pkgs.lib.overrideDerivation (pkgs.emacs.override { - withGTK2 = false; - withGTK3 = true; - }) (attrs: { - postInstall = attrs.postInstall + '' - rm $out/share/applications/emacs.desktop - ''; - }); - }; + package = emacsPackage; }; + systemd.user.services.emacs.serviceConfig.ExecStart = lib.mkForce "${pkgs.bash}/bin/bash -c 'source ${config.system.build.setEnvironment}; exec ${emacsPackage}/bin/emacs --daemon --debug-init'"; services.redshift = { enable = true;
M modules/x250.nix → modules/x250.nix
@@ -1,6 +1,9 @@ { config, pkgs, ... }: -{ boot.extraModulePackages = with config.boot.kernelPackages; [ +{ imports = [ + ./synaptics.nix + ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
M satoshipad.nix → satoshipad.nix
@@ -25,8 +25,10 @@ ./modules/t470s.nix ./modules/user.nix ./modules/user-interface.nix ./modules/dev.nix + ./modules/lisp.nix ./modules/javascript.nix ./modules/satoshipay.nix + ./modules/infrastructure.nix ./modules/accounting.nix ./modules/passwords.nix ./modules/network-manager.nix