diff options
| -rw-r--r-- | marvin.nix | 2 | ||||
| -rw-r--r-- | modules/accounting.nix | 1 | ||||
| -rw-r--r-- | modules/dev.nix | 2 | ||||
| -rw-r--r-- | modules/infrastructure.nix | 9 | ||||
| -rw-r--r-- | modules/javascript.nix | 3 | ||||
| -rw-r--r-- | modules/laptop.nix | 4 | ||||
| -rw-r--r-- | modules/lisp.nix | 11 | ||||
| -rw-r--r-- | modules/nitrokey.nix | 4 | ||||
| -rw-r--r-- | modules/synaptics.nix | 35 | ||||
| -rw-r--r-- | modules/user-interface.nix | 31 | ||||
| -rw-r--r-- | modules/x250.nix | 5 | ||||
| -rw-r--r-- | satoshipad.nix | 2 |
12 files changed, 76 insertions, 33 deletions
diff --git a/marvin.nix b/marvin.nix index ca080fab..7d6e7986 100644 --- a/marvin.nix +++ b/marvin.nix @@ -22,7 +22,9 @@ ./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 diff --git a/modules/accounting.nix b/modules/accounting.nix index 0b180a81..5882436f 100644 --- a/modules/accounting.nix +++ b/modules/accounting.nix @@ -1,6 +1,7 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ + aqbanking ledger bean-add beancount diff --git a/modules/dev.nix b/modules/dev.nix index d3fe92fb..48679cb4 100644 --- a/modules/dev.nix +++ b/modules/dev.nix @@ -4,6 +4,8 @@ mercurial gitAndTools.hub + editorconfig-core-c + ag ripgrep diff --git a/modules/infrastructure.nix b/modules/infrastructure.nix new file mode 100644 index 00000000..b41816e2 --- /dev/null +++ b/modules/infrastructure.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + ansible + hugo + + nixops + ]; +} diff --git a/modules/javascript.nix b/modules/javascript.nix index d950fe53..cc5b89e8 100644 --- a/modules/javascript.nix +++ b/modules/javascript.nix @@ -6,7 +6,10 @@ let in { environment.systemPackages = with pkgs; [ nodejs-8_x + pkgsUnstable.flow pkgsUnstable.nodePackages.yarn pkgsUnstable.nodePackages.tern + pkgsUnstable.nodePackages.node2nix + pkgsUnstable.nodePackages.nodemon ]; } diff --git a/modules/laptop.nix b/modules/laptop.nix index 3d6894cc..f0c88e7d 100644 --- a/modules/laptop.nix +++ b/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; }; diff --git a/modules/lisp.nix b/modules/lisp.nix new file mode 100644 index 00000000..ffaa7115 --- /dev/null +++ b/modules/lisp.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ environment.systemPackages = with pkgs; [ + ccl + sbcl + lispPackages.quicklisp + + dust + pixie + ]; +} diff --git a/modules/nitrokey.nix b/modules/nitrokey.nix index a256c33d..ac85e352 100644 --- a/modules/nitrokey.nix +++ b/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; diff --git a/modules/synaptics.nix b/modules/synaptics.nix index 0e9db17a..1028db35 100644 --- a/modules/synaptics.nix +++ b/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" + ''; + }; }; } diff --git a/modules/user-interface.nix b/modules/user-interface.nix index 2111d8b0..d8a2b6a4 100644 --- a/modules/user-interface.nix +++ b/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; @@ -11,6 +23,9 @@ in firefox-bin pcmanfm + epdfview + geeqie + lxappearance vdirsyncer @@ -46,19 +61,9 @@ in 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; diff --git a/modules/x250.nix b/modules/x250.nix index 025bc302..a6509bf1 100644 --- a/modules/x250.nix +++ b/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 ]; diff --git a/satoshipad.nix b/satoshipad.nix index 6be962c2..766f78c0 100644 --- a/satoshipad.nix +++ b/satoshipad.nix @@ -25,8 +25,10 @@ ./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 |