Merge remote-tracking branch 'origin/staging/jeschli'

This commit is contained in:
jeschli 2018-07-31 19:24:39 +02:00
commit 1de97fcef0
3 changed files with 37 additions and 6 deletions

View File

@ -9,6 +9,8 @@
<stockholm/jeschli/2configs/emacs.nix> <stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/xdg.nix> <stockholm/jeschli/2configs/xdg.nix>
<stockholm/jeschli/2configs/xserver> <stockholm/jeschli/2configs/xserver>
# <stockholm/jeschli/1systems/bln/dcso-vpn.nix>
<stockholm/jeschli/2configs/officevpn.nix>
]; ];
# boot.loader.systemd-boot.enable = true; # boot.loader.systemd-boot.enable = true;
@ -94,6 +96,8 @@
vagrant vagrant
# document viewer # document viewer
zathura zathura
samba
]; ];

View File

@ -17,18 +17,19 @@ let
''; '';
evilMode = '' evilMode = ''
;; Evil Mode ;; Evil Mode
(add-to-list 'load-path "~/.emacs.d/evil")
(require 'evil) (require 'evil)
(evil-mode 1) (evil-mode 1)
(require 'evil-org) ;; (require 'evil-org)
(add-hook 'org-mode-hook 'evil-org-mode) ;; (add-hook 'org-mode-hook 'evil-org-mode)
(evil-org-set-key-theme '(navigation insert textobjects additional calendar)) ;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
(require 'evil-org-agenda) ;; (require 'evil-org-agenda)
(evil-org-agenda-set-keys) ;; (evil-org-agenda-set-keys)
''; '';
windowCosmetics = '' windowCosmetics = ''
(menu-bar-mode -1)
(tool-bar-mode -1) ; Disable the button bar atop screen (tool-bar-mode -1) ; Disable the button bar atop screen
(scroll-bar-mode -1) ; Disable scroll bar (scroll-bar-mode -1) ; Disable scroll bar
(toggle-scroll-bar -1)
(setq inhibit-startup-screen t) ; Disable startup screen with graphics (setq inhibit-startup-screen t) ; Disable startup screen with graphics
(setq-default indent-tabs-mode nil) ; Use spaces instead of tabs (setq-default indent-tabs-mode nil) ; Use spaces instead of tabs
(setq default-tab-width 2) ; Two spaces is a tab (setq default-tab-width 2) ; Two spaces is a tab
@ -41,11 +42,15 @@ let
(global-set-key "\C-cl" 'org-store-link) (global-set-key "\C-cl" 'org-store-link)
(global-set-key "\C-ca" 'org-agenda) (global-set-key "\C-ca" 'org-agenda)
(global-set-key "\C-cb" 'org-iswitchb) (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) (if (boundp 'org-user-agenda-files)
(setq org-agenda-files org-user-agenda-files) (setq org-agenda-files org-user-agenda-files)
(setq org-agenda-files (quote ("~/projects/notes"))) (setq org-agenda-files (quote ("~/projects/notes")))
) )
''; '';
theme = ''
(load-theme 'monokai-alt)
'';
recentFiles = '' recentFiles = ''
(recentf-mode 1) (recentf-mode 1)
(setq recentf-max-menu-items 25) (setq recentf-max-menu-items 25)
@ -55,14 +60,17 @@ let
${packageRepos} ${packageRepos}
${orgMode} ${orgMode}
${recentFiles} ${recentFiles}
${theme}
${windowCosmetics} ${windowCosmetics}
''; '';
emacsWithCustomPackages = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [ emacsWithCustomPackages = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [
epkgs.melpaPackages.evil
epkgs.melpaStablePackages.magit epkgs.melpaStablePackages.magit
epkgs.melpaPackages.mmm-mode epkgs.melpaPackages.mmm-mode
epkgs.melpaPackages.nix-mode epkgs.melpaPackages.nix-mode
epkgs.melpaPackages.go-mode epkgs.melpaPackages.go-mode
epkgs.melpaPackages.google-this epkgs.melpaPackages.google-this
epkgs.melpaPackages.monokai-alt-theme
]); ]);
myEmacs = pkgs.writeDashBin "my-emacs" '' myEmacs = pkgs.writeDashBin "my-emacs" ''
exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} "$@" exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} "$@"

View File

@ -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
}