From 9773b0009a71686f50a5036845196c6cb3d1a34a Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Feb 2016 17:12:39 +0100 Subject: l 2 browsers: allow audio in flash browser --- lass/2configs/browsers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index 61016fed0..eb764068b 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -58,7 +58,7 @@ in { ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] ) ( createChromiumUser "fb" [ ] [ pkgs.chromium ] ) ( createChromiumUser "gm" [ ] [ pkgs.chromium ] ) - ( createChromiumUser "flash" [ ] [ pkgs.flash ] ) + ( createChromiumUser "flash" [ "audio" ] [ pkgs.flash ] ) ]; nixpkgs.config.packageOverrides = pkgs : { -- cgit v1.2.3 From 549bc221454eae6c152983921e024af60e3fc0c1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Feb 2016 17:13:40 +0100 Subject: l 2 git: add extraction_webinterface repo --- lass/2configs/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 2d8ee95dd..9dd8475a3 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -42,6 +42,7 @@ let brain = { collaborators = with config.krebs.users; [ tv makefu ]; }; + extraction_webinterface = {}; } // import { inherit config lib pkgs; } ); -- cgit v1.2.3 From c60b83e58c6b62d00e29140bfbdc3c6f573f170e Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Feb 2016 17:13:54 +0100 Subject: l 2 git: add politics-fetching repo --- lass/2configs/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 9dd8475a3..cfd1a9952 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -43,6 +43,7 @@ let collaborators = with config.krebs.users; [ tv makefu ]; }; extraction_webinterface = {}; + politics-fetching = {}; } // import { inherit config lib pkgs; } ); -- cgit v1.2.3 From 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Feb 2016 17:14:27 +0100 Subject: l 2 xserver: add systemPackages PATH --- lass/2configs/xserver/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index c407bb59e..a7e77553f 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -93,11 +93,9 @@ let xmonad-start = pkgs.writeScriptBin "xmonad" '' #! ${pkgs.bash}/bin/bash set -efu - export PATH; PATH=${makeSearchPath "bin" [ - pkgs.alsaUtils - pkgs.pulseaudioLight + export PATH; PATH=${makeSearchPath "bin" ([ pkgs.rxvt_unicode - ]}:/var/setuid-wrappers + ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal command=''${1##*/} -- cgit v1.2.3 From f23bf841b760ac1d984377839d625f47830ed517 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 17 Feb 2016 15:00:18 +0100 Subject: l 2: use inherit genid from krebs.lib --- lass/2configs/libvirt.nix | 3 ++- lass/2configs/skype.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix index 7520a0e36..a51ccae58 100644 --- a/lass/2configs/libvirt.nix +++ b/lass/2configs/libvirt.nix @@ -2,13 +2,14 @@ let mainUser = config.users.extraUsers.mainUser; + inherit (config.krebs.lib) genid; in { virtualisation.libvirtd.enable = true; users.extraUsers = { libvirt = { - uid = lib.genid "libvirt"; + uid = genid "libvirt"; description = "user for running libvirt stuff"; home = "/home/libvirt"; useDefaultShell = true; diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix index d62a18a52..5b6da4a95 100644 --- a/lass/2configs/skype.nix +++ b/lass/2configs/skype.nix @@ -2,12 +2,13 @@ let mainUser = config.users.extraUsers.mainUser; + inherit (config.krebs.lib) genid; in { users.extraUsers = { skype = { name = "skype"; - uid = lib.genid "skype"; + uid = genid "skype"; description = "user for running skype"; home = "/home/skype"; useDefaultShell = true; -- cgit v1.2.3 From ae79a451c20c8060eaa54510e9f8313e3cae2d24 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 21 Feb 2016 14:31:12 +0100 Subject: l 2 weechat: get genid from krebs.lib --- lass/2configs/weechat.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix index 6a257f0bb..6c234d1bc 100644 --- a/lass/2configs/weechat.nix +++ b/lass/2configs/weechat.nix @@ -1,14 +1,16 @@ { config, lib, pkgs, ... }: -{ - krebs.per-user.chat.packages = [ - pkgs.weechat - pkgs.tmux +let + inherit (config.krebs.lib) genid; +in { + krebs.per-user.chat.packages = with pkgs; [ + tmux + weechat ]; users.extraUsers.chat = { home = "/home/chat"; - uid = lib.genid "chat"; + uid = genid "chat"; useDefaultShell = true; createHome = true; openssh.authorizedKeys.keys = [ -- cgit v1.2.3 From afff46605b26f6d72794e644c8a83a83d3caf46a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 21 Feb 2016 14:31:43 +0100 Subject: l 2 weechat: add mosh to pkgs --- lass/2configs/weechat.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix index 6c234d1bc..98f5df42a 100644 --- a/lass/2configs/weechat.nix +++ b/lass/2configs/weechat.nix @@ -4,6 +4,7 @@ let inherit (config.krebs.lib) genid; in { krebs.per-user.chat.packages = with pkgs; [ + mosh tmux weechat ]; -- cgit v1.2.3 From 70b0f9c9e6205d0ec59c9d84f7e1e518ad68e61e Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Feb 2016 00:50:01 +0100 Subject: l 2 browsers: generate id with genid --- lass/2configs/browsers.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index eb764068b..34449d1d9 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: let + inherit (config.krebs.lib) genid; + mainUser = config.users.extraUsers.mainUser; createChromiumUser = name: extraGroups: packages: { @@ -8,6 +10,7 @@ let inherit name; inherit extraGroups; home = "/home/${name}"; + uid = genid name; useDefaultShell = true; createHome = true; }; @@ -28,6 +31,7 @@ let inherit name; inherit extraGroups; home = "/home/${name}"; + uid = genid name; useDefaultShell = true; createHome = true; }; -- cgit v1.2.3 From 527884513027153c30e64c49e3536711a26eecf3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Feb 2016 00:50:35 +0100 Subject: l 2 base: nixpkgs rev d0e3cc -> 77f8f35 --- lass/2configs/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index d2c96fdaa..42229ab6f 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -54,8 +54,8 @@ with config.krebs.lib; #secrets-common = "/home/lass/secrets/common"; stockholm = "/home/lass/stockholm"; nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce"; + url = https://github.com/NixOS/nixpkgs; + rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; dev = "/home/lass/src/nixpkgs"; }; } // optionalAttrs config.krebs.build.host.secure { -- cgit v1.2.3 From a7e406c5b9bc10d2ee59dd534d577978dfebff0f Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Feb 2016 00:51:22 +0100 Subject: l 2 browsers: add all browsers to audio & add wk --- lass/2configs/browsers.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index 34449d1d9..47a16d4cb 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -52,16 +52,17 @@ in { environment.systemPackages = [ (pkgs.writeScriptBin "browser-select" '' - BROWSER=$(echo -e "ff\ncr\nfb\ngm\nflash" | dmenu) + BROWSER=$(echo -e "ff\ncr\nwk\nfb\ngm\nflash" | dmenu) $BROWSER $@ '') ]; imports = [ - ( createFirefoxUser "ff" [ "audio" ] [ ] ) + ( createFirefoxUser "ff" [ "audio" ] [ pkgs.firefox ] ) ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] ) - ( createChromiumUser "fb" [ ] [ pkgs.chromium ] ) - ( createChromiumUser "gm" [ ] [ pkgs.chromium ] ) + ( createChromiumUser "wk" [ "audio" ] [ pkgs.chromium ] ) + ( createChromiumUser "fb" [ "audio" ] [ pkgs.chromium ] ) + ( createChromiumUser "gm" [ "audio" ] [ pkgs.chromium ] ) ( createChromiumUser "flash" [ "audio" ] [ pkgs.flash ] ) ]; -- cgit v1.2.3 From 641e7bed47d0567f654bdb2a2c55e4bd0a882fd1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Feb 2016 00:51:52 +0100 Subject: l 2 retiolum: don't connect to cac hosts --- lass/2configs/retiolum.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix index f8a63706e..1646cdea9 100644 --- a/lass/2configs/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -16,8 +16,6 @@ enable = true; connectTo = [ "prism" - "cloudkrebs" - "echelon" "pigstarter" "gum" "flap" -- cgit v1.2.3 From 61f2ea55e27e1649ea6ed23c11321e1cfeff0424 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 26 Feb 2016 16:45:39 +0100 Subject: l 2 base: nixpkgs rev 77f8f35 -> 885acea --- lass/2configs/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 42229ab6f..af4ee6d27 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -55,7 +55,7 @@ with config.krebs.lib; stockholm = "/home/lass/stockholm"; nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; + rev = "885acea1dd82b0354ff2b6bcf1268b3031cf93df"; dev = "/home/lass/src/nixpkgs"; }; } // optionalAttrs config.krebs.build.host.secure { -- cgit v1.2.3 From acd5d7cceeeb96c182a963ba0c564821a36c8938 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 27 Feb 2016 15:51:25 +0100 Subject: l 2 base: add krebspate to pkgs --- lass/2configs/base.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index af4ee6d27..53983175c 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -104,6 +104,9 @@ with config.krebs.lib; #stuff for dl aria2 + + #neat utils + krebspaste ]; programs.bash = { -- cgit v1.2.3 From cc2d6843bfb564ec5876ea79e6647b0093b07f96 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 2 Mar 2016 21:40:02 +0100 Subject: l 2 base: nixpkgs rev 885acea -> 40c586b --- lass/2configs/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 53983175c..51a6d9da8 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -55,7 +55,7 @@ with config.krebs.lib; stockholm = "/home/lass/stockholm"; nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "885acea1dd82b0354ff2b6bcf1268b3031cf93df"; + rev = "40c586b7ce2c559374df435f46d673baf711c543"; dev = "/home/lass/src/nixpkgs"; }; } // optionalAttrs config.krebs.build.host.secure { -- cgit v1.2.3 From f3edfbeb1102ce7c109bab88dfc68819c5d1f701 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 2 Mar 2016 21:51:46 +0100 Subject: l 2: add cbase config --- lass/2configs/cbase.nix | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 lass/2configs/cbase.nix (limited to 'lass/2configs') diff --git a/lass/2configs/cbase.nix b/lass/2configs/cbase.nix new file mode 100644 index 000000000..9d13bc30d --- /dev/null +++ b/lass/2configs/cbase.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, ... }: + +let + inherit (config.krebs.lib) genid; + +in { + + users.extraUsers = { + cbasevpn = rec { + name = "cbasevpn"; + uid = genid "cbasevpn"; + description = "user for running c-base openvpn"; + home = "/home/${name}"; + }; + }; + + users.extraGroups.cbasevpn.gid = genid "cbasevpn"; + + services.openvpn.servers = { + c-base = { + config = '' + client + dev tap + proto tcp + remote vpn.ext.c-base.org 1194 + resolv-retry infinite + nobind + user cbasevpn + group cbasevpn + persist-key + persist-tun + + auth-nocache + #auth-user-pass + auth-user-pass ${toString } + + comp-lzo + verb 3 + + #script-security 2 + #up /etc/openvpn/update-resolv-conf + #down /etc/openvpn/update-resolv-conf + + + -----BEGIN CERTIFICATE----- + MIIDUjCCArugAwIBAgIJAOOk8EXgjsf5MA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV + BAYTAkRFMQswCQYDVQQIEwJERTEPMA0GA1UEBxMGQmVybGluMQ8wDQYDVQQKEwZj + LWJhc2UxGzAZBgNVBAMTEnZwbi5leHQuYy1iYXNlLm9yZzEfMB0GCSqGSIb3DQEJ + ARYQYWRtYXhAYy1iYXNlLm9yZzAeFw0wOTAyMTMwOTE1MzdaFw0xOTAyMTEwOTE1 + MzdaMHoxCzAJBgNVBAYTAkRFMQswCQYDVQQIEwJERTEPMA0GA1UEBxMGQmVybGlu + MQ8wDQYDVQQKEwZjLWJhc2UxGzAZBgNVBAMTEnZwbi5leHQuYy1iYXNlLm9yZzEf + MB0GCSqGSIb3DQEJARYQYWRtYXhAYy1iYXNlLm9yZzCBnzANBgkqhkiG9w0BAQEF + AAOBjQAwgYkCgYEAt3wEgXbqFKxs8z/E4rv13hkRi6J+QdshNzntm7rTOmUsXKE7 + IEwoJSglrmsDPv4UqE86A7bjW7YYSFjhzxFRkTEHJanyOCF48ZPItVl7Eq7T81co + uR+6lAhxnLDrwnPJCC83NzAa6lw8U1DsQRDkayKlrQrtZq6++pFFEvZvt1cCAwEA + AaOB3zCB3DAdBgNVHQ4EFgQUqkSbdXS90+HtqXDeAI+PcyTSSHEwgawGA1UdIwSB + pDCBoYAUqkSbdXS90+HtqXDeAI+PcyTSSHGhfqR8MHoxCzAJBgNVBAYTAkRFMQsw + CQYDVQQIEwJERTEPMA0GA1UEBxMGQmVybGluMQ8wDQYDVQQKEwZjLWJhc2UxGzAZ + BgNVBAMTEnZwbi5leHQuYy1iYXNlLm9yZzEfMB0GCSqGSIb3DQEJARYQYWRtYXhA + Yy1iYXNlLm9yZ4IJAOOk8EXgjsf5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF + BQADgYEAOBANG1H4uEEWk3sbeQoSMeA3LFG1+6MgFGk2WAdeHYuV9GKYBq6/PLP5 + ffw+FNkiDjLSeSQO88vHYJr2V1v8n/ZoCIT+1VBcDWXTpGz0YxDI1iBauO3tUPzK + wGs46RA/S0YwiZw64MaUHd88ZVadjKy9kNoO3w6/vpAS6s/Mh+o= + -----END CERTIFICATE----- + + key-direction 1 + + # + # 2048 bit OpenVPN static key + # + -----BEGIN OpenVPN Static key V1----- + 5d49aa8c9cec18de7ab6e0b5cd09a368 + d3f1b8b77e055e448804fa0e14f487cb + 491681742f96b54a23fb8639aa9ed14e + c40b86a5546b888c4f3873f23c956e87 + 169076ec869127ffc85353fd5928871c + da19776b79f723abb366fae6cdfe4ad6 + 7ef667b7d05a7b78dfd5ea1d2da276dc + 5f6c82313fe9c1178c7256b8d1d081b0 + 4c80bc8f21add61fbc52c158579edc1d + bbde230afb9d0e531624ce289a17098a + 3261f9144a9a2a6f0da4250c9eed4086 + 187ec6fa757a454de743a349e32af193 + e9f8b49b010014bdfb3240d992f2f234 + 581d0ce05d4e07a2b588ad9b0555b704 + 9d5edc28efde59226ec8942feed690a1 + 2acd0c8bc9424d6074d0d495391023b6 + -----END OpenVPN Static key V1----- + + ''; + }; + }; +} -- cgit v1.2.3 From 5f800d02e8345a41ef1e74dd0dbbb291916311f7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 6 Mar 2016 01:50:44 +0100 Subject: l 2 vim: add fugitive & unimpared to vim plugins --- lass/2configs/vim.nix | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 3fe45e1d1..fe5405bca 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -1,13 +1,24 @@ { config, pkgs, ... }: let - customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin { - name = "Mustang2"; - src = pkgs.fetchFromGitHub { - owner = "croaker"; - repo = "mustang-vim"; - rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5"; - sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67"; + customPlugins = { + mustang2 = pkgs.vimUtils.buildVimPlugin { + name = "Mustang2"; + src = pkgs.fetchFromGitHub { + owner = "croaker"; + repo = "mustang-vim"; + rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5"; + sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67"; + }; + }; + unimpaired = pkgs.vimUtils.buildVimPlugin { + name = "unimpaired-vim"; + src = pkgs.fetchFromGitHub { + owner = "tpope"; + repo = "vim-unimpaired"; + rev = "11dc568dbfd7a56866a4354c737515769f08e9fe"; + sha256 = "1an941j5ckas8l3vkfhchdzjwcray16229rhv3a1d4pbxifwshi8"; + }; }; }; @@ -105,11 +116,24 @@ in { "esc timeout set timeoutlen=1000 ttimeoutlen=0 + + "foldfunctions + inoremap za + nnoremap za + onoremap za + vnoremap zf ''; vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins; vimrcConfig.vam.pluginDictionaries = [ - { names = [ "Gundo" "commentary" "mustang2" ]; } + { names = [ + "Gundo" + "commentary" + "mustang2" + "extradite" + "fugitive" + "unimpaired" + ]; } { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } ]; -- cgit v1.2.3 From fde8731ad112d0ec8c64cf77c339c7c25664f96c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 6 Mar 2016 01:52:23 +0100 Subject: l 2 vim: remove trailing whitespace --- lass/2configs/vim.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index fe5405bca..961238b08 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -67,7 +67,8 @@ in { vnoremap < >gv - nmap q :buffer + nmap q :buffer + "Tabwidth set ts=2 sts=2 sw=2 et -- cgit v1.2.3 From a973f194b8dc824a2144da7da736d5085bb6d462 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 6 Mar 2016 01:52:54 +0100 Subject: l 2 xserver: disable autorestarting of xmonad --- lass/2configs/xserver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 203ed0b09..48bd31bf4 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -49,7 +49,7 @@ let services.xserver.enable = true; systemd.services.xmonad = { - wantedBy = [ "multi-user.target" ]; + #wantedBy = [ "multi-user.target" ]; requires = [ "xserver.service" ]; environment = xmonad-environment; serviceConfig = { -- cgit v1.2.3 From 2bc6d70feb5b5f2421d086009d64f3c9f840f6d4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 7 Mar 2016 13:16:57 +0100 Subject: l 2 vim: use brogrammer theme --- lass/2configs/vim.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 961238b08..7e7296c95 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -20,6 +20,15 @@ let sha256 = "1an941j5ckas8l3vkfhchdzjwcray16229rhv3a1d4pbxifwshi8"; }; }; + brogrammer = pkgs.vimUtils.buildVimPlugin { + name = "brogrammer"; + src = pkgs.fetchFromGitHub { + owner = "marciomazza"; + repo = "vim-brogrammer-theme"; + rev = "3e412d8e8909d8d89eb5a4cbe955b5bc0833a3c3"; + sha256 = "0am1qk8ls74z5ipgf9viacayq08y9i9vd7sxxiivwgsjh2ancbv6"; + }; + }; }; in { @@ -34,7 +43,7 @@ in { syntax on " TODO autoload colorscheme file set background=dark - colorscheme mustang + colorscheme brogrammer filetype off filetype plugin indent on @@ -134,6 +143,7 @@ in { "extradite" "fugitive" "unimpaired" + "brogrammer" ]; } { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } ]; -- cgit v1.2.3 From a9a736c5f801dc2a9e6b764a5d20a2e5349ccf9d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 7 Mar 2016 13:17:19 +0100 Subject: l 2 xserver: disable xmonad restart on change --- lass/2configs/xserver/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 48bd31bf4..30afd787e 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -49,9 +49,10 @@ let services.xserver.enable = true; systemd.services.xmonad = { - #wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" ]; requires = [ "xserver.service" ]; environment = xmonad-environment; + restartIfChanged = false; serviceConfig = { ExecStart = "${xmonad-start}/bin/xmonad"; ExecStop = "${xmonad-stop}/bin/xmonad-stop"; -- cgit v1.2.3 From 8e42e8667ee304f6bc39c32dce35112580bcbc54 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Mar 2016 13:25:15 +0100 Subject: l 2 base: MANPAGER=most PAGER=less --- lass/2configs/base.nix | 2 +- lass/2configs/zsh.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 51a6d9da8..557842777 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -81,7 +81,7 @@ with config.krebs.lib; # multiple-definition-problem when defining environment.variables.EDITOR environment.extraInit = '' EDITOR=vim - PAGER=most + MANPAGER=most ''; environment.systemPackages = with pkgs; [ diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix index 64aa45823..7299e9ac0 100644 --- a/lass/2configs/zsh.nix +++ b/lass/2configs/zsh.nix @@ -54,10 +54,6 @@ #eval $( dircolors -b ~/.LS_COLORS ) - #exports - export EDITOR='vim' - export MANPAGER='most' - export PAGER='vim -R -' # export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -' #beautiful colors -- cgit v1.2.3 From fe0bb6c0f57263c1e6ed526566fc4f11dd113492 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Mar 2016 14:00:55 +0100 Subject: l 2 retiolum: use tinc_pre --- lass/2configs/retiolum.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix index 1646cdea9..89e0f217a 100644 --- a/lass/2configs/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -21,4 +21,8 @@ "flap" ]; }; + + nixpkgs.config.packageOverrides = pkgs: { + tinc = pkgs.tinc_pre; + }; } -- cgit v1.2.3 From ab16f4c4b1d637558d40c4684463395807ace225 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Mar 2016 14:30:23 +0100 Subject: l 2 base: activate timesyncd --- lass/2configs/base.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 557842777..8017d4270 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -68,8 +68,9 @@ with config.krebs.lib; users.mutableUsers = false; + services.timesyncd.enable = true; + #why is this on in the first place? - services.ntp.enable = false; services.nscd.enable = false; boot.tmpOnTmpfs = true; -- cgit v1.2.3 From cbe70e8c394b372cab35a0520f2fb3dcc83ebd2f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Mar 2016 14:37:46 +0100 Subject: l 3 newsbot-js -> k 3 newsbot-js --- lass/2configs/newsbot-js.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix index 4482c4e9d..d7c68bd7d 100644 --- a/lass/2configs/newsbot-js.nix +++ b/lass/2configs/newsbot-js.nix @@ -187,13 +187,10 @@ let hackernews|https://news.ycombinator.com/rss|#news ''; in { - imports = [ - ../3modules/newsbot-js.nix - ]; environment.systemPackages = [ pkgs.newsbot-js ]; - lass.newsbot-js = { + krebs.newsbot-js = { enable = true; ircServer = "localhost"; feeds = newsfile; -- cgit v1.2.3 From f961d28ea5014b019cfce66088a0c39898348445 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Mar 2016 15:14:22 +0100 Subject: l 2 baseX: add xbacklight --- lass/2configs/baseX.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index ede1c7b7b..bb32be086 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -40,6 +40,7 @@ in { push slock sxiv + xorg.xbacklight xsel zathura -- cgit v1.2.3 From 6eedc423e3df2c1357fa23cb3fb5e67dc895a4fa Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Mar 2016 15:43:24 +0100 Subject: l 2 vim: add file-line plugin --- lass/2configs/vim.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 7e7296c95..b40227c61 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -29,6 +29,15 @@ let sha256 = "0am1qk8ls74z5ipgf9viacayq08y9i9vd7sxxiivwgsjh2ancbv6"; }; }; + file-line = pkgs.vimUtils.buildVimPlugin { + name = "file-line"; + src = pkgs.fetchFromGitHub { + owner = "bogado"; + repo = "file-line"; + rev = "f9ffa1879ad84ce4a386110446f395bc1795b72a"; + sha256 = "173n47w9zd01rcyrrmm194v79xq7d1ggzr19n1lsxrqfgr2c1rvk"; + }; + }; }; in { @@ -137,13 +146,14 @@ in { vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins; vimrcConfig.vam.pluginDictionaries = [ { names = [ - "Gundo" + "brogrammer" "commentary" - "mustang2" "extradite" + "file-line" "fugitive" + "Gundo" + "mustang2" "unimpaired" - "brogrammer" ]; } { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } ]; -- cgit v1.2.3 From 658594cae25fd7ac078c80934f203e736aa10c64 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 19 Mar 2016 22:02:09 +0100 Subject: l 2 baseX: add mpv-poll + deps --- lass/2configs/baseX.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index bb32be086..6c52240af 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -33,7 +33,6 @@ in { dmenu gitAndTools.qgit - mpv much pavucontrol powertop @@ -44,6 +43,9 @@ in { xsel zathura + mpv + mpv-poll + yt-next #window manager stuff #haskellPackages.xmobar #haskellPackages.yeganesh -- cgit v1.2.3