Merge remote-tracking branch 'lass/master'

6 files changed, 52 insertions, 22 deletions

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 716b9c484..6e3c3bec8 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -9,6 +9,8 @@
     <stockholm/jeschli/2configs/emacs.nix>
     <stockholm/jeschli/2configs/xdg.nix>
     <stockholm/jeschli/2configs/xserver>
+#    <stockholm/jeschli/1systems/bln/dcso-vpn.nix>
+    <stockholm/jeschli/2configs/officevpn.nix>
   ];
 
 #  boot.loader.systemd-boot.enable = true;
@@ -94,6 +96,8 @@
     vagrant
   # document viewer
     zathura
+
+    samba
   ];
 
 
@@ -161,4 +165,9 @@
 
   hardware.bluetooth.enable = true;
   krebs.build.host = config.krebs.hosts.bln;
+
+  networking.interfaces.enp0s31f6.ipv4.addresses = [
+    { address = "10.99.23.2"; prefixLength = 24; }
+  ];
+
 }
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 5a6ad7652..e200cbcd4 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -25,21 +25,11 @@
     preLVM = true;
     allowDiscards = true;
   } ];
-#  networking.hostName = "brauerei";
-  # Define your hostname.
-#  networking.wireless.enable = true;
   networking.networkmanager.enable = true;
-  # Enables wireless support via wpa_supplicant.
-  # Select internationalisation properties.
-  # i18n = {
-  #   consoleFont = "Lat2-Terminus16";
-  #   consoleKeyMap = "us";
-  #   defaultLocale = "en_US.UTF-8";
-  # };
-  # Set your time zone.  #
   time.timeZone = "Europe/Amsterdam";
+
   nixpkgs.config.allowUnfree = true;
-  # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget
+
   environment.shellAliases = {
     n = "nix-shell";
     stocki = pkgs.writeDash "deploy" ''
@@ -47,6 +37,7 @@
       exec nix-shell -I stockholm="$PWD" --run 'deploy  --system="brauerei"'
     '';
   };
+
   environment.systemPackages = with pkgs; [
   # system helper
     ag
@@ -103,6 +94,7 @@
     zathura
   # xorg
     xorg.xbacklight
+    taskwarrior
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -126,7 +118,7 @@
     display = 11;
     tty = 11;
 
-    dpi = 96;
+    dpi = 144;
 
 #    videoDrivers = [ "nvidia" ];
     synaptics = {
@@ -138,7 +130,7 @@
 
   users.extraUsers.jeschli = { # TODO: define as krebs.users
     isNormalUser = true;
-    extraGroups = ["docker" "vboxusers"];
+    extraGroups = ["docker" "vboxusers" "audio"];
     uid = 1000;
   };
   users.extraUsers.jamie = {
diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix
index 75fdb89fd..2cb3e6661 100644
--- a/jeschli/1systems/brauerei/hardware-configuration.nix
+++ b/jeschli/1systems/brauerei/hardware-configuration.nix
@@ -29,5 +29,6 @@
 
   swapDevices = [ ];
 
+  hardware.pulseaudio.enable = true;
   nix.maxJobs = lib.mkDefault 4;
 }
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 4c52432d3..3bd2dbfc4 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -17,18 +17,19 @@ let
   '';
   evilMode = ''
     ;; Evil Mode
-    (add-to-list 'load-path "~/.emacs.d/evil")
     (require 'evil)
     (evil-mode 1)
-    (require 'evil-org)
-    (add-hook 'org-mode-hook 'evil-org-mode)
-    (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
-    (require 'evil-org-agenda)
-    (evil-org-agenda-set-keys)
+    ;; (require 'evil-org)
+    ;; (add-hook 'org-mode-hook 'evil-org-mode)
+    ;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
+    ;; (require 'evil-org-agenda)
+    ;; (evil-org-agenda-set-keys)
   '';
   windowCosmetics = ''
+    (menu-bar-mode -1)
     (tool-bar-mode -1)                  ; Disable the button bar atop screen
     (scroll-bar-mode -1)                ; Disable scroll bar
+    (toggle-scroll-bar -1)
     (setq inhibit-startup-screen t)     ; Disable startup screen with graphics
     (setq-default indent-tabs-mode nil) ; Use spaces instead of tabs
     (setq default-tab-width 2)          ; Two spaces is a tab
@@ -41,28 +42,36 @@ let
     (global-set-key "\C-cl" 'org-store-link)
     (global-set-key "\C-ca" 'org-agenda)
     (global-set-key "\C-cb" 'org-iswitchb)
+    (setq org-link-frame-setup '((file . find-file))) ; open link in same frame.
     (if (boundp 'org-user-agenda-files)
       (setq org-agenda-files org-user-agenda-files)
       (setq org-agenda-files (quote ("~/projects/notes")))
     )
   '';
+  theme = ''
+    (load-theme 'monokai-alt)
+  '';
   recentFiles = ''
     (recentf-mode 1)
     (setq recentf-max-menu-items 25)
     (global-set-key "\C-x\ \C-r" 'recentf-open-files)
   '';
   dotEmacs = pkgs.writeText "dot-emacs" ''
+    ${evilMode}
     ${packageRepos}
     ${orgMode}
     ${recentFiles}
+    ${theme}
     ${windowCosmetics}
   '';
   emacsWithCustomPackages = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [
+    epkgs.melpaPackages.evil
     epkgs.melpaStablePackages.magit
     epkgs.melpaPackages.mmm-mode
     epkgs.melpaPackages.nix-mode
     epkgs.melpaPackages.go-mode
     epkgs.melpaPackages.google-this
+    epkgs.melpaPackages.monokai-alt-theme
   ]);
   myEmacs = pkgs.writeDashBin "my-emacs" ''
     exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} "$@"
diff --git a/jeschli/2configs/officevpn.nix b/jeschli/2configs/officevpn.nix
new file mode 100644
index 000000000..eb0477d51
--- /dev/null
+++ b/jeschli/2configs/officevpn.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.packageOverrides = pkgs: {
+    openvpn = pkgs.openvpn.override { pkcs11Support = true; useSystemd = false;};
+  };
+
+  environment.systemPackages = with pkgs; [
+  opensc
+  openvpn
+  yubikey-manager
+  ];
+
+  services.pcscd.enable = true;
+
+  # To start the vpn manually execute
+  # $ openvpn --config clien.ovpn
+}
+
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
index adf06ee63..ebe7159ff 100644
--- a/jeschli/2configs/xserver/Xresources.nix
+++ b/jeschli/2configs/xserver/Xresources.nix
@@ -5,7 +5,6 @@ with import <stockholm/lib>;
 pkgs.writeText "Xresources" /* xdefaults */ ''
   Xcursor.theme: aero-large-drop
   Xcursor.size: 128
-  Xft.dpi: 144
 
   URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
   URxvt*eightBitInput: false
@@ -22,7 +21,8 @@ pkgs.writeText "Xresources" /* xdefaults */ ''
   URxvt*charClass: 33:48,37:48,45-47:48,64:48,38:48,61:48,63:48
   URxvt*cutNewline: False
   URxvt*cutToBeginningOfLine: False
-
+  URxvt*font: xft:Monospace:size=12
+  URxvt*font: xft:Monospace:size=12:bold
   URxvt*color0: #232342
   URxvt*color3: #c07000
   URxvt*color4: #4040c0