summaryrefslogtreecommitdiffstats
path: root/jeschli/2configs
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-07-31 19:24:39 +0200
committerjeschli <jeschli@gmail.com>2018-07-31 19:24:39 +0200
commit1de97fcef0a82307b3405d1b24ba5a999b572804 (patch)
treef37dcc0e861e9252d2e635546f12fadaca2bd906 /jeschli/2configs
parent101733029e93a2d3ee8de8ed1d6039aacb010a4e (diff)
parent63a761b4da5262749c4cb122739666d412456776 (diff)
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'jeschli/2configs')
-rw-r--r--jeschli/2configs/emacs.nix20
-rw-r--r--jeschli/2configs/officevpn.nix19
2 files changed, 33 insertions, 6 deletions
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 4c52432d3..2089d4254 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,11 +42,15 @@ 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)
@@ -55,14 +60,17 @@ let
${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
+}
+