diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-04-29 07:01:28 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-04-29 07:01:28 +0200 |
| commit | aa63f819165a5c5ffdca06b3e9d5ee0447cc433b (patch) | |
| tree | 9a52f68158a9064d166a003fd668e3428d7720ef /machines | |
| parent | 376960d7f883b7b141c49600a829c5efc15e0135 (diff) | |
machines/katara: misc changes
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/profpatsch/katara.nix | 9 | ||||
| -rw-r--r-- | machines/profpatsch/kernel-usb.patch | 11 |
2 files changed, 6 insertions, 14 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index e29ca415..231e897b 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -88,7 +88,8 @@ in { ########### # Packages - environment.profileRelativeEnvVars = { EDITOR = [ "${pkgs.vim}/bin/vim" ]; }; + + environment.sessionVariables = { EDITOR = "${pkgs.vim}/bin/vim"; }; environment.systemPackages = with pkgs; let @@ -107,7 +108,7 @@ in { mkpasswd # UNIX password creator mosh # ssh with stable connections nfs-utils # the filesystem of the future for 20 years - (nmap.override { graphicalSupport = true; }) # stats about clients in the network + nmap # stats about clients in the network smartmontools # check disk state stow # dotfile management tmux # detachable terminal multiplexer @@ -280,6 +281,7 @@ in { '' #TODO add as nixpkg export PATH+=":$HOME/scripts" #add utility scripts + export PATH+=":$HOME/.bin" #add (temporary) executables export EDITOR=emacsclient eval $(gpg-agent --daemon --enable-ssh-support) @@ -289,7 +291,7 @@ in { set-background & # TODO xbindkeys user service file xbindkeys - nice -n19 dropbox start & + nice -n19 dropbox-cli start & nm-applet & ''; }; @@ -346,6 +348,7 @@ in { set -x GPG_TTY (tty) ''; }; + vuizvui.programs.fish.fasd.enable = true; # build derivation on taalo vuizvui.user.aszlig.programs.taalo-build.enable = true; diff --git a/machines/profpatsch/kernel-usb.patch b/machines/profpatsch/kernel-usb.patch deleted file mode 100644 index e51b1aad..00000000 --- a/machines/profpatsch/kernel-usb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/usb/storage/uas.c 2016-04-03 21:45:04.326212268 +0200 -+++ b/drivers/usb/storage/uas.c 2016-04-03 21:51:45.263114257 +0200 -@@ -812,7 +812,7 @@ - .slave_configure = uas_slave_configure, - .eh_abort_handler = uas_eh_abort_handler, - .eh_bus_reset_handler = uas_eh_bus_reset_handler, -- .can_queue = 65536, /* Is there a limit on the _host_ ? */ -+ .can_queue = MAX_CMNDS, /* Is there a limit on the _host_ ? */ - .this_id = -1, - .sg_tablesize = SG_NONE, - .skip_settle_delay = 1, |