wip: flakes

.bin/elm-publish-private

@@ -0,0 +1,7 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -p "(import <nixpkgs> { overlays = [ (import ~/work/fysiweb/engiadina-pwa/devops/pkgs) ]; }).elm-publish-private"
+#! nix-shell -i bash
+
+set -efux
+
+exec elm-publish-private "$@"

.versions/home-manager.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/nix-community/home-manager.git",
-  "rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7",
-  "date": "2021-12-03T18:52:38+01:00",
-  "path": "/nix/store/1z0adanpzj78j3sfwwb0syxc3k9569v9-home-manager",
-  "sha256": "00wq584g2gs62rjxax3qi5q9ns1044j4bprbxjvxq3rdhf6i7qcm",
+  "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
+  "date": "2021-12-19T00:59:29+01:00",
+  "path": "/nix/store/fb46bv10azrag2jjlzhil6j11f4x8glw-home-manager",
+  "sha256": "1c8gxm86zshr2zj9dvr02qs7y3m46gqavr6wyv01r09jfd99dxz9",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

.versions/nix-writers.json

@@ -0,0 +1,11 @@
+{
+  "url": "https://cgit.krebsco.de/nix-writers",
+  "rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
+  "date": "2019-04-02T20:05:33+02:00",
+  "path": "/nix/store/wm5zhsha1a2iy0d582nlfi7604ayd1vz-nix-writers",
+  "sha256": "0xdivaca1hgbxs79jw9sv4gk4f81vy8kcyaff56hh2dgq2awyvw4",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

.versions/nixpkgs-unstable.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "9200dd5c190e393d56e5ecbe220b497670b9d54a",
-  "date": "2021-12-22T17:07:04+08:00",
-  "path": "/nix/store/m102w6wfdq6yny89985229zsnyll00r9-nixpkgs",
-  "sha256": "1gspxvalbrp4ibb21gwbqj09gjn68nqzfv93h231nnrjgg1dz38c",
+  "rev": "f01adc7b35a8f80e82f3466e6d873b8b9c8f1b28",
+  "date": "2021-12-22T23:05:28+01:00",
+  "path": "/nix/store/zhfrvg77dzpc3hq02v9zv20dfgqwpzk6-nixpkgs",
+  "sha256": "17iyf2iiizi7c1wr71day3wvgalbkkm2zgc9lpy7y42rl4frq9sf",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

.versions/nixpkgs.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "573095944e7c1d58d30fc679c81af63668b54056",
-  "date": "2021-12-10T10:33:46-08:00",
-  "path": "/nix/store/c0bvhzf1xsjrmzrda8jasa1da76x0zyk-nixpkgs",
-  "sha256": "07s5cwhskqvy82b4rld9b14ljc0013pig23i3jx3l3f957rk95pg",
+  "rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77",
+  "date": "2021-12-21T10:09:48+01:00",
+  "path": "/nix/store/minmlh0avkwvvc3p7flhpbglp13kr585-nixpkgs",
+  "sha256": "0bbd2pgcyavqn5wgq0xp8p67lha0kv9iqnh49i9w5fb5g29q7i30",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

.versions/retiolum.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/krebs/retiolum",
-  "rev": "ff3f0b67b6b542996628067a8769753b76791951",
-  "date": "2021-12-14T11:32:17+01:00",
-  "path": "/nix/store/qidq1da089jazcb325x840ji7la24mms-retiolum",
-  "sha256": "0kapy14x77nlmszl1fpwjlsshvzrd32rahnz4i8m9d6si1k4vbwc",
+  "rev": "b72b0a987767b587c79cba8499b5114d69fceeef",
+  "date": "2021-12-28T19:46:45+00:00",
+  "path": "/nix/store/kyaqwf89v6id9mda92x4b0hf778j987x-retiolum",
+  "sha256": "19hjzzlfk1m9ign33w4ppqgmg23v7c6k8l0fm7f33spq8982w7rb",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

.versions/stockholm.json

@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.lassul.us/stockholm",
-  "rev": "de442ba8ada44d26db9203f96560f077cc10ab17",
-  "date": "2021-12-17T18:54:10+01:00",
-  "path": "/nix/store/bpp1zs5im66fj9xjpsq6wpl26gkxgls9-stockholm",
-  "sha256": "0x21dyasxbf5jg6n9vfc7l4s9ngp4hvxygrvm2drrk00y5l0y29f",
+  "rev": "576c05cf3a0ceddefa29c2d0073108177c3cfa52",
+  "date": "2021-12-22T13:59:46+01:00",
+  "path": "/nix/store/yx1j5pardgd9114f0cf3c4xjfq6r4yfv-stockholm",
+  "sha256": "18napi4k8i2iizrismlp9ha3ga6c3n2dvrhijy59kl1jxqrsaq9l",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

configs/cloud.nix

@@ -1,12 +1,4 @@
 { config, lib, pkgs, ... }: {
-  imports = [
-    <niveum/modules/dropbox.nix>
-  ];
-
-  niveum = {
-    dropbox.enable = false;
-  };
-
   system.activationScripts.home-symlinks = ''
     ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
     ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
@@ -46,7 +38,7 @@
     dataDir = "/home/kfm/.config/syncthing";
     cert = toString <system-secrets/syncthing/cert.pem>;
     key = toString <system-secrets/syncthing/key.pem>;
-    inherit ((import <niveum/lib>).syncthing) devices;
+    inherit ((import ../lib).syncthing) devices;
     folders =
       let cloud-dir = "${config.users.users.me.home}/cloud";
       in {

configs/default.nix

@@ -1,11 +1,10 @@
 { pkgs, lib, config, options, ... }:
 let
   inherit (lib.strings) makeBinPath;
-  inherit (import <niveum/lib>) localAddresses kieran;
+  inherit (import ../lib) localAddresses kieran;
 in {
   imports = [
-    <home-manager/nixos>
-    <niveum/modules/system-dependent.nix>
+    ../modules/system-dependent.nix
     {
       boot.supportedFilesystems = [ "ntfs" ];
     }
@@ -28,9 +27,8 @@ in {
           };
         };
         overlays = [
-          (import <stockholm/krebs/5pkgs>)
           (self: super: {
-            scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
+            scripts = import ../packages/scripts { pkgs = super; lib = super.lib; };
           })
         ];
       };
@@ -202,13 +200,11 @@ in {
     ./ccc.nix
     # ./kleiter.nix
     ./khal.nix
-    ./engiadina.nix
     ./chromium.nix
     ./cloud.nix
     ./copyq.nix
     ./compton.nix
     ./direnv.nix
-    ./distrobump.nix
     ./docker.nix
     ./dunst.nix
     ./flix.nix
@@ -227,14 +223,13 @@ in {
     ./nano.nix
     ./neovim.nix
     ./neomutt.nix
-    ./nix.nix
     ./newsboat.nix
     ./flameshot-once.nix
     ./packages
-    ./power-action.nix
+    # ./power-action.nix
     ./printing.nix
     ./openweathermap.nix
-    ./wallpaper.nix
+    # ./wallpaper.nix
     ./redshift.nix
     ./retiolum.nix
     ./rofi.nix

configs/distrobump.nix

@@ -1,10 +0,0 @@
-{ lib, config, pkgs, ... }: {
-  imports = [
-    (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
-      inherit lib config;
-      pkgs = pkgs // { writeDash = pkgs.writers.writeDash; };
-    })
-  ];
-
-  makefu.distrobump.enable = false;
-}

configs/dunst.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  inherit (import <niveum/lib>) defaultApplications colours theme;
+  inherit (import ../lib) defaultApplications colours theme;
 in {
   home-manager.users.me.services.dunst = {
     enable = true;

configs/engiadina.nix

@@ -1,30 +0,0 @@
-{ config, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) tmpfilesConfig;
-  cdnRoot = "/var/lib/engiadina";
-in
-{
-  imports = [ <stockholm/krebs/3modules/permown.nix> ];
-
-  krebs.permown.${cdnRoot} = {
-    owner = config.users.users.me.name;
-    group = "users";
-    umask = "0002";
-  };
-
-  services.nginx = {
-    enable = true;
-    virtualHosts.default = {
-      root = cdnRoot;
-      listen = [{
-        addr = "0.0.0.0";
-        port = 3333;
-      }];
-    };
-  };
-
-  environment.shellAliases = {
-    engiadina-watch = "${pkgs.findutils}/bin/find extra-src src | ${pkgs.entr}/bin/entr -s 'build-component && ${pkgs.rsync}/bin/rsync -avu dist/*.js ${cdnRoot}/'";
-    engiadina-edit = "$EDITOR ${cdnRoot}/index.html";
-  };
-}

configs/flameshot-once.nix

@@ -1,26 +1,24 @@
-{ config, lib, pkgs, ... }:
-{
-  home-manager.users.me = {
-    services.flameshot.enable = true;
+{ lib, pkgs, ... }:
+let
+  inherit (import <niveum/lib>) defaultApplications;
+  flameshot-once = pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
+in {
+  nixpkgs.overlays = [
+    (self: super: {
+      write =
+        super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> { };
+    })
+  ];
 
-    xdg.configFile."flameshot/flameshot.ini".source = (pkgs.formats.ini {}).generate "flameshot.ini" {
-      General = {
-        disabledTrayIcon = true;
-        checkForUpdates = false;
-        contrastOpacity = 188;
-        savePath = "/tmp";
-        savePathFixed = true;
-        drawThickness = 0;
-        showStartupLaunchMessage = false;
-        filenamePattern = "shot_%F_%T";
+  environment.systemPackages = [
+    (flameshot-once.override {
+      config.imgur = {
+        enable = true;
+        createUrl = "http://p.r/image";
+        deleteUrl = "http://p.r/image/delete/%1";
+        xdg-open.browser = (defaultApplications pkgs).browser;
       };
-    };
-
-    systemd.user.services.flameshot.Unit.Requires = lib.mkForce [];
-    systemd.user.services.flameshot.Environment = {
-      # IMGUR_CREATE_URL = "https://p.krebsco.de/image";
-      # IMGUR_DELETE_URL = "https://p.krebsco.de/image/delete/%1";
-      PATH = "${config.home-manager.users.me.home.profileDirectory}/bin";
-    };
-  };
+      config.timeout = 1000;
+    })
+  ];
 }

configs/git.nix

@@ -1,6 +1,6 @@
 { pkgs, config, lib, ... }:
 let
-  inherit (import <niveum/lib>) kieran ignorePaths;
+  inherit (import ../lib) kieran ignorePaths;
 in
 {
   environment.systemPackages = [

configs/hledger.nix

@@ -1,5 +1,5 @@
 { config, pkgs, ... }: {
-  imports = [ <niveum/modules/hledger.nix> ];
+  imports = [ ../modules/hledger.nix ];
 
   niveum.hledger = {
     enable = true;

configs/i3.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, lib, ... }:
+{ inputs, config, pkgs, lib, ... }:
 let
-  inherit (import <niveum/lib>) defaultApplications colours;
-  klem = import <niveum/packages/scripts/klem.nix> {
+  inherit (import ../lib) defaultApplications colours;
+  klem = import ../packages/scripts/klem.nix {
     inherit pkgs lib;
     config.scripts = {
       "p.r" = pkgs.writers.writeDash "p.r" ''
@@ -146,7 +146,7 @@ in {
           };
         };
         statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${
-            (pkgs.formats.toml {}).generate "i3status-rust.toml" (import <niveum/lib/i3status-rust.nix> {
+            (pkgs.formats.toml {}).generate "i3status-rust.toml" (import ../lib/i3status-rust.nix {
               inherit (config.niveum) batteryName wirelessInterface;
               inherit colours;
               inherit pkgs;
@@ -233,8 +233,7 @@ in {
         "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
         "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
         "${modifier}+F12" = "exec ${klem}/bin/klem";
-
-        "Print" = "exec flameshot gui -p /tmp";
+        "Print" = "exec flameshot-once";
         "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
         "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
         "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";

configs/mpv.nix

@@ -1,6 +1,5 @@
 { pkgs, lib, ... }: let
   swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
-  nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
 in {
   environment.shellAliases.smpv = swallow "mpv";
 
@@ -22,7 +21,7 @@ in {
         "Alt+j" = "add video-pan-y -0.05";
       };
       scripts = [
-        nixpkgs-unstable.mpvScripts.youtube-quality
+        pkgs.unstable.mpvScripts.youtube-quality
       ];
     };
   };

configs/neovim.nix

@@ -25,18 +25,13 @@
         customRC = builtins.readFile <niveum/lib/vim/init.vim>;
         packages.nvim = with pkgs.vimPlugins; {
           start = [
-            # cheat-sh-vim
-            # deoplete-nvim
-            # vim-abolish
             ale
             fzf-vim
             fzfWrapper
-            goyo
             supertab
             undotree
             tabular
             vimwiki
-            vim-256noir
             vim-colors-paramount
             vim-commentary
             vim-css-color
@@ -44,13 +39,9 @@
             vim-fetch
             vim-fugitive
             vim-gitgutter
-            vim-pandoc
-            vim-pandoc-syntax # vim-pandoc-after
             vim-repeat
             vim-sensible
-            # vim-startify
             vim-surround
-            vim-mail
           ];
           opt = [
             csv
@@ -72,6 +63,9 @@
             vim-reason-plus
             vim-toml
             vimtex
+            vim-pandoc
+            vim-pandoc-syntax # vim-pandoc-after
+            vim-256noir
           ];
         };
       };

configs/networkmanager.nix

@@ -1,6 +1,5 @@
 { lib, pkgs, ... }:
 let
-  autowifi = pkgs.writers.writePython3Bin "autowifi" { flakeIgnore = [ "E501" ]; } <stockholm/lass/5pkgs/autowifi/autowifi.py>;
   profile = name: custom: lib.recursiveUpdate {
     connection.id = name;
     connection.type = "wifi";
@@ -39,7 +38,7 @@ let
   };
 in
 {
-  imports = [ <niveum/modules/networkmanager-declarative.nix> ];
+  imports = [ ../modules/networkmanager-declarative.nix ];
 
   networking.networkmanager = {
     enable = true;
@@ -83,18 +82,5 @@ in
 
   users.users.me.extraGroups = [ "networkmanager" ];
 
-  systemd.services.autowifi = {
-    enable = false;
-    description = "Automatic wifi connector";
-    wantedBy = [ "multi-user.target" ];
-    path = [ pkgs.networkmanager ];
-    serviceConfig = {
-      Type = "simple";
-      Restart = "always";
-      RestartSec = "10s";
-      ExecStart = "${autowifi}/bin/autowifi";
-    };
-  };
-
   environment.systemPackages = [ pkgs.speedtest-cli ];
 }

configs/nix.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  # enable `nix flake`
-  nix = {
-    package = pkgs.nix;
-    # extraOptions = ''
-    #   experimental-features = nix-command
-    # '';
-  };
-}

configs/packages/default.nix

@@ -6,6 +6,25 @@ let
 
   nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
 
+  astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: old // {
+    installPhase = ''
+      ${old.installPhase}
+      # set sensible defaults
+      sed -i '
+        /^-z /s/8:00W/1:00E/ # timezone
+        /^-zl /s/122W19:59 47N36:35/13E22:42 52N27:42/ # default location
+        /^-zj /s/"Current moment now"/Now/ # default name
+        /^-zj /s/"Seattle, WA, USA"/Berlin/ # default location
+        /^_k/s/_k/=k/ # use color
+        /^_Yd/s/_Yd/=Yd/ # sensible date format
+        /^_Yt/s/_Yt/=Yt/ # sensible time format
+        /^_Yv/s/_Yv/=Yv/ # sensible length format
+        /^:Xbw/s/:Xbw/:Xbn/ # set X11 bitmap format
+        /^:I /s/80/120/ # wider text output
+      ' $out/astrolog/astrolog.as
+    '';
+  });
+
   recht = pkgs.callPackage (pkgs.fetchFromGitHub {
     owner = "kmein";
     repo = "recht";
@@ -107,7 +126,7 @@ in {
     audacity
     calibre
     inkscape
-    nixpkgs-unstable.astrolog # astrolog
+    astrolog # astrolog
     anki # flashcards
     nixpkgs-unstable.zoom-us # video conferencing
     pdfgrep # search in pdf

configs/printing.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  inherit (import <niveum/lib>) localAddresses;
+  inherit (import ../lib) localAddresses;
   hp-driver = pkgs.hplipWithPlugin;
 in {
   services.printing = {

configs/retiolum.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }: {
   imports = [
-    <niveum/modules/retiolum.nix>
+    ../modules/retiolum.nix
   ];
 
   networking.hosts = { "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ]; };

configs/ssh.nix

@@ -1,6 +1,6 @@
 { pkgs, config, lib, ... }:
 let
-  inherit (import <niveum/lib>) sshPort kieran;
+  inherit (import ../lib) sshPort kieran;
 in {
   services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
 

configs/sshd.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (import <niveum/lib>) sshPort kieran;
+  inherit (import ../lib) sshPort kieran;
 in
 {
   users.motd = "Welcome to ${config.networking.hostName}!";

configs/telegram-bots/astrology.nix

@@ -0,0 +1,53 @@
+{ pkgs, lib, ... }:
+let
+  nixpkgs-unstable = import <nixpkgs-unstable> {};
+  toSymbols = pkgs.writers.writeDash "to-symbols" ''
+    ${pkgs.gnused}/bin/sed '
+      s/\bTri\b/△/;
+      s/\bOpp\b/☍/;
+      s/\bSqu\b/□/;
+      s/\bSex\b/⚹/;
+      s/\bCon\b/☌/;
+      s/Sun/☉/g;
+      s/Moon/☽/g;
+      s/Mercury/☿/g;
+      s/Venus/♀/g;
+      s/Mars/♂/g;
+      s/Jupiter/♃/g;
+      s/Saturn/♄/g;
+      s/Uranus/♅/g;
+      s/Neptune/♆/g;
+      s/Pluto/♇/g;
+      s/North Node/☊/g;
+      s/\bLeo\b/♌/g;
+      s/\bCan\(cer\)\?\b/♋/g;
+      s/\bGem\(ini\)\?\b/♊/g;
+      s/\bVir\(go\)\?\b/♍/g;
+      s/\bLib\(ra\)\?\b/♎/g;
+      s/\bTau\(rus\)\?\b/♉/g;
+      s/\bAri\(es\)\?\b/♈/g;
+      s/\bSco\(rpio\)\?\b/♏/g;
+      s/\bPis\(ces\)\?\b/♓/g;
+      s/\bSag\(ittarius\)\?\b/♐/g;
+      s/\bAqu\(arius\)\?\b/♒/g;
+      s/\bCap\(ricorn\)\?\b/♑/g;
+      s/-->/⟶/g;
+      s/\s\+/ /g; # replace multiple spaces by one
+      s/^.*\([ 0-9]\{2\}:[0-9]\{2\}\) /\1 /; # remove date at beginning of line (but not everything up to v/c X:XX)
+      s/^\s*//
+    '
+  '';
+in {
+  niveum.telegramBots.transits = {
+    enable = true;
+    time = "4:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = [ "18980945" ];
+    command = toString (pkgs.writers.writeDash "common-transits" ''
+      {
+        ${nixpkgs-unstable.astrolog}/bin/astrolog -n -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto
+        ${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $(${pkgs.coreutils}/bin/date +'%m %d %Y') -R Uranus Neptune Pluto
+      } | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n
+    '');
+  };
+}

configs/telegram-bots/default.nix

@@ -14,6 +14,7 @@ let
 in {
   imports = [
     ./literature-quote.nix
+    ./astrology.nix
     ./autorenkalender.nix
     ./nachtischsatan.nix
     ./tlg-wotd.nix

configs/theming.nix

@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }:
 let
-  theme = (import <niveum/lib>).theme pkgs;
+  theme = (import ../lib).theme pkgs;
 in {
   environment.systemPackages =
     [ theme.gtk.package theme.icon.package theme.cursor.package ];

configs/traadfri.nix

@@ -4,7 +4,7 @@ let
   living-room-id = 131090;
 in
 {
-  imports = [ <niveum/modules/traadfri.nix> ];
+  imports = [ ../modules/traadfri.nix ];
 
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "traadfri-party" ''

configs/weechat.nix

@@ -50,8 +50,8 @@ in {
           /relay add weechat 9000
           /set relay.network.password ${relayPassword}
 
-          /set matrix.server.myserver.username ${nick}
-          /set matrix.server.myserver.password "${lib.strings.fileContents <system-secrets/matrix/nibbana>}"
+          /set matrix.server.nibbana.username ${nick}
+          /set matrix.server.nibbana.password "${lib.strings.fileContents <system-secrets/matrix/nibbana>}"
 
           /set irc.server.oftc.command /msg nickserv IDENTIFY ${lib.strings.fileContents <system-secrets/irc/oftc>};/msg nickserv SET CLOAK ON
           /set irc.server.oftc.autojoin "#osm,#osm-de,#home-manager"

deploy.nix

@@ -1,67 +1,40 @@
+{ pkgs, secrets, writeCommand, lib, nixosRebuildCommand ? "switch" }:
 let
-  inherit (import ./lib/default.nix) sshPort;
+  sshPort = 22022;
 
-  gitFromJson = path:
-    let object = importJson path;
-    in {
-      inherit (object) url;
-      ref = object.rev;
+  # command that ensures we use flake.nix during switch
+  command = targetPath:
+  let
+    commandLine = "TMPDIR=/tmp nixos-rebuild ${nixosRebuildCommand} --flake ${targetPath} -L --keep-going";
+  in
+  ''
+    echo '${commandLine}'
+    nix-shell \
+     -E "with import <nixpkgs> {}; mkShell { buildInputs = [ git (nixos { nix.package = nixFlakes; }).nixos-rebuild ]; }" \
+     --run '${commandLine}'
+  '';
+
+  source = name: {
+    niveum.file = toString ./.;
+    system-secrets.pass = {
+      dir = secrets;
+      name = "systems/${name}";
+    };
+    secrets.pass = {
+      dir = secrets;
+      name = "shared";
     };
-  krops = builtins.fetchGit (gitFromJson .versions/krops.json);
-  lib = import "${krops}/lib";
-  pkgs = import "${krops}/pkgs" { };
-  importJson = (import <nixpkgs> { }).lib.importJSON;
-
-  regularSystem = { path, name, address }: {
-    source = lib.evalSource [{
-      niveum.file = toString ./.;
-      system.file = toString path;
-      nixos-config.symlink = "system/configuration.nix";
-
-      nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
-      nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
-      home-manager.git = gitFromJson .versions/home-manager.json;
-      stockholm.git = gitFromJson .versions/stockholm.json;
-      retiolum.git = gitFromJson .versions/retiolum.json;
-      nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
-      system-secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "systems/${name}";
-      };
-      secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "shared";
-      };
-    }];
-    target = "root@${address}:${toString sshPort}";
   };
-  inherit (pkgs.krops) writeDeploy;
+
+  deploy = {name, host}: writeCommand "/bin/system" {
+    source = lib.evalSource [ (source name) ];
+    force = true;
+    target = lib.mkTarget "root@${host}:${toString sshPort}/var/krops/niveum";
+    inherit command;
+  };
 in {
-  zaatar = writeDeploy "deploy-zaatar" (regularSystem {
-    path = systems/zaatar;
-    name = "zaatar";
-    address = "zaatar.r";
-  });
-  kabsa = writeDeploy "deploy-kabsa" (regularSystem {
-    path = systems/kabsa;
-    name = "kabsa";
-    address = "kabsa.r";
-  });
-  toum = writeDeploy "deploy-toum" (regularSystem {
-    path = systems/toum;
-    name = "toum";
-    address = "toum.r";
-  }) // {
-    buildTarget = "${builtins.getEnv "USER"}@localhost/${builtins.getEnv "HOME"}/.cache/krops";
-  };
-  makanek = writeDeploy "deploy-makanek" (regularSystem {
-    path = systems/makanek;
-    name = "makanek";
-    address = "makanek.r";
-  });
-  manakish = writeDeploy "deploy-manakish" (regularSystem {
-    path = systems/manakish;
-    name = "manakish";
-    address = "manakish.r";
-  });
+  zaatar = deploy { name = "zaatar"; host = "zaatar.r"; };
+  kabsa = deploy { name = "kabsa"; host = "kabsa.r"; };
+  manakish = deploy { name = "manakish"; host = "manakish.r"; };
+  makanek = deploy { name = "makanek"; host = "makanek.r"; };
 }

flake.lock

@@ -0,0 +1,174 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1639871969,
+        "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-21.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "krops": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1632420452,
+        "narHash": "sha256-ncK6vABW/Ku9XI0kqj1otarUfblryoQzSaOCnaZ0oSs=",
+        "owner": "Mic92",
+        "repo": "krops",
+        "rev": "0388970c568905fedcbf429e5745aacd4f7a6633",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "krops",
+        "type": "github"
+      }
+    },
+    "nix-writers": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1554228333,
+        "narHash": "sha256-hG/PlcCvCQhNcU55NpHfATkyH9k6cZmO7uvBoJjasXU=",
+        "ref": "master",
+        "rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
+        "revCount": 32,
+        "type": "git",
+        "url": "https://cgit.krebsco.de/nix-writers"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://cgit.krebsco.de/nix-writers"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1640759603,
+        "narHash": "sha256-k4d7oC6GvDV1OKxG325JUDpKtZcDUPEiddnJMOQQ/x8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e101dc111ac1e5a21efca7822417acc1cb92013a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "release-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1640540585,
+        "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ac169ec6371f0d835542db654a65e0f2feb07838",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "retiolum": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640734423,
+        "narHash": "sha256-i/M1nyPnIEqV7K5dn0Q7V5mRtfzspH+AM6HbgPYGreI=",
+        "owner": "krebs",
+        "repo": "retiolum",
+        "rev": "0e11e0119f330ea103a44e3502149ae50c1a299d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "krebs",
+        "repo": "retiolum",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "home-manager": "home-manager",
+        "krops": "krops",
+        "nix-writers": "nix-writers",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "retiolum": "retiolum",
+        "secrets": "secrets",
+        "stockholm": "stockholm"
+      }
+    },
+    "secrets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640701876,
+        "narHash": "sha256-2vQ32k/z0Jh+Ade32mRA6tENetvWI6SNNrR5DJiBuWw=",
+        "ref": "master",
+        "rev": "120635422c7fb78c94e6a182fc384c98fb5cf4ce",
+        "revCount": 170,
+        "type": "git",
+        "url": "file:///home/kfm/projects/sphinx"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/kfm/projects/sphinx"
+      }
+    },
+    "stockholm": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640733142,
+        "narHash": "sha256-HzSEyYTGPoGAfgl+lZLb/DDUCQRoZ2iN7oTLhl+1KTQ=",
+        "ref": "master",
+        "rev": "687948cfe5154e03f93886dd27dc30c7910ba754",
+        "revCount": 10222,
+        "type": "git",
+        "url": "https://cgit.krebsco.de/stockholm"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://cgit.krebsco.de/stockholm"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,99 @@
+{
+  description = "niveum systems";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    secrets = {
+      url = "/home/kfm/.password-store";
+      flake = false;
+    };
+
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    home-manager = {
+      url = "github:nix-community/home-manager/release-21.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    retiolum = {
+      url = "github:krebs/retiolum";
+      flake = false;
+    };
+    nix-writers = {
+      url = "git+https://cgit.krebsco.de/nix-writers";
+      flake = false;
+    };
+    stockholm = {
+      url = "git+https://cgit.krebsco.de/stockholm";
+      flake = false;
+    };
+    krops = {
+      url = "github:Mic92/krops";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+  };
+
+  outputs = { self, nixpkgs, stockholm, secrets, nixpkgs-unstable, home-manager, retiolum, krops, nix-writers, ... }@inputs:
+  let
+    system = "x86_64-linux";
+    pkgs = nixpkgs.legacyPackages.${system};
+    writeCommand = krops.packages.${system}.writeCommand;
+    niveumSystem = configuration: nixpkgs.lib.nixosSystem {
+      inherit system;
+      modules = defaultModules ++ [ configuration ];
+    };
+    defaultModules = [
+      { _module.args.inputs = inputs; }
+      ({ pkgs, ... }: {
+        nix = {
+          nixPath = [ "nixpkgs=${pkgs.path}" ];
+          package = pkgs.nixFlakes;
+          extraOptions = ''
+            experimental-features = nix-command flakes
+          '';
+        };
+        nixpkgs.overlays = [
+          (_self: _super: {
+            unstable = nixpkgs-unstable.legacyPackages.${pkgs.system};
+          })
+          (import "${nix-writers}/pkgs")
+          # (import <stockholm/krebs/5pkgs>)
+        ];
+      })
+      home-manager.nixosModules.home-manager
+      {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+      }
+    ];
+  in
+  {
+    nixosConfigurations = {
+      kabsa = niveumSystem systems/kabsa/configuration.nix;
+      makanek = niveumSystem systems/makanek/configuration.nix;
+      manakish = niveumSystem systems/manakish/configuration.nix;
+      zaatar = niveumSystem systems/zaatar/configuration.nix;
+    };
+
+    apps.${system} = {
+      #  nix run ".#deploy.kabsa"
+      deploy = pkgs.callPackage ./deploy.nix {
+        inherit secrets writeCommand;
+        inherit (krops) lib;
+      };
+
+      #  nix run ".#test.kabsa"
+      test = pkgs.callPackage ./deploy.nix {
+        inherit secrets writeCommand;
+        inherit (krops) lib;
+        nixosRebuildCommand = "test";
+      };
+    };
+  };
+}

lib/streams.nix

@@ -49,6 +49,14 @@ in [
     logo = "http://lassul.us/art/portraits/selbstportrait.jpg";
     desc = "Diminutive from lassus (“weary, faint, tired”). A programming human. Doing superior professional art.";
   }
+  {
+    stream = "https://cdn.c3voc.de/hls/abchillgleis/segment_Native.m3u8";
+    station = "RC3 Abchillgleis";
+  }
+  {
+    stream = "https://cdn.c3voc.de/hls/c3lounge/segment_Native.m3u8";
+    station = "RC3 Lounge";
+  }
   {
     stream = "https://radio.kmein.de/lyrik/listen.ogg";
     station = "Lyrik";

lib/vim/init.vim

@@ -132,6 +132,7 @@ if has("autocmd")
   autocmd bufnewfile,bufread *.jq packadd jq.vim
   autocmd bufnewfile,bufread *.re packadd vim-reason-plus | set filetype=reason
   autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
+  autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax
   autocmd bufnewfile,bufread urls,config set filetype=conf
   autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
   autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall

modules/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./constants.nix
-    ./dropbox.nix
     ./retiolum.nix
   ];
 }

modules/dropbox.nix

@@ -1,29 +0,0 @@
-{ pkgs, lib, config, ... }:
-with lib;
-let cfg = config.niveum.dropbox;
-in {
-  options.niveum.dropbox = { enable = mkEnableOption "Dropbox"; };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.dropbox-cli ];
-
-    networking.firewall = {
-      allowedTCPPorts = [ 17500 ];
-      allowedUDPPorts = [ 17500 ];
-    };
-
-    systemd.user.services.dropbox = {
-      description = "Dropbox synchronisation service";
-      wantedBy = [ "graphical-session.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.dropbox.out}/bin/dropbox";
-        ExecReload = "${pkgs.coreutils.out}/bin/kill -HUP $MAINPID";
-        KillMode = "control-group"; # upstream recommends process
-        Restart = "on-failure";
-        PrivateTmp = true;
-        ProtectSystem = "full";
-        Nice = 10;
-      };
-    };
-  };
-}

modules/retiolum.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, lib, ... }:
+{ inputs, config, pkgs, lib, ... }:
 with lib;
 let
   netname = "retiolum";
   cfg = config.networking.retiolum;
+  inherit (inputs) retiolum;
 in {
   options = {
     networking.retiolum.ipv4 = mkOption {
@@ -31,16 +32,17 @@ in {
     services.tinc.networks.${netname} = {
       name = cfg.nodename;
       hosts = builtins.mapAttrs
-        (name: _: builtins.readFile "${<retiolum/hosts>}/${name}")
-        (builtins.readDir <retiolum/hosts>);
+        (name: _: builtins.readFile "${retiolum}/hosts/${name}")
+        (builtins.readDir "${retiolum}/hosts");
       rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;
+      ed25519PrivateKeyFile = toString <system-secrets/retiolum.ed25519>;
       extraConfig = ''
         LocalDiscovery = yes
         AutoConnect = yes
       '';
     };
 
-    networking.extraHosts = builtins.readFile (toString <retiolum/etc.hosts>);
+    networking.extraHosts = builtins.readFile (toString "${retiolum}/etc.hosts");
 
     environment.systemPackages = [ config.services.tinc.networks.${netname}.package ];
 

modules/traadfri.nix

@@ -6,8 +6,8 @@ let
     traadfri-package = pkgs.fetchFromGitHub {
       owner = "kmein";
       repo = "traadfri";
-      rev = "a55b778cf4c7f124e75070b056c90f5a8043bc45";
-      sha256 = "10ggqksdbgmcwc2f3xs6abjf9zpvv554xfl3b3bblmfijgr6srv9";
+      rev = "cf46bd09cd3263b90a09b0ca979aa705a4c3671c";
+      sha256 = "0az9q38pl8fqk00488blhn6rhvwsw2wky3dbdlyz7945ggvxnbyd";
     };
   in pkgs.callPackage traadfri-package {
     libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };

packages/scripts/default.nix

@@ -412,6 +412,6 @@ in rec {
   text2pdf = pkgs.callPackage <niveum/packages/text2pdf.nix> { };
   vimv = pkgs.callPackage <niveum/packages/vimv.nix> { };
   when = pkgs.callPackage <niveum/packages/when.nix> { };
-  mahlzeit = pkgs.callPackage <niveum/packages/mahlzeit.nix> { };
+  mahlzeit = pkgs.haskellPackages.callPackage <niveum/packages/mahlzeit.nix> { };
   inherit opustags;
 }

shell.nix

@@ -15,6 +15,11 @@ let
       url = "https://github.com/NixOS/nixpkgs.git";
       path = toString .versions/nixpkgs-unstable.json;
     };
+    nix-writers = {
+      ref = "refs/heads/master";
+      url = "https://cgit.krebsco.de/nix-writers";
+      path = toString .versions/nix-writers.json;
+    };
     home-manager = {
       ref = "refs/heads/release-${release}";
       url = "https://github.com/nix-community/home-manager.git";

systems/kabsa/configuration.nix

@@ -1,13 +1,13 @@
 { config, pkgs, lib, ... }:
 let
   nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
-  inherit (import <niveum/lib>) retiolumAddresses;
+  inherit (import ../../lib) retiolumAddresses;
 in
 {
   imports = [
-    <niveum/configs/default.nix>
-    <niveum/configs/battery.nix>
-    <niveum/configs/networkmanager.nix>
+    ../../configs/default.nix
+    ../../configs/battery.nix
+    ../../configs/networkmanager.nix
     ./hardware-configuration.nix
     # <stockholm/krebs/2configs/hw/x220.nix>
   ];

systems/kabsa/hardware-configuration.nix

@@ -1,5 +1,5 @@
-{ config, lib, pkgs, ... }: {
-  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+{ config, lib, pkgs, modulesPath, ... }: {
+  imports = [ "${modulesPath}/installer/scan/not-detected.nix" ];
 
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
@@ -18,7 +18,7 @@
     fsType = "vfat";
   };
 
-  zramSwap.enable = true;
+  zramSwap.enable = false;
 
   nix.maxJobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";

systems/makanek/configuration.nix

@@ -20,6 +20,7 @@ in
     <niveum/configs/names.nix>
     <niveum/configs/menstruation.nix>
     <niveum/configs/telegram-bots>
+    <niveum/configs/nix.nix>
     <niveum/configs/weechat.nix>
     <niveum/configs/urlwatch.nix>
     <niveum/configs/matterbridge.nix>

systems/zaatar/configuration.nix

@@ -10,6 +10,7 @@ in
     <niveum/configs/keyboard.nix>
     <niveum/modules/retiolum.nix>
     <niveum/configs/spacetime.nix>
+    <niveum/configs/nix.nix>
     <niveum/configs/tuna.nix>
     <niveum/configs/sshd.nix>
     <niveum/configs/version.nix>