feat(printing): no scanning, no hplip plugin, no waiting two hours for it to build ❤

configs/nix.nix

@@ -9,5 +9,16 @@
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = "experimental-features = nix-command flakes";
+    settings = {
+      substituters = [
+        "http://cache.prism.r"
+        "https://cache.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+        "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI="
+        "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+      ];
+    };
   };
 }

configs/printing.nix

@@ -1,17 +1,12 @@
 {pkgs, ...}: let
   inherit (import <niveum/lib>) localAddresses;
-  hp-driver = pkgs.hplipWithPlugin;
+  hp-driver = pkgs.hplip;
 in {
   services.printing = {
     enable = true;
     drivers = [hp-driver];
   };
 
-  hardware.sane = {
-    enable = true;
-    extraBackends = [hp-driver];
-  };
-
   environment.systemPackages = [
     pkgs.system-config-printer
   ];
@@ -36,7 +31,6 @@ in {
   ];
 }
 /*
- HP/hp-officejet_4650_series.ppd.gz
- drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
- */
-
+HP/hp-officejet_4650_series.ppd.gz
+drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
+*/

configs/stardict.nix

@@ -305,64 +305,64 @@ in {
   ];
 }
 /*
- https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
- https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
- http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
- http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
- http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
- http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
- 
- Duden_Rechtschreibung = pkgs.fetchzip {
-   url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
-   sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
- };
- Duden = pkgs.fetchzip {
-   url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
-   sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
- };
- FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
-   url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
-   sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
- };
- Cappeller = pkgs.fetchzip {
-   url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
-   sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
-   stripRoot = false;
- };
- Yates = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
-   stripRoot = false;
- };
- Wilson = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
-   sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
-   stripRoot = false;
- };
- SpokenSanskrit = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
-   sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
-   stripRoot = false;
- };
- Grassmann = pkgs.fetchzip {
-   url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
-   stripRoot = false;
- };
- Benfey = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
-   stripRoot = false;
- };
- ApteSa = pkgs.fetchzip {
-   url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
-   sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
-   stripRoot = false;
- };
- MacDonell = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
-   stripRoot = false;
- };
- */
+https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
+https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
+http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
+
+Duden_Rechtschreibung = pkgs.fetchzip {
+  url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
+  sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
+};
+Duden = pkgs.fetchzip {
+  url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
+  sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
+};
+FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
+  url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
+  sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
+};
+Cappeller = pkgs.fetchzip {
+  url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
+  sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
+  stripRoot = false;
+};
+Yates = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
+  stripRoot = false;
+};
+Wilson = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
+  sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
+  stripRoot = false;
+};
+SpokenSanskrit = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
+  sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
+  stripRoot = false;
+};
+Grassmann = pkgs.fetchzip {
+  url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
+  stripRoot = false;
+};
+Benfey = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
+  stripRoot = false;
+};
+ApteSa = pkgs.fetchzip {
+  url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
+  sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
+  stripRoot = false;
+};
+MacDonell = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
+  stripRoot = false;
+};
+*/
 

flake.nix

@@ -104,15 +104,42 @@
           dir = toString (home /.password-store);
           name = "shared";
         };
-        nixpkgs.file = toString (
-          if unstable
-          then inputs.nixos-unstable
-          else inputs.nixos-stable
-        );
+        nixpkgs.git = {
+          url = "https://github.com/NixOS/nixpkgs";
+          ref =
+            (
+              if unstable
+              then inputs.nixos-unstable
+              else inputs.nixos-stable
+            )
+            .rev;
+          shallow = true;
+        };
       }
       // nixos-stable.lib.mapAttrs' (name: value: {
         inherit name;
