summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-08-28 22:53:17 +0200
committermakefu <github@syntax-fehler.de>2018-08-28 22:53:17 +0200
commit9c516e9504003cae2abed8a6e24f0b135ac98c4f (patch)
tree95c81a6f2cb9f47181608428b2234370c243eed9
parentc07f56b772f3ea58d2a4c0f504fe3df381f6a043 (diff)
parent413e0689acd4f6b322f9996950927ebd41d0e58c (diff)
Merge remote-tracking branch 'lass/master'
-rw-r--r--jeschli/1systems/bln/config.nix9
-rw-r--r--jeschli/1systems/brauerei/config.nix20
-rw-r--r--jeschli/1systems/brauerei/hardware-configuration.nix1
-rw-r--r--jeschli/2configs/emacs.nix21
-rw-r--r--jeschli/2configs/officevpn.nix19
-rw-r--r--jeschli/2configs/xserver/Xresources.nix4
-rw-r--r--krebs/1systems/hotdog/config.nix1
-rw-r--r--krebs/2configs/news-spam.nix4
-rw-r--r--krebs/2configs/repo-sync.nix144
-rw-r--r--krebs/3modules/lass/default.nix31
-rw-r--r--krebs/3modules/lass/ssh/android.rsa2
-rw-r--r--krebs/5pkgs/haskell/xmonad-stockholm.nix8
-rw-r--r--krebs/5pkgs/simple/Reaktor/plugins.nix2
-rw-r--r--krebs/krops.nix2
-rw-r--r--krebs/nixpkgs.json7
-rwxr-xr-xkrebs/update-channel.sh9
-rw-r--r--lass/1systems/daedalus/config.nix3
-rw-r--r--lass/1systems/helios/config.nix105
-rw-r--r--lass/1systems/helios/physical.nix64
-rw-r--r--lass/1systems/helios/source.nix4
-rw-r--r--lass/1systems/mors/config.nix1
-rw-r--r--lass/1systems/prism/config.nix5
-rw-r--r--lass/2configs/baseX.nix18
-rw-r--r--lass/2configs/blue.nix1
-rw-r--r--lass/2configs/browsers.nix3
-rw-r--r--lass/2configs/ciko.nix2
-rw-r--r--lass/2configs/dcso-dev.nix75
-rw-r--r--lass/2configs/exim-smarthost.nix3
-rw-r--r--lass/2configs/print.nix10
-rw-r--r--lass/2configs/urxvt.nix6
-rw-r--r--lass/2configs/websites/domsen.nix18
-rw-r--r--lass/3modules/xjail.nix2
-rw-r--r--lass/5pkgs/custom/xmonad-lass/default.nix4
-rw-r--r--lass/5pkgs/knav/default.nix26
-rw-r--r--lib/default.nix2
35 files changed, 255 insertions, 381 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 716b9c484..6e3c3bec8 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -9,6 +9,8 @@
<stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/xdg.nix>
<stockholm/jeschli/2configs/xserver>
+# <stockholm/jeschli/1systems/bln/dcso-vpn.nix>
+ <stockholm/jeschli/2configs/officevpn.nix>
];
# boot.loader.systemd-boot.enable = true;
@@ -94,6 +96,8 @@
vagrant
# document viewer
zathura
+
+ samba
];
@@ -161,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; }
+ ];
+
}
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 5a6ad7652..e200cbcd4 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" ''
@@ -47,6 +37,7 @@
exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"'
'';
};
+
environment.systemPackages = with pkgs; [
# system helper
ag
@@ -103,6 +94,7 @@
zathura
# xorg
xorg.xbacklight
+ taskwarrior
];
# Some programs need SUID wrappers, can be configured further or are
@@ -126,7 +118,7 @@
display = 11;
tty = 11;
- dpi = 96;
+ dpi = 144;
# videoDrivers = [ "nvidia" ];
synaptics = {
@@ -138,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 = {
diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix
index 75fdb89fd..2cb3e6661 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;
}
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 4c52432d3..3bd2dbfc4 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,28 +42,36 @@ 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)
(global-set-key "\C-x\ \C-r" 'recentf-open-files)
'';
dotEmacs = pkgs.writeText "dot-emacs" ''
+ ${evilMode}
${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} "$@"
diff --git a/jeschli/2configs/officevpn.nix b/jeschli/2configs/officevpn.nix
new file mode 100644
index 000000000..eb0477d51
--- /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
+}
+
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
index adf06ee63..ebe7159ff 100644
--- a/jeschli/2configs/xserver/Xresources.nix
+++ b/jeschli/2configs/xserver/Xresources.nix
@@ -5,7 +5,6 @@ with import <stockholm/lib>;
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
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 18b751a7e..0a848426c 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -15,6 +15,7 @@
<stockholm/krebs/2configs/ircd.nix>
<stockholm/krebs/2configs/reaktor-retiolum.nix>
<stockholm/krebs/2configs/reaktor-krebs.nix>
+ <stockholm/krebs/2configs/repo-sync.nix>
];
krebs.build.host = config.krebs.hosts.hotdog;
diff --git a/krebs/2configs/news-spam.nix b/krebs/2configs/news-spam.nix
index a3f39b40e..88b7e1072 100644
--- a/krebs/2configs/news-spam.nix
+++ b/krebs/2configs/news-spam.nix
@@ -7,7 +7,6 @@
[SPAM]aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#snews
[SPAM]allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#snews
[SPAM]antirez|http://antirez.com/rss|#snews
- [SPAM]arbor|http://feeds2.feedburner.com/asert/|#snews
[SPAM]archlinux|http://www.archlinux.org/feeds/news/|#snews
[SPAM]ars|http://feeds.arstechnica.com/arstechnica/index?format=xml|#snews
[SPAM]augustl|http://augustl.com/atom.xml|#snews
@@ -131,7 +130,6 @@
[SPAM]slashdot|http://rss.slashdot.org/Slashdot/slashdot|#snews
[SPAM]slate|http://feeds.slate.com/slate|#snews
[SPAM]spiegel_eil|http://www.spiegel.de/schlagzeilen/eilmeldungen/index.rss|#snews
- [SPAM]spiegelfechter|http://feeds.feedburner.com/DerSpiegelfechter?format=xml|#snews
[SPAM]spiegel_top|http://www.spiegel.de/schlagzeilen/tops/index.rss|#snews
[SPAM]standardmedia_ke|http://www.standardmedia.co.ke/rss/headlines.php|#snews
[SPAM]stern|http://www.stern.de/feed/standard/all/|#snews
@@ -146,7 +144,6 @@
[SPAM]the_insider|http://www.theinsider.org/rss/news/headlines-xml.asp|#snews
[SPAM]tigsource|http://www.tigsource.com/feed/|#snews
[SPAM]tinc|http://tinc-vpn.org/news/index.rss|#snews
- [SPAM]topix_b|http://www.topix.com/rss/wire/de/berlin|#snews
[SPAM]torr_bits|http://feeds.feedburner.com/TorrentfreakBits|#snews
[SPAM]torrentfreak|http://feeds.feedburner.com/Torrentfreak|#snews
[SPAM]torr_news|http://feed.torrentfreak.com/Torrentfreak/|#snews
@@ -160,7 +157,6 @@
[SPAM]us_math_society|http://www.ams.org/cgi-bin/content/news_items.cgi?rss=1|#snews
[SPAM]vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#snews
[SPAM]weechat|http://dev.weechat.org/feed/atom|#snews
- [SPAM]wp_world|http://feeds.washingtonpost.com/rss/rss_blogpost|#snews
[SPAM]xkcd|https://xkcd.com/rss.xml|#snews
[SPAM]zdnet|http://www.zdnet.com/news/rss.xml|#snews
'';
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 48da88a8d..7c3b2c90e 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -5,76 +5,156 @@ with import <stockholm/lib>;
let
mirror = "git@${config.networking.hostName}:";
- defineRepo = name: announce: let
+ defineRepo = {
+ name, desc, section
+ }:
+ let
repo = {
public = true;
name = mkDefault "${name}";
- cgit.desc = mkDefault "mirror for ${name}";
- cgit.section = mkDefault "mirror";
- hooks = mkIf announce (mkDefault {
+ cgit.desc = desc;
+ cgit.section = section;
+ hooks = mkDefault {
post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName;
verbose = false;
channel = "#xxx";
server = "irc.r";
- branches = [ "master" ];
+ branches = [ "newest" ];
};
- });
+ };
};
in {
- rules = with git; singleton {
- user = with config.krebs.users; [
- config.krebs.users."${config.networking.hostName}-repo-sync"
- ];
- repo = [ repo ];
- perm = push ''refs/*'' [ non-fast-forward create delete merge ];
- };
+ rules = with git; [
+ {
+ user = with config.krebs.users; [
+ config.krebs.users."${config.networking.hostName}-repo-sync"
+ jeschli
+ lass
+ makefu
+ tv
+ ];
+ repo = [ repo ];
+ perm = push ''refs/*'' [ non-fast-forward create delete merge ];
+ }
+ {
+ user = attrValues config.krebs.users;
+ repo = [ repo ];
+ perm = fetch;
+ }
+ ];
repos."${name}" = repo;
};
- sync-retiolum = name:
+ sync-retiolum = {
+ name,
+ desc ? "mirror for ${name}",
+ section ? "mirror"
+ }:
{
krebs.repo-sync.repos.${name} = {
branches = {
- makefu = {
- origin.url = "http://cgit.gum/${name}";
+ lassulus = {
+ origin.url = "http://cgit.lassul.us/${name}";
mirror.url = "${mirror}${name}";
};
- tv = {
- origin.url = "http://cgit.ni.r/${name}";
+ makefu = {
+ origin.url = "http://cgit.gum/${name}";
mirror.url = "${mirror}${name}";
};
nin = {
origin.url = "http://cgit.onondaga.r/${name}";
mirror.url = "${mirror}${name}";
};
- lassulus = {
- origin.url = "http://cgit.lassul.us/${name}";
+ tv = {
+ origin.url = "http://cgit.ni.r/${name}";
mirror.url = "${mirror}${name}";
};
};
latest = {
url = "${mirror}${name}";
- ref = "heads/master";
+ ref = "heads/newest";
};
};
- krebs.git = defineRepo name false;
+ krebs.git = defineRepo { inherit name desc section; };
+ };
+
+ sync-remote = {
+ name,
+ url,
+ desc ? "mirror for ${name}",
+ section ? "mirror"
+ }:
+ {
+ krebs.repo-sync.repos.${name} = {
+ branches = {
+ remote = {
+ origin.url = url;
+ mirror.url = "${mirror}${name}";
+ };
+ };
+ };
+ krebs.git = defineRepo { inherit name desc section; };
};
in {
- krebs.repo-sync = {
- enable = true;
- };
krebs.git = {
- enable = mkDefault true;
- cgit = {
- settings = {
- root-title = "Shared Repos";
- root-desc = "keep on krebsing";
- };
+ enable = true;
+ cgit.settings = {
+ root-title = "krebs repos";
+ root-desc = "keep calm and engage";
};
};
+ krebs.repo-sync = {
+ enable = true;
+ };
imports = [
- (sync-retiolum "stockholm")
+ (sync-retiolum { name = "the_playlist"; desc = "Good Music collection + tools"; section = "art"; })
+
+ (sync-retiolum { name = "stockholm"; desc = "take all computers hostage, they love it"; section = "configuration"; })
+
+ (sync-retiolum { name = "cholerab"; desc = "krebs thesauron & enterprise-patterns"; section = "documentation"; })
+
+ (sync-retiolum { name = "disko"; desc = "take a description of your disk layout and produce a format script"; section = "software"; })
+ (sync-retiolum { name = "news"; desc = "take a rss feed and a timeout and print it to stdout"; section = "software"; })
+ (sync-retiolum { name = "krops"; desc = "krebs ops"; section = "software"; })
+ (sync-retiolum { name = "go"; desc = "url shortener"; section = "software"; })
+ (sync-retiolum { name = "much"; desc = "curses email client"; section = "software"; })
+ (sync-retiolum { name = "newsbot-js"; desc = "irc rss/atom bot"; section = "software"; })
+ (sync-retiolum { name = "nix-writers"; desc = "high level writers for nix"; section = "software"; })
+
+ (sync-retiolum { name = "cac-api"; desc = "CloudAtCost API command line interface"; section = "miscellaneous"; })
+ (sync-retiolum { name = "dic"; desc = "dict.leo.org command line interface"; section = "miscellaneous"; })
+ (sync-retiolum { name = "get"; section = "miscellaneous"; })
+ (sync-retiolum { name = "hstool"; desc = "Haskell Development Environment ^_^"; section = "miscellaneous"; })
+ (sync-retiolum { name = "htgen"; desc = "toy HTTP server"; section = "miscellaneous"; })
+ (sync-retiolum { name = "kirk"; desc = "IRC tools"; section = "miscellaneous"; })
+ (sync-retiolum { name = "load-env"; section = "miscellaneous"; })
+ (sync-retiolum { name = "loldns"; desc = "toy DNS server"; section = "miscellaneous"; })
+ (sync-retiolum { name = "netcup"; desc = "netcup command line interface"; section = "miscellaneous"; })
+ (sync-retiolum { name = "populate"; desc = "source code installer"; section = "miscellaneous"; })
+ (sync-retiolum { name = "q"; section = "miscellaneous"; })
+ (sync-retiolum { name = "regfish"; section = "miscellaneous"; })
+ (sync-retiolum { name = "soundcloud"; desc = "SoundCloud command line interface"; section = "miscellaneous"; })
+
+ (sync-retiolum { name = "blessings"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "mime"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "quipper"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "scanner"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "wai-middleware-time"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "web-routes-wai-custom"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "xintmap"; section = "Haskell libraries"; })
+ (sync-retiolum { name = "xmonad-stockholm"; desc = "krebs xmonad modules"; section = "Haskell libraries"; })
+
+ (sync-remote { name = "array"; url = "https://github.com/makefu/array"; })
+ (sync-remote { name = "email-header"; url = "https://github.com/4z3/email-header"; })
+ (sync-remote { name = "mycube-flask"; url = "https://github.com/makefu/mycube-flask"; })
+ (sync-remote { name = "reaktor-titlebot"; url = "https://github.com/makefu/reaktor-titlebot"; })
+ (sync-remote { name = "repo-sync"; url = "https://github.com/makefu/repo-sync"; })
+ (sync-remote { name = "skytraq-datalogger"; url = "https://github.com/makefu/skytraq-datalogger"; })
+ (sync-remote { name = "realwallpaper"; url = "https://github.com/lassulus/realwallpaper"; })
+ (sync-remote { name = "painload"; url = "https://github.com/krebs/painload"; })
+ (sync-remote { name = "Reaktor"; url = "https://github.com/krebs/Reaktor"; })
+ (sync-remote { name = "nixos-wiki"; url = "https://github.com/Mic92/nixos-wiki.wiki.git"; })
];
}
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index e2322e171..c4a5bbb0d 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -301,37 +301,6 @@ with import <stockholm/lib>;
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEB/MmASvx3i09DY1xFVM5jOhZRZA8rMRqtf8bCIkC+t";
};
- helios = {
- cores = 8;
- nets = {
- retiolum = {
- ip4.addr = "10.243.133.117";
- ip6.addr = "42:0:0:0:0:0:3:7105";
- aliases = [
- "helios.r"
- "cgit.helios.r"
- ];
- tinc.pubkey = ''
- -----BEGIN RSA PUBLIC KEY-----
- MIICCgKCAgEAp+SRmP5MoCSYInx4Dm5MLZzNyXVgfo/CDoeUlUT35X0yE7WHGWsG
- wHPCu+3RWfBUjuqNdb0qiGtRi3Q/LwznwBROPOX8gMXia/DgCLbIjn5Rx081pTIo
- 3epbUCFtNgyDWg8IHF87ZnVBXTYAy5g4tz9u8kw82D8mR18o595TuZ9t5pDc/Kvi
- fPHZenT6cd6FtL9uankX/jan1PRP9xTrhpE8dAQ6g+7XH7knMK3cno/Ztis5YzHt
- Ith0bsIjk5of7hhITj0MXtTikjDqWxkpF5mfOK1cG/rC1goTmB9AfcENUBnu9iAM
- I/alzqk3CEczznLyaOckfx2fRuar912LAdiJ5v7VPztfvN1p3gIxq5M0Rgkq+98B
- H/s32xNRBPvqoIleKnhwE9gfrCLaAVqpaMkgKRvgsTkSDNYNhh4smQ3eAKKwwDH/
- QG3sfP8xyNyDFhBtCiDGkf9hNqBBMaKjZoh8DasZNtcfOop3fGw7jmUUbB6cG8cp
- +EfYbcb5mVpmrIyXgOTwwYcp7tn+zkd4Wa8C9Q98eFTs0HGVGxGX9Hj6PM/kXK4C
- aIqIQVNpnJ/9cOwT8JFIriG1MWTOXbamUusKTLs8SRp3ZkyM7XUEcLL5HMh09rUw
- rzEAmE7TywXVhd7j2IaEy+bx2dfGQH2bFoh6Drm6Olo+ySi1utB5dGkCAwEAAQ==
- -----END RSA PUBLIC KEY-----
- '';
- };
- };
- secure = true;
- ssh.privkey.path = <secrets/ssh.id_ed25519>;
- ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqpx9jJnn4QMGO8BOrGOLRN1rgpIkR14sQb8S+otWEL";
- };
littleT = {
cores = 2;
nets = {
diff --git a/krebs/3modules/lass/ssh/android.rsa b/krebs/3modules/lass/ssh/android.rsa
index f5190f45c..3d35b76e4 100644
--- a/krebs/3modules/lass/ssh/android.rsa
+++ b/krebs/3modules/lass/ssh/android.rsa
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEZgGgImN/9D4yJBjYlkAvT3X45kzt4n8hmgsqPcdcHWNC7fofWG4fZe8NNrTLdKsK+xYxTstj49l8Vb3YDvw4fAyyyhms/eFRlD2BRqAISwc39EIeTC4g3PXNeUtUGdczXKxsJf5iWf4kxUrUOuZ3FeKxeYXDMSqzzk1oKalhWNl4PmgRc5FzjeRJ2WziilwFq7ntLswoeTBW3c53fbcp3XuPza3M1/sN3NHJx9ZMpWVfJhZ/CXr+nqpc25ZIr5HZVZbgDTyJQimlTF5JCfU0NiiBIh7ep7x4o93tARmilit7+mWUkkxk6ba+zG6nr+s+zyd85AFAYRioOEczbC6mI44UZUB11KkEzOon5JWSA8pK+DPqsqhFkwWYMHLXZp8zemdp9kushRZ6nuI9MzBwacngro1vAvDL6jrS5MR7zf7rMAo6wexovWoEowvZz629mjC3OAt9iOm4VJdvEmq+rHLfjjznVEY6llF7DUu2QNEazaXhxZH9V9N1gyubIE97SQVqmwDrf8BGC0Hq+hC4OOweqfo4XP0etbqAfDozZbqcqyE1m9Bj8DpjrSXka1PuJf5fgEtoxPadd2qdiHMfIx9sM+4uu2nI5aFvWO3OlJmhF80QzNdFzZWjsyvJ24C1/a2FAyzoab1Sg9ljstQThseTtvlXcX8jfFn0U3RbgXgCgOWad3Oy9vA0OCdsHut0nzv3UO+T5+wv2+lvE3QSSKOlmVtdKMhCFb+Rg+FliKxyd820h9yR3wDYmkurVkAxaj8Kx5MaY/7aypOi8fRAV2FSDtCKkuMyPv4xEtdPi/4lj55pRBEO8lJkeb+WurCzZ7ZeaPdrW1YIQtToPpiz3dXeRhkts6jq8247xIplzHh9Iu18gOrnZ+ygn70g19x842vvcfLQNAghDPS93msJdSe+EtulMCwNTjUaF9LyzhW9ptLG9NmwgbT5kGsFiRw3BFdyfcQVWVzDhuP3hPPx+hjiZtFfpIKpxV9MjO1xQ830Ngk3JpSphMZTQ432yfvu9yEsUWmAa8ax1jxJ361AiIp0U2xioJmdVd3E2sxkpOUYqE89IR9X6hS3fH38Gc5IL5+BnhuZvRgXuA+nrqdU4pMB3TIoC5oXlOMRXpxaS91YiO4ERx2t6WkBRCoaDuRWnLpewV6lhjwi1+4Emlrs2q1R0K64emZTv7O1MKwWRHOlBJD3HLyCCS763OzYW4mEQcfBAQtbm6sTooJ+D/zbmYgbnZt0z/nP9R/n25pzlSPpZ49fCiRV7QN6D9mksISTz8qIiCzNBn1F7DUewXqkrdPopl4npeNVcOyyo7P1lFFGde+jq/7REdzD+vno1h9+17WZbyzQtlOyipQYzb6l4QuXq/zejJrELJAQdN4yRQq5NJzIh0HXaPnPC083T791moBflyqiwPEIWsSMfILqSqL1jVVNgvV4fHnMixgH2zK9f0EyE3fG9PnuRribPR2DlESqpHZTcBixgh660EPKh0gCLYoWKgU= lass-android@XperiaXCompact
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOPH4c2zQCaCmus4T9GvaY1lrgVR9CKV3Fx1vRn1K1XB u0_a194@android
diff --git a/krebs/5pkgs/haskell/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
index 954cfd76a..7f6bb299d 100644
--- a/krebs/5pkgs/haskell/xmonad-stockholm.nix
+++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix
@@ -1,16 +1,16 @@
-{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xshape
+{ mkDerivation, base, containers, fetchgit, stdenv, X11, X11-xft, X11-xshape
, xmonad, xmonad-contrib
}:
mkDerivation rec {
pname = "xmonad-stockholm";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchgit {
url = http://cgit.ni.krebsco.de/xmonad-stockholm;
rev = "refs/tags/v${version}";
- sha256 = "05nnfg6q35z3qgf507qa80bz32jl4k719dl5phlmchplp3769585";
+ sha256 = "13mvmh3kk9a79l1nii028p0n7l95pb78wz9c4j42l90m02mg6cis";
};
libraryHaskellDepends = [
- base containers X11 X11-xshape xmonad xmonad-contrib
+ base containers X11 X11-xft X11-xshape xmonad xmonad-contrib
];
license = stdenv.lib.licenses.mit;
}
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index db578c457..c6e601475 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -165,7 +165,7 @@ rec {
};
task-delete = buildSimpleReaktorPlugin "task-delete" {
- pattern = "^task-remove: (?P<args>.*)$$";
+ pattern = "^task-delete: (?P<args>.*)$$";
script = pkgs.writeDash "task-delete" ''
${pkgs.taskwarrior}/bin/task rc:${taskrcFile} delete "$*"
'';
diff --git a/krebs/krops.nix b/krebs/krops.nix
index 861f2d323..c334bc07d 100644
--- a/krebs/krops.nix
+++ b/krebs/krops.nix
@@ -12,7 +12,7 @@
krebs-source = {
nixpkgs.git = {
- ref = "56fad146a12a6f934d1d5ef875eb729be1b19129";
+ ref = (lib.importJSON ./nixpkgs.json).rev;
url = https://github.com/NixOS/nixpkgs;
};
stockholm.file = toString ../.;
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
new file mode 100644
index 000000000..13bed8bfe
--- /dev/null
+++ b/krebs/nixpkgs.json
@@ -0,0 +1,7 @@
+{
+ "url": "https://github.com/NixOS/nixpkgs-channels",
+ "rev": "4df3426f5a5e78cef4835897a43abd9e2a092b74",
+ "date": "2018-08-19T09:20:40+02:00",
+ "sha256": "05k5mssiqxffxi45mss9wjns6k76i248rpasa48akdcriry1mp63",
+ "fetchSubmodules": true
+}
diff --git a/krebs/update-channel.sh b/krebs/update-channel.sh
new file mode 100755
index 000000000..47d3f29c4
--- /dev/null
+++ b/krebs/update-channel.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+dir=$(dirname $0)
+oldrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/')
+nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \
+ --url https://github.com/NixOS/nixpkgs-channels \
+ --rev refs/heads/nixos-18.03' \
+> $dir/nixpkgs.json
+newrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/')
+git commit $dir/nixpkgs.json -m "nixpkgs: $oldrev -> $newrev"
diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index eafc0d06c..305b3f70e 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -30,7 +30,8 @@ with import <stockholm/lib>;
};
environment.systemPackages = with pkgs; [
pavucontrol
- firefox
+ #firefox
+ chromium
hexchat
networkmanagerapplet
libreoffice
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 5657742a6..68acf12b8 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -1,110 +1,7 @@
with import <stockholm/lib>;
-{ config, lib, pkgs, ... }:
-
+{ pkgs, ... }:
{
- imports = [
- <stockholm/lass>
- <stockholm/lass/2configs/baseX.nix>
- <stockholm/lass/2configs/browsers.nix>
- <stockholm/lass/2configs/mouse.nix>
- <stockholm/lass/2configs/pass.nix>
- <stockholm/lass/2configs/retiolum.nix>
- <stockholm/lass/2configs/otp-ssh.nix>
- # TODO fix krebs.git.rules.[definition 2-entry 2].lass not defined
- #<stockholm/lass/2configs/git.nix>
- #<stockholm/lass/2configs/dcso-vpn.nix>
- <stockholm/lass/2configs/virtualbox.nix>
- <stockholm/lass/2configs/dcso-dev.nix>
- <stockholm/lass/2configs/steam.nix>
- <stockholm/lass/2configs/rtl-sdr.nix>
- <stockholm/lass/2configs/backup.nix>
- {
- services.xserver.dpi = 200;
- fonts.fontconfig.dpi = 200;
- lass.fonts.regular = "xft:Hack-Regular:pixelsize=22,xft:Symbola";
- lass.fonts.bold = "xft:Hack-Bold:pixelsize=22,xft:Symbola";
- lass.fonts.italic = "xft:Hack-RegularOblique:pixelsize=22,xft:Symbol";
- }
- { #TAPIR, AGATIS, sentral, a3 - foo
- services.redis.enable = true;
- }
- {
- krebs.fetchWallpaper = {
- enable = true;
- url = "http://i.imgur.com/0ktqxSg.png";
- maxTime = 9001;
- };
- }
- {
- #urban terror port
- krebs.iptables.tables.filter.INPUT.rules = [
- { predicate = "-p tcp --dport 27960"; target = "ACCEPT"; }
- { predicate = "-p udp --dport 27960"; target = "ACCEPT"; }