From 4aa2f9de3d40020c2e93efa942c76c4416d79fb0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 17 Oct 2015 20:11:00 +0200 Subject: l 2 desktop-base: add push pkg --- lass/2configs/desktop-base.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index 4e693997d..27aadb590 100644 --- a/lass/2configs/desktop-base.nix +++ b/lass/2configs/desktop-base.nix @@ -30,6 +30,7 @@ in { powertop sxiv much + push #window manager stuff haskellPackages.xmobar -- cgit v1.2.3 From b5316b0458f30fb38600fba2ca74bdd16ac7dce6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 18 Oct 2015 04:24:39 +0200 Subject: lass 2 os-templatex: add cac centos 6.5 template --- .../2configs/os-templates/CAC-CentOS-6.5-64bit.nix | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lass/2configs/os-templates/CAC-CentOS-6.5-64bit.nix (limited to 'lass/2configs') diff --git a/lass/2configs/os-templates/CAC-CentOS-6.5-64bit.nix b/lass/2configs/os-templates/CAC-CentOS-6.5-64bit.nix new file mode 100644 index 000000000..b5ec722a0 --- /dev/null +++ b/lass/2configs/os-templates/CAC-CentOS-6.5-64bit.nix @@ -0,0 +1,47 @@ +_: + +{ + boot.loader.grub = { + device = "/dev/sda"; + splashImage = null; + }; + + boot.initrd.availableKernelModules = [ + "ata_piix" + "vmw_pvscsi" + ]; + + fileSystems."/" = { + device = "/dev/VolGroup/lv_root"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; + + swapDevices = [ + { device = "/dev/VolGroup/lv_swap"; } + ]; + + users.extraGroups = { + # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories + # Loaded: loaded (/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/example/systemd/system/systemd-tmpfiles-setup.service) + # Active: failed (Result: exit-code) since Mon 2015-03-16 10:29:18 UTC; 4s ago + # Docs: man:tmpfiles.d(5) + # man:systemd-tmpfiles(8) + # Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE) + # Main PID: 19272 (code=exited, status=1/FAILURE) + # + # Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'. + # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring. + # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring. + # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service: main process exited, code=exited, status=1/FAILURE + # Mar 16 10:29:18 cd systemd[1]: Failed to start Create Volatile Files and Directories. + # Mar 16 10:29:18 cd systemd[1]: Unit systemd-tmpfiles-setup.service entered failed state. + # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service failed. + # warning: error(s) occured while switching to the new configuration + lock.gid = 10001; + }; +} -- cgit v1.2.3 From 21b4d9ac2e14315a2c83ea9a2331dfe4baf3a913 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 13:01:07 +0200 Subject: lass: remove obsolete sshkeys.nix --- lass/2configs/sshkeys.nix | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 lass/2configs/sshkeys.nix (limited to 'lass/2configs') diff --git a/lass/2configs/sshkeys.nix b/lass/2configs/sshkeys.nix deleted file mode 100644 index f6081cf37..000000000 --- a/lass/2configs/sshkeys.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: - -{ - imports = [ - ../3modules/sshkeys.nix - ]; - - config.sshKeys.lass.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors"; - - config.sshKeys.uriel.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDExWuRcltGM2FqXO695nm6/QY3wU3r1bDTyCpMrLfUSym7TxcXDSmZSWcueexPXV6GENuUfjJPZswOdWqIo5u2AXw9t0aGvwEDmI6uJ7K5nzQOsXIneGMdYuoOaAzWI8pxZ4N+lIP1HsOYttIPDp8RwU6kyG+Ud8mnVHWSTO13C7xC9vePnDP6b+44nHS691Zj3X/Cq35Ls0ISC3EM17jreucdP62L3TKk2R4NCm3Sjqj+OYEv0LAqIpgqSw5FypTYQgNByxRcIcNDlri63Q1yVftUP1338UiUfxtraUu6cqa2CdsHQmtX5mTNWEluVWO3uUKTz9zla3rShC+d3qvr lass@uriel"; -} -- cgit v1.2.3 From 3384165fcf31d0afa2e47b784b409ec6345f1ebc Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 13:31:06 +0200 Subject: l: import urxvt in desktop-base.nix --- lass/2configs/desktop-base.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index 27aadb590..1f5c3de55 100644 --- a/lass/2configs/desktop-base.nix +++ b/lass/2configs/desktop-base.nix @@ -5,6 +5,7 @@ let in { imports = [ ./base.nix + ./urxvt.nix ]; time.timeZone = "Europe/Berlin"; -- cgit v1.2.3 From c52c48366eae0b06aa51a3f6d2cc85b34ba680c9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 13:57:42 +0200 Subject: l 2: rename desktop-base.nix to baseX.nix --- lass/2configs/baseX.nix | 72 ++++++++++++++++++++++++++++++++++++++++++ lass/2configs/desktop-base.nix | 72 ------------------------------------------ 2 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 lass/2configs/baseX.nix delete mode 100644 lass/2configs/desktop-base.nix (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix new file mode 100644 index 000000000..1f5c3de55 --- /dev/null +++ b/lass/2configs/baseX.nix @@ -0,0 +1,72 @@ +{ config, pkgs, ... }: + +let + mainUser = config.users.extraUsers.mainUser; +in { + imports = [ + ./base.nix + ./urxvt.nix + ]; + + time.timeZone = "Europe/Berlin"; + + virtualisation.libvirtd.enable = true; + + hardware.pulseaudio = { + enable = true; + systemWide = true; + }; + + programs.ssh.startAgent = false; + + security.setuidPrograms = [ "slock" ]; + + services.printing = { + enable = true; + drivers = [ pkgs.foomatic_filters ]; + }; + + environment.systemPackages = with pkgs; [ + + powertop + sxiv + much + push + + #window manager stuff + haskellPackages.xmobar + haskellPackages.yeganesh + dmenu2 + xlibs.fontschumachermisc + ]; + + fonts.fonts = [ + pkgs.xlibs.fontschumachermisc + ]; + + services.xserver = { + enable = true; + + windowManager.xmonad.extraPackages = hspkgs: with hspkgs; [ + X11-xshape + ]; + windowManager.xmonad.enable = true; + windowManager.xmonad.enableContribAndExtras = true; + windowManager.default = "xmonad"; + desktopManager.default = "none"; + desktopManager.xterm.enable = false; + displayManager.slim.enable = true; + displayManager.auto.enable = true; + displayManager.auto.user = mainUser.name; + + layout = "us"; + xkbModel = "evdev"; + xkbVariant = "altgr-intl"; + xkbOptions = "caps:backspace"; + }; + + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; + +} diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix deleted file mode 100644 index 1f5c3de55..000000000 --- a/lass/2configs/desktop-base.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ config, pkgs, ... }: - -let - mainUser = config.users.extraUsers.mainUser; -in { - imports = [ - ./base.nix - ./urxvt.nix - ]; - - time.timeZone = "Europe/Berlin"; - - virtualisation.libvirtd.enable = true; - - hardware.pulseaudio = { - enable = true; - systemWide = true; - }; - - programs.ssh.startAgent = false; - - security.setuidPrograms = [ "slock" ]; - - services.printing = { - enable = true; - drivers = [ pkgs.foomatic_filters ]; - }; - - environment.systemPackages = with pkgs; [ - - powertop - sxiv - much - push - - #window manager stuff - haskellPackages.xmobar - haskellPackages.yeganesh - dmenu2 - xlibs.fontschumachermisc - ]; - - fonts.fonts = [ - pkgs.xlibs.fontschumachermisc - ]; - - services.xserver = { - enable = true; - - windowManager.xmonad.extraPackages = hspkgs: with hspkgs; [ - X11-xshape - ]; - windowManager.xmonad.enable = true; - windowManager.xmonad.enableContribAndExtras = true; - windowManager.default = "xmonad"; - desktopManager.default = "none"; - desktopManager.xterm.enable = false; - displayManager.slim.enable = true; - displayManager.auto.enable = true; - displayManager.auto.user = mainUser.name; - - layout = "us"; - xkbModel = "evdev"; - xkbVariant = "altgr-intl"; - xkbOptions = "caps:backspace"; - }; - - services.logind.extraConfig = '' - HandleLidSwitch=ignore - ''; - -} -- cgit v1.2.3 From 1d4f2bf01131d90e370bb8da2d5023aeaacf0b1d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 14:00:15 +0200 Subject: l: move more config to base.nix --- lass/2configs/base.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index f313054d9..2e42f86ae 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -38,14 +38,28 @@ with lib; } ]; + networking.hostName = config.krebs.build.host.name; + nix.maxJobs = config.krebs.build.host.cores; + krebs = { enable = true; search-domain = "retiolum"; exim-retiolum.enable = true; - build.source = { - git.nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da"; + build = { + user = config.krebs.users.lass; + source = { + git.nixpkgs = { + url = https://github.com/Lassulus/nixpkgs; + rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da"; + }; + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; + }; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/stockholm"; + }; }; }; }; -- cgit v1.2.3 From 517e6e00097f4f9ebb1f7bd784d2bb44dce5f4b8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 14:03:08 +0200 Subject: l 2 base: remove old code --- lass/2configs/base.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 2e42f86ae..902fcb70b 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -137,12 +137,6 @@ with lib; "sendmail" ]; - #services.gitolite = { - # enable = true; - # dataDir = "/home/gitolite"; - # adminPubkey = config.sshKeys.lass.pub; - #}; - services.openssh = { enable = true; hostKeys = [ -- cgit v1.2.3 From 34eb9a67a26ee847891d3c2a4d0172519da3e2fc Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 14:03:50 +0200 Subject: l 2: add newsbot-js.nix --- lass/2configs/newsbot-js.nix | 202 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 lass/2configs/newsbot-js.nix (limited to 'lass/2configs') diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix new file mode 100644 index 000000000..211b29780 --- /dev/null +++ b/lass/2configs/newsbot-js.nix @@ -0,0 +1,202 @@ +{ config, pkgs, ... }: + +let + newsfile = pkgs.writeText "feeds" '' + aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#news + aktuelle_themen|http://bundestag.de/service/rss/Bundestag_Aktuelle_Themen.rss|#news #bundestag + allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#news + anon|http://anoninsiders.net/feed/|#news + antirez|http://antirez.com/rss|#news + arbor|http://feeds2.feedburner.com/asert/|#news + archlinux|http://www.archlinux.org/feeds/news/|#news + ars|http://feeds.arstechnica.com/arstechnica/index?format=xml|#news + asiaone_asia|http://news.asiaone.com/rss/asia|#news + asiaone_business|http://business.asiaone.com/rss.xml|#news + asiaone_sci|http://news.asiaone.com/rss/science-and-tech|#news + asiaone_world|http://news.asiaone.com/rss/world|#news + augustl|http://augustl.com/atom.xml|#news + bbc|http://feeds.bbci.co.uk/news/rss.xml|#news + bdt_drucksachen|http://www.bundestag.de/dip21rss/bundestag_drucksachen.rss|#news #bundestag + bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news #bundestag + bdt_pressemitteilungen|http://bundestag.de/service/rss/Bundestag_Presse.rss|#news #bundestag + bdt_wd|http://bundestag.de/service/rss/Bundestag_WD.rss|#news #bundestag + bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news #financial + 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 + cbc_busi|http://rss.cbc.ca/lineup/business.xml|#news + cbc_offbeat|http://www.cbc.ca/cmlink/rss-offbeat|#news + cbc_pol|http://rss.cbc.ca/lineup/politics.xml|#news + cbc_tech|http://rss.cbc.ca/lineup/technology.xml|#news + cbc_top|http://rss.cbc.ca/lineup/topstories.xml|#news + 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_int|https://boards.4chan.org/int/index.rss|#news #brainfuck + cna|http://www.channelnewsasia.com/starterkit/servlet/cna/rss/home.xml|#news + coinspotting|http://coinspotting.com/rss|#news #financial + cryptanalysis|https://cryptanalys.is/rss.php|#news + cryptocoinsnews|http://www.cryptocoinsnews.com/feed/|#news #financial + 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 + cyberguerrilla|https://www.cyberguerrilla.org/a/2012/?feed=rss2|#news + danisch|http://www.danisch.de/blog/feed/|#news + dod|http://www.defense.gov/news/afps2.xml|#news + dwn|http://deutsche-wirtschafts-nachrichten.de/feed/customfeed/|#news + ecat|http://ecat.com/feed|#news + eia_press|http://www.eia.gov/rss/press_rss.xml|#news + eia_today|http://www.eia.gov/rss/todayinenergy.xml|#news + embargowatch|https://embargowatch.wordpress.com/feed/|#news + ethereum-comments|http://blog.ethereum.org/comments/feed|#news + ethereum|http://blog.ethereum.org/feed|#news + europa_ric|http://ec.europa.eu/research/infocentre/rss/infocentre-rss.xml|#news + eu_survei|http://www.eurosurveillance.org/public/RSSFeed/RSS.aspx|#news + exploitdb|http://www.exploit-db.com/rss.xml|#news + fars|http://www.farsnews.com/rss.php|#news #test + faz_feui|http://www.faz.net/rss/aktuell/feuilleton/|#news + faz_politik|http://www.faz.net/rss/aktuell/politik/|#news + faz_wirtschaft|http://www.faz.net/rss/aktuell/wirtschaft/|#news #financial + fbi|http://www.fbi.gov/homepage/RSS|#news #bullerei + fbi_news|http://www.fbi.gov/news/news_blog/rss.xml|#news + fbi_press|http://www.fbi.gov/news/current/rss.xml|#news #bullerei + fbi_stories|http://www.fbi.gov/news/stories/all-stories/rss.xml|#news #bullerei + fedreserve|http://www.federalreserve.gov/feeds/press_all.xml|#news #financial + fefe|http://blog.fefe.de/rss.xml|#news + forbes|http://www.forbes.com/forbes/feed2/|#news + forbes_realtime|http://www.forbes.com/real-time/feed2/|#news + fox|http://feeds.foxnews.com/foxnews/latest|#news + geheimorganisation|http://geheimorganisation.org/feed/|#news + GerForPol|http://www.german-foreign-policy.com/de/news/rss-2.0|#news + gmanet|http://www.gmanetwork.com/news/rss/news|#news + golem|http://www.golem.de/rss.php?feed=RSS1.0|#news + google|http://news.google.com/?output=rss|#news + 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 + handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial + heise|http://heise.de.feedsportal.com/c/35207/f/653902/index.rss|#news + hindu_business|http://www.thehindubusinessline.com/?service=rss|#news #financial + hindu|http://www.thehindu.com/?service=rss|#news + hintergrund|http://www.hintergrund.de/index.php?option=com_bca-rss-syndicator&feed_id=8|#news + ign|http://feeds.ign.com/ign/all|#news + independent|http://www.independent.com/rss/headlines/|#news + indymedia|http://de.indymedia.org/RSS/newswire.xml|#news + info_libera|http://www.informationliberation.com/rss.xml|#news + klagen-gegen-rundfuckbeitrag|http://klagen-gegen-rundfunkbeitrag.blogspot.com/feeds/posts/default|#news + korea_herald|http://www.koreaherald.com/rss_xml.php|#news + linuxinsider|http://www.linuxinsider.com/perl/syndication/rssfull.pl|#news + lisp|http://planet.lisp.org/rss20.xml|#news + liveleak|http://www.liveleak.com/rss|#news + lolmythesis|http://lolmythesis.com/rss|#news + LtU|http://lambda-the-ultimate.org/rss.xml|#news + lukepalmer|http://lukepalmer.wordpress.com/feed/|#news + mit|http://web.mit.edu/newsoffice/rss-feeds.feed?type=rss|#news + mongrel2_master|https://github.com/zedshaw/mongrel2/commits/master.atom|#news + nds|http://www.nachdenkseiten.de/?feed=atom|#news + netzpolitik|https://netzpolitik.org/feed/|#news + newsbtc|http://newsbtc.com/feed/|#news #financial + nnewsg|http://www.net-news-global.net/rss/rssfeed.xml|#news + npr_busi|http://www.npr.org/rss/rss.php?id=1006|#news + npr_headlines|http://www.npr.org/rss/rss.php?id=1001|#news + npr_pol|http://www.npr.org/rss/rss.php?id=1012|#news + npr_world|http://www.npr.org/rss/rss.php?id=1004|#news + nsa|http://www.nsa.gov/rss.shtml|#news #bullerei + nytimes|http://rss.nytimes.com/services/xml/rss/nyt/World.xml|#news + painload|https://github.com/krebscode/painload/commits/master.atom|#news + phys|http://phys.org/rss-feed/|#news + piraten|https://www.piratenpartei.de/feed/|#news + polizei_berlin|http://www.berlin.de/polizei/presse-fahndung/_rss_presse.xml|#news #bullerei + presse_polizei|http://www.presseportal.de/rss/polizei.rss2|#news #bullerei + presseportal|http://www.presseportal.de/rss/presseportal.rss2|#news + prisonplanet|http://prisonplanet.com/feed.rss|#news + proofmarket|https://proofmarket.org/feed_problem|#news + rawstory|http://www.rawstory.com/rs/feed/|#news + 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_prog|http://www.reddit.com/r/programming/new/.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 + reuters|http://feeds.reuters.com/Reuters/worldNews|#news + reuters-odd|http://feeds.reuters.com/reuters/oddlyEnoughNews?format=xml|#news + rt|http://rt.com/rss/news/|#news + schallurauch|http://feeds.feedburner.com/SchallUndRauch|#news + sciencemag|http://news.sciencemag.org/rss/current.xml|#news + scmp|http://www.scmp.com/rss/91/feed|#news + sec-db|http://feeds.security-database.com/SecurityDatabaseToolsWatch|#news + shackspace|http://shackspace.de/?feed=rss2|#news + shz_news|http://www.shz.de/nachrichten/newsticker/rss|#news + sky_busi|http://news.sky.com/feeds/rss/business.xml|#news + sky_pol|http://news.sky.com/feeds/rss/politics.xml|#news + sky_strange|http://news.sky.com/feeds/rss/strange.xml|#news + sky_tech|http://news.sky.com/feeds/rss/technology.xml|#news + sky_world|http://news.sky.com/feeds/rss/world.xml|#news + slashdot|http://rss.slashdot.org/Slashdot/slashdot|#news + slate|http://feeds.slate.com/slate|#news + spiegel_eil|http://www.spiegel.de/schlagzeilen/eilmeldungen/index.rss|#news + spiegelfechter|http://feeds.feedburner.com/DerSpiegelfechter?format=xml|#news + spiegel_top|http://www.spiegel.de/schlagzeilen/tops/index.rss|#news + standardmedia_ke|http://www.standardmedia.co.ke/rss/headlines.php|#news + stern|http://www.stern.de/feed/standard/all/|#news + stz|http://www.stuttgarter-zeitung.de/rss/topthemen.rss.feed|#news + sz_politik|http://rss.sueddeutsche.de/rss/Politik|#news + sz_wirtschaft|http://rss.sueddeutsche.de/rss/Wirtschaft|#news #financial + sz_wissen|http://suche.sueddeutsche.de/rss/Wissen|#news + tagesschau|http://www.tagesschau.de/newsticker.rdf|#news + taz|http://taz.de/Themen-des-Tages/!p15;rss/|#news + telegraph_finance|http://www.telegraph.co.uk/finance/rss|#news #financial + telegraph_pol|http://www.telegraph.co.uk/news/politics/rss|#news + telegraph_uk|http://www.telegraph.co.uk/news/uknews/rss|#news + telegraph_world|http://www.telegraph.co.uk/news/worldnews/rss|#news + telepolis|http://www.heise.de/tp/rss/news-atom.xml|#news + the_insider|http://www.theinsider.org/rss/news/headlines-xml.asp|#news + tigsource|http://www.tigsource.com/feed/|#news + times|http://www.thetimes.co.uk/tto/news/rss|#news + tinc|http://tinc-vpn.org/news/index.rss|#news + topix_b|http://www.topix.com/rss/wire/de/berlin|#news + torr_bits|http://feeds.feedburner.com/TorrentfreakBits|#news + torrentfreak|http://feeds.feedburner.com/Torrentfreak|#news + torr_news|http://feed.torrentfreak.com/Torrentfreak/|#news + travel_warnings|http://feeds.travel.state.gov/ca/travelwarnings-alerts|#news + truther|http://truthernews.wordpress.com/feed/|#news + un_afr|http://www.un.org/apps/news/rss/rss_africa.asp|#news + un_am|http://www.un.org/apps/news/rss/rss_americas.asp|#news + un_eu|http://www.un.org/apps/news/rss/rss_europe.asp|#news + un_me|http://www.un.org/apps/news/rss/rss_mideast.asp|#news + un_pac|http://www.un.org/apps/news/rss/rss_asiapac.asp|#news + un_top|http://www.un.org/apps/news/rss/rss_top.asp|#news + us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#news + vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news + weechat|http://dev.weechat.org/feed/atom|#news + wired_sci|http://www.wired.com/category/science/feed/|#news + 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 { + imports = [ + ../3modules/newsbot-js.nix + ]; + environment.systemPackages = [ + pkgs.newsbot-js + ]; + lass.newsbot-js = { + enable = true; + ircServer = "localhost"; + feeds = newsfile; + urlShortenerHost = "go"; + urlShortenerPort = "80"; + }; +} -- cgit v1.2.3 From 8144b59c5786459619b4a06ecc150b6a96af014b Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 21 Oct 2015 01:34:05 +0200 Subject: l 2 base: nixpkgs b9270a2 -> 33bdc01 --- 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 902fcb70b..52501441a 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -50,7 +50,7 @@ with lib; source = { git.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da"; + rev = "33bdc011f5360288cd10b9fda90da2950442b2ab"; }; dir.secrets = { host = config.krebs.hosts.mors; -- cgit v1.2.3 From 8f7253184ac53792d125c6713b0757da58389b1e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 21 Oct 2015 01:34:27 +0200 Subject: l 2 base: add aria2 to base install --- 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 52501441a..6fa9c5b2d 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -96,6 +96,9 @@ with lib; #network iptables + + #stuff for dl + aria2 ]; programs.bash = { -- cgit v1.2.3