-        value.file = toString value;
+        value.git = {
+          url = let
+            github = x: "https://github.com/${x}";
+          in
+            {
+              home-manager = github "nix-community/home-manager";
+              menstruation-backend = github "kmein/menstruation.rs";
+              menstruation-telegram = github "kmein/menstruation-telegram";
+              nixos-unstable = github "NixOS/nixpkgs";
+              nix-writers = "https://cgit.krebsco.de/nix-writers";
+              recht = github "kmein/recht";
+              retiolum = github "krebs/retiolum";
+              stockholm = "https://cgit.lassul.us/stockholm";
+              scripts = github "kmein/scripts";
+              telebots = github "kmein/telebots";
+              tinc-graph = github "kmein/tinc-graph";
+              traadfri = github "kmein/traadfri";
+            }
+            .${name};
+          ref = value.rev;
+          shallow = true;
+        };
       }) (nixos-stable.lib.filterAttrs (name: _: builtins.elem name sources) inputs);
     deployScriptFor = {
       name,

lib/streams.nix

@@ -1783,43 +1783,43 @@ in
     }
   ]
 /*
-       (caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
-       (caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
- 
- CNN news in morse code
- http://cw.dimebank.com:8080/CNNslow
- http://cw.dimebank.com:8080/CNNfast
- 
- Orchestral
- http://orion.shoutca.st:8978/stream
- 
- LoFi / Chill
- http://ice55.securenetsystems.net/DASH76
- 
- News background music
- https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
- 
- ?
- http://94.23.221.158:9163/stream
- 
- Greek radio
- http://radio.hostchefs.net:8046/stream?1520818130148
- 
- : http://audiokrishna.com/stations/japa2.mp3
- http://185.105.4.53:2339//;stream.mp3
- http://cast5.servcast.net:1390/;stream.mp3
- 
- Hard rock
- http://andromeda.shoutca.st:9254/stream
- 
- Rock alternative
- http://icy.unitedradio.it/VirginRockAlternative.mp3
- 
- American nautical weather news
- http://ca.radioboss.fm:8149/stream
- 
- Christian radio in all languages
- https://jesuscomingfm.com/#
- tamazight http://live.jesuscomingfm.com:8462/;
- */
+      (caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
+      (caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
+
+CNN news in morse code
+http://cw.dimebank.com:8080/CNNslow
+http://cw.dimebank.com:8080/CNNfast
+
+Orchestral
+http://orion.shoutca.st:8978/stream
+
+LoFi / Chill
+http://ice55.securenetsystems.net/DASH76
+
+News background music
+https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
+
+?
+http://94.23.221.158:9163/stream
+
+Greek radio
+http://radio.hostchefs.net:8046/stream?1520818130148
+
+: http://audiokrishna.com/stations/japa2.mp3
+http://185.105.4.53:2339//;stream.mp3
+http://cast5.servcast.net:1390/;stream.mp3
+
+Hard rock
+http://andromeda.shoutca.st:9254/stream
+
+Rock alternative
+http://icy.unitedradio.it/VirginRockAlternative.mp3
+
+American nautical weather news
+http://ca.radioboss.fm:8149/stream
+
+Christian radio in all languages
+https://jesuscomingfm.com/#
+tamazight http://live.jesuscomingfm.com:8462/;
+*/
 

systems/ful/configuration.nix

@@ -39,7 +39,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
   users.users.root.passwordFile = toString <system-secrets/root.password>;

systems/kabsa/configuration.nix

@@ -19,9 +19,9 @@ in {
     promptColours.success = "cyan";
   };
 
-  nix = {
-    buildCores = 1;
-    maxJobs = 2;
+  nix.settings = {
+    cores = 1;
+    max-jobs = 2;
   };
 
   environment.systemPackages = [pkgs.minecraft];

systems/kabsa/hardware-configuration.nix

@@ -42,6 +42,6 @@
 
   zramSwap.enable = false;
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

systems/makanek/configuration.nix

@@ -100,7 +100,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
   environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];

systems/makanek/hardware-configuration.nix

@@ -29,5 +29,5 @@
   swapDevices = [];
   zramSwap.enable = true;
 
-  nix.maxJobs = lib.mkDefault 2;
+  nix.settings.max-jobs = lib.mkDefault 2;
 }

systems/makanek/menstruation.nix

@@ -7,7 +7,10 @@
   telegram = pkgs.callPackage <menstruation-telegram> {};
   backendPort = 8000;
 in {
-  services.redis.enable = true;
+  services.redis.servers.menstruation = {
+    enable = true;
+    port = 6379;
+  };
 
   environment.systemPackages = [pkgs.redis];
 
@@ -23,7 +26,7 @@ in {
     wants = [
       "network-online.target"
       "menstruation-backend.service"
-      "redis.service"
+      "redis-menstruation.service"
     ];
     wantedBy = ["multi-user.target"];
     environment = {

systems/zaatar/gaslight.nix

@@ -16,8 +16,8 @@
   ];
 }
 /*
- 
- ssh machine gaslight-stream | mpv -
- ssh machine gaslight-say "blablabla"
- */
+
+ssh machine gaslight-stream | mpv -
+ssh machine gaslight-say "blablabla"
+*/
 

systems/zaatar/hardware-configuration.nix

@@ -32,6 +32,6 @@
 
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }