From 2751cf0991778d899af23ecf81edcd7af7c8f609 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 17 Jul 2018 19:47:49 +0200 Subject: j: remove trailing whitespaces --- jeschli/1systems/bln/config.nix | 2 +- jeschli/2configs/IM.nix | 2 +- jeschli/2configs/urxvt.nix | 4 ++-- jeschli/2configs/xserver/Xresources.nix | 2 +- jeschli/5pkgs/simple/xmonad-jeschli/default.nix | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 371a705..716b9c4 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: # bln config file { - imports = [ + imports = [ ./hardware-configuration.nix diff --git a/jeschli/2configs/IM.nix b/jeschli/2configs/IM.nix index 171b782..288134f 100644 --- a/jeschli/2configs/IM.nix +++ b/jeschli/2configs/IM.nix @@ -30,7 +30,7 @@ in { jeschli-bln.pubkey jeschli-brauerei.pubkey ]; - packages = [ tmux ]; + packages = [ tmux ]; }; diff --git a/jeschli/2configs/urxvt.nix b/jeschli/2configs/urxvt.nix index 0149187..4049a47 100644 --- a/jeschli/2configs/urxvt.nix +++ b/jeschli/2configs/urxvt.nix @@ -29,11 +29,11 @@ with import ; *color13: rgb:fc/54/fc *color14: rgb:54/fc/fc *color15: rgb:fc/fc/fc - + URxvt*scrollBar: false URxvt*urgentOnBell: true URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize} URXvt*faceSize: ${toString config.jeschliFontSize} ''; - }; + }; } diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix index e815491..adf06ee 100644 --- a/jeschli/2configs/xserver/Xresources.nix +++ b/jeschli/2configs/xserver/Xresources.nix @@ -4,7 +4,7 @@ with import ; pkgs.writeText "Xresources" /* xdefaults */ '' Xcursor.theme: aero-large-drop - Xcursor.size: 128 + Xcursor.size: 128 Xft.dpi: 144 URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’" diff --git a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix index 5aa3c2f..8885602 100644 --- a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix +++ b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix @@ -90,7 +90,7 @@ mainNoArgs = do , startupHook = do setWMName "LG3D" whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK")) - (\path -> forkFile path [] Nothing) <+> setWMName "LG3D" + (\path -> forkFile path [] Nothing) <+> setWMName "LG3D" , normalBorderColor = "#1c1c1c" , focusedBorderColor = "#f000b0" , handleEventHook = handleShutdownEvent @@ -150,7 +150,7 @@ myKeys conf = Map.fromList $ , ((_S , xK_Print ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) ) , ((_C , xK_Print ), toggleWS) , ((_4 , xK_Print ), rhombus horseConfig (liftIO . hPutStrLn stderr) ["Correct", "Horse", "Battery", "Staple", "Stuhl", "Tisch"] ) - + -- %! Rotate through the available layout algorithms , ((_4 , xK_space ), sendMessage NextLayout) , ((_4S , xK_space ), setLayout $ XMonad.layoutHook conf) -- reset layout @@ -222,7 +222,7 @@ myKeys conf = Map.fromList $ pagerConfig :: PagerConfig pagerConfig = def { pc_font = myFont - , pc_cellwidth = 256 + , pc_cellwidth = 256 --, pc_cellheight = 36 -- TODO automatically keep screen aspect --, pc_borderwidth = 1 --, pc_matchcolor = "#f0b000" -- cgit v1.2.3 From 63dbe4fac3513ca6c444faa6de4febaee4f56304 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 16:30:31 +0200 Subject: j bln: new office vpn --- jeschli/1systems/bln/config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 371a705..2c8c938 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -9,6 +9,8 @@ +# + ]; # boot.loader.systemd-boot.enable = true; @@ -94,6 +96,8 @@ vagrant # document viewer zathura + + samba ]; -- cgit v1.2.3 From 9a967acb53e1fe3583382e7bd124794852f8de22 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 16:32:39 +0200 Subject: j my-emacs: cooler feel for org-mode --- jeschli/2configs/emacs.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix index 4c52432..2089d42 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} "$@" -- cgit v1.2.3 From 6607847d26ea402c550df551f2c7d65e31cfaf13 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 16:36:51 +0200 Subject: j: +officevpn by luis --- jeschli/2configs/officevpn.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 jeschli/2configs/officevpn.nix diff --git a/jeschli/2configs/officevpn.nix b/jeschli/2configs/officevpn.nix new file mode 100644 index 0000000..eb0477d --- /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 +} + -- cgit v1.2.3 From 7f240cdab5eb44297a3c5aef208e3e45966c8e23 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:19:32 +0200 Subject: j brauerei: remove some comment garbage --- jeschli/1systems/brauerei/config.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 5a6ad76..00db1ad 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" '' -- cgit v1.2.3 From c85b5bfb85911f8964f77a00331d7901535271b1 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:19:55 +0200 Subject: j brauerei: reformatting --- jeschli/1systems/brauerei/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 00db1ad..26e25c8 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -37,6 +37,7 @@ exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"' ''; }; + environment.systemPackages = with pkgs; [ # system helper ag -- cgit v1.2.3 From b0338cc2fe693d9dd998bf39b8aa7c07ffcea9cd Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:20:09 +0200 Subject: j brauerei: +taskwarrior --- jeschli/1systems/brauerei/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 26e25c8..5b384d1 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -94,6 +94,7 @@ zathura # xorg xorg.xbacklight + taskwarrior ]; # Some programs need SUID wrappers, can be configured further or are -- cgit v1.2.3 From f58744e38a0f27ddc647486cf3bf1eae34f586f9 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:20:29 +0200 Subject: j brauerei: *dpi --- jeschli/1systems/brauerei/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 5b384d1..d1cca55 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -118,7 +118,7 @@ display = 11; tty = 11; - dpi = 96; + dpi = 144; # videoDrivers = [ "nvidia" ]; synaptics = { -- cgit v1.2.3 From c581fdc404785fbf76b132752016583d18eebaeb Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:21:30 +0200 Subject: j brauerei: add audio group for jeschli --- jeschli/1systems/brauerei/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index d1cca55..e200cbc 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -130,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 = { -- cgit v1.2.3 From dd682670a6d67987a7ce05f6387dd664af5b9fbd Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:22:32 +0200 Subject: j brauerei: enable pulseaudio --- jeschli/1systems/brauerei/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix index 75fdb89..2cb3e66 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; } -- cgit v1.2.3 From 6669a912c6b69b19f929aa0edc2fe6481c3a6fe8 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:23:29 +0200 Subject: j xserver: remove xft.dpi option --- jeschli/2configs/xserver/Xresources.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix index adf06ee..98f3252 100644 --- a/jeschli/2configs/xserver/Xresources.nix +++ b/jeschli/2configs/xserver/Xresources.nix @@ -5,7 +5,6 @@ with import ; pkgs.writeText "Xresources" /* xdefaults */ '' Xcursor.theme: aero-large-drop Xcursor.size: 128 - Xft.dpi: 144 URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’" URxvt*eightBitInput: false -- cgit v1.2.3 From e5f2d7d71b4ef29b81ad5781b1953a95ce1daef9 Mon Sep 17 00:00:00 2001 From: jeschli Date: Wed, 1 Aug 2018 13:53:46 +0200 Subject: j emacs: activate evilMode --- jeschli/2configs/emacs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix index 2089d42..3bd2dbf 100644 --- a/jeschli/2configs/emacs.nix +++ b/jeschli/2configs/emacs.nix @@ -57,6 +57,7 @@ let (global-set-key "\C-x\ \C-r" 'recentf-open-files) ''; dotEmacs = pkgs.writeText "dot-emacs" '' + ${evilMode} ${packageRepos} ${orgMode} ${recentFiles} -- cgit v1.2.3 From 7f3d2f480bb59df3d2bbe9a114aa5524a8fdc5c5 Mon Sep 17 00:00:00 2001 From: jeschli Date: Wed, 1 Aug 2018 14:02:54 +0200 Subject: j bln: +pair programming eth link --- jeschli/1systems/bln/config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index e17d5a4..6e3c3be 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -165,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; } + ]; + } -- cgit v1.2.3 From 6f48ff3ec71e8ab85eabf8889bdc7c544bdb85da Mon Sep 17 00:00:00 2001 From: jeschli Date: Wed, 1 Aug 2018 14:05:29 +0200 Subject: j xserver: removed dpi; modified urxvt font-size --- jeschli/2configs/xserver/Xresources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix index adf06ee..ebe7159 100644 --- a/jeschli/2configs/xserver/Xresources.nix +++ b/jeschli/2configs/xserver/Xresources.nix @@ -5,7 +5,6 @@ with import ; 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 -- cgit v1.2.3 From 932ce82229626eb82c01c92a1c9ae5a161dc7970 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 9 Aug 2018 14:38:06 +0200 Subject: genid_signed -> genid_uint31 --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index e5e4097..a40225c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -13,7 +13,7 @@ let mod = x: y: x - y * (x / y); genid = import ./genid.nix { inherit lib; }; - genid_signed = x: ((lib.genid x) + 16777216) / 2; + genid_uint31 = x: ((lib.genid x) + 16777216) / 2; lpad = n: c: s: if lib.stringLength s < n -- cgit v1.2.3