From 2a03084240be70f186abe731d4e22ba1a0464154 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Aug 2017 23:32:27 +0200 Subject: l newsbot-js: sort feeds --- lass/2configs/newsbot-js.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'lass') diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix index 9983fd56..5e028a3f 100644 --- a/lass/2configs/newsbot-js.nix +++ b/lass/2configs/newsbot-js.nix @@ -15,7 +15,6 @@ let bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news #bundestag bdt_pressemitteilungen|http://www.bundestag.de/blueprint/servlet/service/de/273112/asFeed/index.rss|#news bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news #financial - c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news cancer|http://feeds.feedburner.com/ncinewsreleases?format=xml|#news carta|http://feeds2.feedburner.com/carta-standard-rss|#news catholic_news|http://feeds.feedburner.com/catholicnewsagency/dailynews|#news @@ -27,7 +26,11 @@ let ccc|http://www.ccc.de/rss/updates.rdf|#news chan_b|https://boards.4chan.org/b/index.rss|#brainfuck chan_biz|https://boards.4chan.org/biz/index.rss|#news #brainfuck + chan_g|https://boards.4chan.org/g/index.rss|#news chan_int|https://boards.4chan.org/int/index.rss|#news #brainfuck + chan_sci|https://boards.4chan.org/sci/index.rss|#news + chan_x|https://boards.4chan.org/x/index.rss|#news + c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news cryptogon|http://www.cryptogon.com/?feed=rss2|#news csm|http://rss.csmonitor.com/feeds/csm|#news csm_world|http://rss.csmonitor.com/feeds/world|#news @@ -61,6 +64,7 @@ let greenpeace|http://feeds.feedburner.com/GreenpeaceNews|#news guardian_uk|http://feeds.theguardian.com/theguardian/uk-news/rss|#news gulli|http://ticker.gulli.com/rss/|#news + hackernews|https://news.ycombinator.com/rss|#news handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial heise|https://www.heise.de/newsticker/heise-atom.xml|#news hindu_business|http://www.thehindubusinessline.com/?service=rss|#news #financial @@ -100,7 +104,12 @@ let reddit_4chan|http://www.reddit.com/r/4chan/new/.rss|#news #brainfuck reddit_anticonsum|http://www.reddit.com/r/Anticonsumption/new/.rss|#news reddit_btc|http://www.reddit.com/r/Bitcoin/new/.rss|#news #financial + reddit_consp|http://reddit.com/r/conspiracy/.rss|#news + reddit_haskell|http://www.reddit.com/r/haskell/.rss|#news + reddit_nix|http://www.reddit.com/r/nixos/.rss|#news reddit_prog|http://www.reddit.com/r/programming/new/.rss|#news + reddit_sci|http://www.reddit.com/r/science/.rss|#news + reddit_tech|http://www.reddit.com/r/technology/.rss|#news reddit_tpp|http://www.reddit.com/r/twitchplayspokemon/.rss|#news #tpp reddit_world|http://www.reddit.com/r/worldnews/.rss|#news r-ethereum|http://www.reddit.com/r/ethereum/.rss|#news @@ -156,16 +165,6 @@ let wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#news xkcd|https://xkcd.com/rss.xml|#news zdnet|http://www.zdnet.com/news/rss.xml|#news - - chan_g|https://boards.4chan.org/g/index.rss|#news - chan_x|https://boards.4chan.org/x/index.rss|#news - chan_sci|https://boards.4chan.org/sci/index.rss|#news - reddit_consp|http://reddit.com/r/conspiracy/.rss|#news - reddit_sci|http://www.reddit.com/r/science/.rss|#news - reddit_tech|http://www.reddit.com/r/technology/.rss|#news - reddit_nix|http://www.reddit.com/r/nixos/.rss|#news - reddit_haskell|http://www.reddit.com/r/haskell/.rss|#news - hackernews|https://news.ycombinator.com/rss|#news ''; in { environment.systemPackages = [ -- cgit v1.2.3 From 22b94883629dd81d87c61695a3d54edd62458af2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Aug 2017 23:34:53 +0200 Subject: l mors.r: remove thunderbird --- lass/1systems/mors/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 2cb6a751..5bc52d63 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -139,7 +139,6 @@ with import ; urban mk_sql_pair remmina - thunderbird iodine -- cgit v1.2.3 From 82a01f5e7abc1009ee406f4a48e2a9d7794e50ae Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Aug 2017 23:37:40 +0200 Subject: l: add radio@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 728e265f..611e1b9d 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -40,6 +40,7 @@ with import ; { from = "patreon@lassul.us"; to = lass.mail; } { from = "steam@lassul.us"; to = lass.mail; } { from = "securityfocus@lassul.us"; to = lass.mail; } + { from = "radio@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From c4940d5926bcd2e938b914568161f63125926369 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 11:36:34 +0200 Subject: l prism.r: add container for kaepsele --- lass/1systems/prism/config.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 5d05ae39..744bae55 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -298,6 +298,22 @@ in { localAddress = "10.233.2.2"; }; } + { + #kaepsele + containers.kaepsele = { + config = { ... }: { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = with config.krebs.users; [ + lass.pubkey + tv.pubkey + ]; + }; + enableTun = true; + privateNetwork = true; + hostAddress = "10.233.2.3"; + localAddress = "10.233.2.4"; + }; + } ]; krebs.build.host = config.krebs.hosts.prism; -- cgit v1.2.3 From 619af589d108040a78e753040a857bc58b51e78e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 11:37:58 +0200 Subject: l iso: set networkingHostname --- lass/1systems/iso.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 0b048a2b..be064bed 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -37,6 +37,7 @@ with import ; }; }; boot.kernelParams = [ "copytoram" ]; + networking.hostName = "lass-iso"; } { krebs.enable = true; -- cgit v1.2.3 From f328ae8948d0f6c7070803adbf036872e1667ff4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 11:38:26 +0200 Subject: l ircd: remove obsolete netword description --- lass/2configs/ircd.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix index b72e2b08..ee4c0216 100644 --- a/lass/2configs/ircd.nix +++ b/lass/2configs/ircd.nix @@ -13,7 +13,6 @@ sid = "1as"; description = "miep!"; network_name = "irc.retiolum"; - network_desc = "Retiolum IRC Network"; hub = yes; vhost = "0.0.0.0"; -- cgit v1.2.3 From f8c0bcf1e9e4d4dd660e6fe82017e28dbbfd6024 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 11:38:45 +0200 Subject: l mail: show unread first --- lass/2configs/mail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index ee0c3f93..9f9bb24f 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -72,13 +72,13 @@ let ''} %r |" virtual-mailboxes \ + "Unread" "notmuch://?query=tag:unread"\ "INBOX" "notmuch://?query=tag:inbox \ and NOT tag:killed \ and NOT to:shackspace \ and NOT to:c-base \ and NOT from:security-alert@hpe.com \ and NOT to:nix-devel"\ - "Unread" "notmuch://?query=tag:unread"\ "shack" "notmuch://?query=to:shackspace"\ "c-base" "notmuch://?query=to:c-base"\ "security" "notmuch://?query=to:securityfocus or from:security-alert@hpe.com"\ -- cgit v1.2.3 From 445d4f74c225dcc44846488e4d30c0b8e4e52bd9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Aug 2017 13:35:30 +0200 Subject: l skynet.r: don't suspend on lid close --- lass/1systems/skynet/config.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass') diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix index b707f438..0b949998 100644 --- a/lass/1systems/skynet/config.nix +++ b/lass/1systems/skynet/config.nix @@ -44,6 +44,10 @@ with import ; krebs.build.host = config.krebs.hosts.skynet; + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; + #fileSystems = { # "/bku" = { # device = "/dev/mapper/pool-bku"; -- cgit v1.2.3 From a70fc9b95abf47aca54d39076529b3718adeb7cc Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:36:04 +0200 Subject: l: mors <-> daedalus --- lass/1systems/daedalus/config.nix | 6 +++--- lass/1systems/mors/config.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lass') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 290d8a78..72a45a3d 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -4,7 +4,7 @@ imports = [ - + @@ -29,7 +29,7 @@ }; services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0" - SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0" + SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0" ''; } diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 5bc52d63..bb6f84c7 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -5,7 +5,7 @@ with import ; imports = [ - + @@ -104,8 +104,8 @@ with import ; }; services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0" - SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0" + SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0" ''; #TODO activationScripts seem broken, fix them! -- cgit v1.2.3 From 51cb5bb1f10aaf68499f6fbe53923959d35f039b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:37:57 +0200 Subject: l daedalus.r: add kde desktop --- lass/1systems/daedalus/config.nix | 68 ++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 8 deletions(-) (limited to 'lass') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 72a45a3d..36daea1d 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -1,3 +1,4 @@ +with import ; { config, pkgs, ... }: { @@ -6,18 +7,69 @@ - - - - - - - - + { + # bubsy config + users.users.bubsy = { + uid = genid "bubsy"; + home = "/home/bubsy"; + group = "users"; + createHome = true; + extraGroups = [ + "audio" + "networkmanager" + ]; + useDefaultShell = true; + }; + networking.networkmanager.enable = true; + networking.wireless.enable = mkForce false; + hardware.pulseaudio = { + enable = true; + systemWide = true; + }; + environment.systemPackages = with pkgs; [ + pavucontrol + firefox + hexchat + networkmanagerapplet + ]; + services.xserver.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + } + { + krebs.per-user.bitcoin.packages = [ + pkgs.electrum + ]; + users.extraUsers = { + bitcoin = { + name = "bitcoin"; + description = "user for bitcoin stuff"; + home = "/home/bitcoin"; + useDefaultShell = true; + createHome = true; + }; + }; + security.sudo.extraConfig = '' + bubsy ALL=(bitcoin) NOPASSWD: ALL + ''; + } ]; + time.timeZone = "Europe/Berlin"; + + hardware.trackpoint = { + enable = true; + sensitivity = 220; + speed = 0; + emulateWheel = true; + }; + + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; + krebs.build.host = config.krebs.hosts.daedalus; fileSystems = { -- cgit v1.2.3 From bbc966fc7bcee828af7c0023ca3c6e63c625174f Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:40:29 +0200 Subject: l git: allow hooks to be set individually --- lass/2configs/git.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index d3f5d1f3..eb606037 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -80,7 +80,7 @@ let public = true; }; - make-restricted-repo = name: { collaborators ? [], announce ? false, ... }: { + make-restricted-repo = name: { collaborators ? [], announce ? false, hooks ? {}, ... }: { inherit collaborators name; public = false; hooks = optionalAttrs announce { @@ -93,7 +93,7 @@ let # TODO define branches in some kind of option per repo branches = [ "master" "staging*" ]; }; - }; + } // hooks; }; make-rules = -- cgit v1.2.3 From 2306996b10e1a750cc098e07ed7f21f6990bc24b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:49:29 +0200 Subject: l pkgs.xmonad: bind brainmenu to M-o --- lass/5pkgs/xmonad-lass.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index 22ec7efa..38a9550d 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -98,6 +98,7 @@ myKeyMap = [ ("M4-", spawn "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f") , ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png") , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type") + , ("M4-o", spawn "${pkgs.brain}/bin/brainmenu --type") , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ +4%") , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ -4%") , ("", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -time 0 -dec 1%") -- cgit v1.2.3 From 6a9e241df642e5b6b21d264719c52b29d577ff42 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Aug 2017 12:57:36 +0200 Subject: l baseX: add gi to pkgs --- lass/2configs/baseX.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 86d0ac7c..3a99e65a 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -48,6 +48,7 @@ in { acpi dic dmenu + gi gitAndTools.qgit lm_sensors haskellPackages.hledger -- cgit v1.2.3