From 6789205a6da67d62dcd406e6db63d0eced9ef4f0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 10 Oct 2018 20:13:07 +0200 Subject: l vim: show damned NBSP --- lass/2configs/vim.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 855c30b3e..4f7bd4437 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -63,6 +63,8 @@ let au Syntax * syn match Garbage containedin=ALL /\s\+$/ \ | syn match TabStop containedin=ALL /\t\+/ \ | syn keyword Todo containedin=ALL TODO + \ | syn match NBSP '\%xa0' + \ | syn match NarrowNBSP '\%u202F' au BufRead,BufNewFile *.hs so ${hs.vim} @@ -165,6 +167,8 @@ let hi Garbage ctermbg=088 hi TabStop ctermbg=016 + hi NBSP ctermbg=094 + hi NarrowNBSP ctermbg=097 hi Todo ctermfg=174 ctermbg=NONE hi NixCode ctermfg=148 -- cgit v1.2.3 From fbf7b22971eeed8683326388bd9fc5bd9d361b2a Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 23 Oct 2018 15:32:38 +0200 Subject: l git: add go & newsbot-js --- lass/2configs/git.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 253c56e48..c5b5c01fb 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -50,14 +50,30 @@ let cgit.desc = "take a description of your disk layout and produce a format script"; cgit.section = "software"; }; + go = { + cgit.desc = "url shortener"; + cgit.section = "software"; + }; krebspage = { cgit.desc = "homepage of krebs"; cgit.section = "configuration"; }; + krops = { + cgit.desc = "krebs deployment"; + cgit.section = "software"; + }; news = { cgit.desc = "take a rss feed and a timeout and print it to stdout"; cgit.section = "software"; }; + newsbot-js = { + cgit.desc = "print rss feeds to irc channels"; + cgit.section = "software"; + }; + nix-user-chroot = { + cgit.desc = "Fork of nix-user-chroot by lethalman"; + cgit.section = "software"; + }; nix-writers = { cgit.desc = "high level writers for nix"; cgit.section = "software"; @@ -85,14 +101,6 @@ let cgit.desc = "Good Music collection + tools"; cgit.section = "art"; }; - nix-user-chroot = { - cgit.desc = "Fork of nix-user-chroot by lethalman"; - cgit.section = "software"; - }; - krops = { - cgit.desc = "krebs deployment"; - cgit.section = "software"; - }; xmonad-stockholm = { cgit.desc = "krebs xmonad modules"; cgit.section = "configuration"; -- cgit v1.2.3 From fbf45bca1f13696019386144d5796cca80bb0351 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 23 Oct 2018 15:43:39 +0200 Subject: l mail: add notmuch to pkgs --- lass/2configs/mail.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 9246abfed..e50689254 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -210,6 +210,7 @@ in { environment.systemPackages = [ msmtp mutt + pkgs.notmuch pkgs.much tag-new-mails tag-old-mails -- cgit v1.2.3 From 9aaa04783aa3eb339822f2fe80353758fa433ff9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 23 Oct 2018 15:43:58 +0200 Subject: l urxvt: fix saveLines --- lass/2configs/urxvt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix index fa63ddf25..82f3fb2e6 100644 --- a/lass/2configs/urxvt.nix +++ b/lass/2configs/urxvt.nix @@ -5,7 +5,7 @@ with import ; services.urxvtd.enable = true; krebs.xresources.resources.urxvt = '' - URxvt*SaveLines: 1000000 + URxvt.saveLines: 100000 URxvt*scrollBar: false URxvt*urgentOnBell: true URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select -- cgit v1.2.3 From 55439da05492618e190d7fad361fd550c50619e8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 23 Oct 2018 15:44:33 +0200 Subject: l websites domsen: ensure databases & users exist --- lass/2configs/websites/domsen.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lass/2configs') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index e1c1313ea..828cab95f 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -66,6 +66,12 @@ in { ]) ]; + services.mysql.ensureDatabases = [ "ubikmedia_de" "o_ubikmedia_de" ]; + services.mysql.ensureUsers = [ + { ensurePermissions = { "ubikmedia_de.*" = "ALL"; }; name = "nginx"; } + { ensurePermissions = { "o_ubikmedia_de.*" = "ALL"; }; name = "nginx"; } + ]; + services.nginx.virtualHosts."ubikmedia.de".locations."/piwika".extraConfig = '' try_files $uri $uri/ /index.php?$args; ''; -- cgit v1.2.3 From 153648682697aafe89ef7eb69805ae8e6a25bc39 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 23 Oct 2018 15:45:09 +0200 Subject: l websites lassulus: add lass-mors to auhtorized keys --- lass/2configs/websites/lassulus.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 4c29831a2..b72b20928 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -145,8 +145,9 @@ in { home = "/srv/http/lassul.us"; useDefaultShell = true; createHome = true; - openssh.authorizedKeys.keys = [ - config.krebs.users.lass.pubkey + openssh.authorizedKeys.keys = with config.krebs.users; [ + lass.pubkey + lass-mors.pubkey ]; }; } -- cgit v1.2.3 From 5297f29d422aebc10727c929126d54f4aee8daee Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Nov 2018 19:13:46 +0100 Subject: l baseX: remove broken pkgs.push --- lass/2configs/baseX.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index e8a2539f3..9b44e8f0e 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -74,7 +74,6 @@ in { nmap pavucontrol powertop - push rxvt_unicode_with-plugins sxiv taskwarrior -- cgit v1.2.3