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",
+  "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
-  "date": "2021-12-03T18:52:38+01:00",
+  "date": "2021-12-19T00:59:29+01:00",
-  "path": "/nix/store/1z0adanpzj78j3sfwwb0syxc3k9569v9-home-manager",
+  "path": "/nix/store/fb46bv10azrag2jjlzhil6j11f4x8glw-home-manager",
-  "sha256": "00wq584g2gs62rjxax3qi5q9ns1044j4bprbxjvxq3rdhf6i7qcm",
+  "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",
+  "rev": "f01adc7b35a8f80e82f3466e6d873b8b9c8f1b28",
-  "date": "2021-12-22T17:07:04+08:00",
+  "date": "2021-12-22T23:05:28+01:00",
-  "path": "/nix/store/m102w6wfdq6yny89985229zsnyll00r9-nixpkgs",
+  "path": "/nix/store/zhfrvg77dzpc3hq02v9zv20dfgqwpzk6-nixpkgs",
-  "sha256": "1gspxvalbrp4ibb21gwbqj09gjn68nqzfv93h231nnrjgg1dz38c",
+  "sha256": "17iyf2iiizi7c1wr71day3wvgalbkkm2zgc9lpy7y42rl4frq9sf",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

.versions/nixpkgs.json

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

.versions/retiolum.json

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

.versions/stockholm.json

@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.lassul.us/stockholm",
-  "rev": "de442ba8ada44d26db9203f96560f077cc10ab17",
+  "rev": "576c05cf3a0ceddefa29c2d0073108177c3cfa52",
-  "date": "2021-12-17T18:54:10+01:00",
+  "date": "2021-12-22T13:59:46+01:00",
-  "path": "/nix/store/bpp1zs5im66fj9xjpsq6wpl26gkxgls9-stockholm",
+  "path": "/nix/store/yx1j5pardgd9114f0cf3c4xjfq6r4yfv-stockholm",
-  "sha256": "0x21dyasxbf5jg6n9vfc7l4s9ngp4hvxygrvm2drrk00y5l0y29f",
+  "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

configs/default.nix

@@ -1,18 +1,16 @@
-{ pkgs, lib, config, options, ... }:
+{ inputs, pkgs, lib, config, options, ... }:
 let
   inherit (lib.strings) makeBinPath;
   inherit (import <niveum/lib>) localAddresses kieran;
 in {
   imports = [
-    <home-manager/nixos>
+    ../modules/system-dependent.nix
-    <niveum/modules/system-dependent.nix>
     {
       boot.supportedFilesystems = [ "ntfs" ];
     }
     {
       nix.nixPath = [
         "/var/src"
-        "nixpkgs-overlays=${toString ../overlays}"
       ];
     }
     {
@@ -20,17 +18,14 @@ in {
         config = {
           allowUnfree = true;
           packageOverrides = pkgs: {
-            writeDashBin = pkgs.writers.writeDashBin;
-            writeDash = pkgs.writers.writeDash;
             gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
             iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
             ix = pkgs.callPackage <niveum/packages/ix.nix> { };
           };
         };
         overlays = [
-          (import <stockholm/krebs/5pkgs>)
           (self: super: {
-            scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
+            scripts = import <niveum/packages/scripts> { pkgs = super; inherit lib; };
           })
         ];
       };
@@ -202,13 +197,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

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/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, ... }:
+{ lib, pkgs, ... }:
-{
+let
-  home-manager.users.me = {
+  inherit (import <niveum/lib>) defaultApplications;
-    services.flameshot.enable = true;
+  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" {
+  environment.systemPackages = [
-      General = {
+    (flameshot-once.override {
-        disabledTrayIcon = true;
+      config.imgur = {
-        checkForUpdates = false;
+        enable = true;
-        contrastOpacity = 188;
+        createUrl = "http://p.r/image";
-        savePath = "/tmp";
+        deleteUrl = "http://p.r/image/delete/%1";
-        savePathFixed = true;
+        xdg-open.browser = (defaultApplications pkgs).browser;
-        drawThickness = 0;
-        showStartupLaunchMessage = false;
-        filenamePattern = "shot_%F_%T";
       };
-    };
+      config.timeout = 1000;
-
+    })
-    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";
-    };
-  };
 }

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

@@ -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-once";
-        "Print" = "exec flameshot gui -p /tmp";
         "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/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

@@ -39,7 +39,7 @@ let
   };
 in
 {
-  imports = [ <niveum/modules/networkmanager-declarative.nix> ];
+  imports = [ ../modules/networkmanager-declarative.nix ];
 
   networking.networkmanager = {
     enable = true;

configs/nix.nix

@@ -2,9 +2,7 @@
 {
   # enable `nix flake`
   nix = {
-    package = pkgs.nix;
+    package = pkgs.nixFlakes;
-    # extraOptions = ''
+    extraOptions = "experimental-features = nix-command flakes";
-    #   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/power-action.nix

@@ -3,8 +3,6 @@ let
   suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
 in
 {
-  imports = [ <stockholm/krebs/3modules/power-action.nix> ];
-
   krebs.power-action = {
     enable = true;
     plans.suspend = {

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/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/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/wallpaper.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, ... }:
 {
-  imports = [ <stockholm/krebs/3modules/fetchWallpaper.nix> ];
-
   krebs.fetchWallpaper = {
     enable = true;
     url = "http://prism.r/realwallpaper-krebs-stars-berlin.png";

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.nibbana.username ${nick}
-          /set matrix.server.myserver.password "${lib.strings.fileContents <system-secrets/matrix/nibbana>}"
+          /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,38 @@
 let
   inherit (import ./lib/default.nix) sshPort;
 
-  gitFromJson = path:
+  krops = builtins.fetchGit { url = "https://cgit.krebsco.de/krops/"; };
-    let object = importJson path;
-    in {
-      inherit (object) url;
-      ref = object.rev;
-    };
-  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 = name: lib.evalSource [{
-    source = lib.evalSource [{
+    niveum.file = toString ./.;
-      niveum.file = toString ./.;
+    system-secrets.pass = {
-      system.file = toString path;
+      dir = toString ~/.password-store;
-      nixos-config.symlink = "system/configuration.nix";
+      name = "systems/${name}";
+    };
+    secrets.pass = {
+      dir = toString ~/.password-store;
+      name = "shared";
+    };
+  }];
 
-      nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
+  command = targetPath: ''
-      nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
+    nix-shell -p git --run '
-      home-manager.git = gitFromJson .versions/home-manager.json;
+      nixos-rebuild switch -v --show-trace --flake ${targetPath}/niveum || \
-      stockholm.git = gitFromJson .versions/stockholm.json;
+        nixos-rebuild switch -v --flake ${targetPath}/niveum
-      retiolum.git = gitFromJson .versions/retiolum.json;
+    '
-      nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
+  '';
-      system-secrets.pass = {
+
-        dir = toString ~/.password-store;
+  createHost = name: target: pkgs.krops.writeCommand "deploy-${name}" {
-        name = "systems/${name}";
+    source = source name;
-      };
+    inherit command target;
-      secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "shared";
-      };
-    }];
-    target = "root@${address}:${toString sshPort}";
   };
-  inherit (pkgs.krops) writeDeploy;
+in rec {
-in {
+  zaatar = createHost "zaatar" "root@zaatar.r:${toString sshPort}";
-  zaatar = writeDeploy "deploy-zaatar" (regularSystem {
+  kabsa = createHost "kabsa" "root@kabsa.r:${toString sshPort}";
-    path = systems/zaatar;
+  makanek = createHost "kabsa" "root@makanek.r:${toString sshPort}";
-    name = "zaatar";
+  manakish = createHost "kabsa" "root@manakish.r:${toString sshPort}";
-    address = "zaatar.r";
+  all = pkgs.writeScript "deploy-all"
-  });
+    (lib.concatStringsSep "\n" [ zaatar kabsa makanek manakish ]);
-  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";
-  });
 }

flake.lock

@@ -0,0 +1,150 @@
+{
+  "nodes": {
+    "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": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1637419569,
+        "narHash": "sha256-0hxKZQIoByRDoPsfQq5qzFJioyWRX/fbpvMO2EYQ9lc=",
+        "ref": "master",
+        "rev": "13ae434b140035e7e2664bd5a8ef4c475413b2e0",
+        "revCount": 115,
+        "type": "git",
+        "url": "https://cgit.krebsco.de/krops"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://cgit.krebsco.de/krops"
+      }
+    },
+    "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-mozilla": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1638887313,
+        "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1640725200,
+        "narHash": "sha256-yR8clhRTt1OBFojyBaNnNgD+om51nhuJ1OLqWqdY2Ow=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "eaeea6e9337b93d2acb7c2aa27e3f4617408375a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "retiolum": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640724425,
+        "narHash": "sha256-eGzvF96ZnrKqvQ7wnpa9OYsfBxUMV0Jdh3QGdZhbSek=",
+        "owner": "krebs",
+        "repo": "retiolum",
+        "rev": "5a32ea07d6ca5668ea06f14dffe94fb46d42c674",
+        "type": "github"
+      },
+      "original": {
+        "owner": "krebs",
+        "repo": "retiolum",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "krops": "krops",
+        "nix-writers": "nix-writers",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-mozilla": "nixpkgs-mozilla",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "retiolum": "retiolum",
+        "stockholm": "stockholm"
+      }
+    },
+    "stockholm": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640726454,
+        "narHash": "sha256-twePnoB0NRhSM4zJOrUI/Zxzwx/u52ey6zA4YYGEvOc=",
+        "ref": "master",
+        "rev": "2a47990f16935d909930c9dd1ed6f8f2982df638",
+        "revCount": 10218,
+        "type": "git",
+        "url": "https://cgit.lassul.us/stockholm"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://cgit.lassul.us/stockholm"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,79 @@
+# imported from https://github.com/pinpox/nixos/blob/bdc0d47111d57cd19512c83538a01f9f9a3fc847/flake.nix
+# ref https://www.youtube.com/watch?v=mJbQ--iBc1U
+{
+  description = "niveum systems";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-21.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # flake-utils.url = "github:numtide/flake-utils";
+    # flake-compat = {
+    #   url = "github:edolstra/flake-compat";
+    #   flake = false;
+    # };
+    stockholm = {
+      url = "git+https://cgit.lassul.us/stockholm";
+      flake = false;
+    };
+    nix-writers = {
+      url = "git+https://cgit.krebsco.de/nix-writers";
+      flake = false;
+    };
+    krops = {
+      url = "git+https://cgit.krebsco.de/krops";
+      flake = false;
+    };
+    retiolum = {
+      url = "github:krebs/retiolum";
+      flake = false;
+    };
+    nixpkgs-mozilla = {
+      url = "github:mozilla/nixpkgs-mozilla";
+      flake = false;
+    };
+  };
+
+  outputs = { self, nixpkgs, nix-writers, home-manager, stockholm, ... }@inputs:
+  let
+    nixosSystem = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem;
+
+    defaultModules = [
+      { _module.args.inputs = inputs; }
+      {
+        imports = [
+          home-manager.nixosModules.home-manager
+          "${stockholm}/krebs/3modules/power-action.nix"
+          "${stockholm}/krebs/3modules/fetchWallpaper.nix"
+          ({ pkgs, ... }: {
+            nix.nixPath = [ "nixpkgs=${pkgs.path}" ];
+            nixpkgs.overlays = [
+              (import "${nix-writers}/pkgs")
+              (import "${stockholm}/krebs/5pkgs")
+            ];
+          })
+          ({ pkgs, ... }: { # https://github.com/Mic92/dotfiles/blob/50826e8f247909557975f4f193ecbb4162b07310/nixos/modules/upgrade-diff.nix
+            system.activationScripts.diff = ''
+              ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
+             '';
+          })
+        ];
+
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+      }
+    ];
+  in {
+    nixosConfigurations = {
+      kabsa = nixosSystem {
+        system = "x86_64-linux";
+        modules = defaultModules ++ [
+          systems/kabsa/configuration.nix
+        ];
+      };
+    };
+  };
+}

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/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

@@ -34,6 +34,7 @@ in {
         (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

modules/traadfri.nix

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

overlays/overlays.nix

@@ -1,6 +0,0 @@
-self: super:
-with super.lib;
-let
-  eval = import <nixpkgs/nixos/lib/eval-config.nix>;
-  paths = (eval {modules = [(import <nixos-config>)];}).config.nixpkgs.overlays;
-in foldl' (flip extends) (_: super) paths self

packages/scripts/default.nix

@@ -168,7 +168,7 @@ in rec {
       | ${pkgs.man}/bin/man --local-file --pager="${pkgs.bat}/bin/bat -p" -
   '';
 
-  playlist = import ./pls.nix { inherit pkgs; };
+  playlist = import ./pls.nix { inherit pkgs lib; };
 
   mpv-tv = import ./mpv-tv.nix { inherit pkgs lib; };
 
@@ -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;
 }

packages/scripts/pls.nix

@@ -1,7 +1,5 @@
-{ pkgs }:
+{ lib, pkgs }:
 let
-  inherit (pkgs) lib;
-
   playlistAPI = "https://radio.lassul.us";
 
   sendIRC = pkgs.writers.writeDash "send-irc" ''

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

@@ -5,9 +5,9 @@ let
 in
 {
   imports = [
-    <niveum/configs/default.nix>
+    ../../configs/default.nix
-    <niveum/configs/battery.nix>
+    ../../configs/battery.nix
-    <niveum/configs/networkmanager.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, ... }: {
+{ config, lib, pkgs, modulesPath, ... }: {
-  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+  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/manakish/configuration.nix

@@ -1,7 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, ... }:
 let
   inherit (import <niveum/lib>) retiolumAddresses;

systems/zaatar/configuration.nix

@@ -5,20 +5,21 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    <home-manager/nixos>
+    "${self.inputs.home-manager}/nixos"
-    <niveum/configs/wpa_supplicant.nix>
+    ../configs/wpa_supplicant.nix
-    <niveum/configs/keyboard.nix>
+    ../configs/keyboard.nix
-    <niveum/modules/retiolum.nix>
+    ../modules/retiolum.nix
-    <niveum/configs/spacetime.nix>
+    ../configs/spacetime.nix
-    <niveum/configs/tuna.nix>
+    ../configs/nix.nix
-    <niveum/configs/sshd.nix>
+    ../configs/tuna.nix
-    <niveum/configs/version.nix>
+    ../configs/sshd.nix
-    <niveum/configs/gaslight.nix>
+    ../configs/version.nix
-    <niveum/configs/printing.nix>
+    ../configs/gaslight.nix
-    <niveum/configs/traadfri.nix>
+    ../configs/printing.nix
-    <niveum/configs/bvg.nix>
+    ../configs/traadfri.nix
-    <niveum/configs/moodle-dl/meinhark.nix>
+    ../configs/bvg.nix
-    <niveum/configs/monitoring/push.nix>
+    ../configs/moodle-dl/meinhark.nix
+    ../configs/monitoring/push.nix
     {
       nixpkgs.config.allowUnfree = true;
     }
@@ -39,7 +40,7 @@ in
     {
       environment.systemPackages =
       let
-        worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
+        worldradio = pkgs.callPackage ../packages/worldradio.nix {};
       in [
         (pkgs.writers.writeDashBin "mpv" ''
           ${pkgs.mpv}/bin/mpv --no-video "$@"

systems/zaatar/hardware-configuration.nix

@@ -1,5 +1,5 @@
-{ config, lib, pkgs, ... }: {
+{ modulesPath, config, lib, pkgs, ... }: {
-  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+  imports = [ "${modulesPath}/installer/scan/not-detected.nix" ];
 
   boot.initrd.availableKernelModules =
     [ "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc" ];