feat(atuin): use module

configs/default.nix

@@ -31,7 +31,7 @@ in {
       };
     }
     {
-      boot.cleanTmpDir = true;
+      boot.tmp.cleanOnBoot = true;
       boot.loader.timeout = 1;
     }
     {

configs/fzf.nix

@@ -21,17 +21,8 @@
     };
   };
 
-  programs.zsh.interactiveShellInit = ''
-    if [[ $options[zle] = on ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.zsh
-      . ${pkgs.fzf}/share/fzf/key-bindings.zsh
-    fi
-  '';
-
-  programs.bash.interactiveShellInit = ''
-    if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.bash
-      . ${pkgs.fzf}/share/fzf/key-bindings.bash
-    fi
-  '';
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
 }

configs/packages.nix

@@ -124,7 +124,7 @@ in {
     electrum
     inkscape
     astrolog
-    unstablePackages.obsidian
+    obsidian
     anki-bin # flashcards
     jbofihe # lojbanic software
     zoom-us # video conferencing
@@ -261,9 +261,9 @@ in {
     libreoffice
     # gnumeric
     dia
-    unstablePackages.pandoc
+    pandoc
     niveumPackages.man-pandoc
-    unstablePackages.typst
+    typst
     # proselint
     asciidoctor
     wordnet

configs/sshd.nix

@@ -11,8 +11,10 @@ in {
   services.openssh = {
     enable = true;
     ports = [sshPort];
-    passwordAuthentication = false;
-    forwardX11 = true;
+    settings = {
+      PasswordAuthentication = false;
+      X11Forwarding = true;
+    };
   };
 
   users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;

flake.lock

@@ -80,26 +80,41 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": [
-          "flake-utils"
         ]
       },
       "locked": {
-        "lastModified": 1681092193,
-        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
+        "lastModified": 1685599623,
+        "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
+        "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.11",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -178,16 +193,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684398685,
-        "narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=",
+        "lastModified": 1685865905,
+        "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c",
+        "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -224,6 +239,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1659446231,
+        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1684629675,
@@ -364,14 +395,25 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telebots": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs-old"
-        ]
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1677156381,

flake.nix

@@ -4,11 +4,11 @@
   inputs = {
     agenix.url = "github:ryantm/agenix";
     flake-utils.url = "github:numtide/flake-utils";
-    home-manager.url = "github:nix-community/home-manager/release-22.11";
+    home-manager.url = "github:nix-community/home-manager/release-23.05";
     menstruation-backend.url = "github:kmein/menstruation.rs";
     menstruation-telegram.url = "github:kmein/menstruation-telegram";
     nixinate.url = "github:matthewcroughan/nixinate";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
     nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
     nur.url = "github:nix-community/NUR";
@@ -24,7 +24,6 @@
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix.inputs.home-manager.follows = "home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.inputs.utils.follows = "flake-utils";
     menstruation-backend.inputs.flake-utils.follows = "flake-utils";
     menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
     menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
@@ -39,8 +38,6 @@
     scripts.inputs.flake-utils.follows = "flake-utils";
     scripts.inputs.nixpkgs.follows = "nixpkgs";
     scripts.inputs.rust-overlay.follows = "rust-overlay";
-    telebots.inputs.flake-utils.follows = "flake-utils";
-    telebots.inputs.nixpkgs.follows = "nixpkgs-old";
     tinc-graph.inputs.flake-utils.follows = "flake-utils";
     tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
     tinc-graph.inputs.rust-overlay.follows = "rust-overlay";

lib/i3status-rust.nix

@@ -13,7 +13,7 @@
     '';
 in {
   theme = {
-    name = "plain";
+    theme = "plain";
     overrides = {
       critical_fg = colours.red.bright;
       good_fg = colours.green.bright;
@@ -30,15 +30,14 @@ in {
       separator_fg = colours.black.bright;
     };
   };
-  icons.name = "awesome6";
-  icons.overrides.rss = "";
+  icons.icons = "awesome6";
   icons.overrides.vpn = "";
   icons.overrides.irc = "";
   block = [
     {
       block = "weather";
       autolocate = true;
-      format = "{location}: {temp}C";
+      format = "$icon $location: $temp";
       service = {
         name = "openweathermap";
         city_id = "2950159";
@@ -73,12 +72,6 @@ in {
       info = ["total"];
       warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"];
     }
-    {
-      block = "custom";
-      interval = 10;
-      command = "newsboat-unread-count";
-      json = true;
-    }
     {
       block = "custom";
       interval = 10;
@@ -153,6 +146,12 @@ in {
       json = true;
       hide_when_empty = true;
     }
+    {
+      block = "service_status";
+      service = "hu-vpn";
+      active_format = "^icon_vpn";
+      inactive_format = "";
+    }
     {
       block = "custom";
       interval = 5;
@@ -168,7 +167,7 @@ in {
     {
       block = "net";
       device = wirelessInterface;
-      format = "{ssid} {signal_strength}";
+      format = "$icon $ssid $signal_strength";
     }
     {
       block = "battery";
@@ -176,17 +175,14 @@ in {
     }
     {
       block = "sound";
-      on_click = "pavucontrol";
     }
     {
       block = "disk_space";
-      format = "{icon} {available}";
+      format = "$icon $available";
     }
     {
       block = "memory";
-      display_type = "memory";
-      format_mem = "{mem_used;G}";
-      clickable = false;
+      format = "$icon $mem_used.eng(prefix:G)";
     }
     {block = "load";}
     {

systems/ful/configuration.nix

@@ -93,5 +93,5 @@ in {
   environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
 
   # since 22.05 timeout fails?
-  systemd.services.systemd-networkd-wait-online.enable = false;
+  # systemd.services.systemd-networkd-wait-online.enable = false;
 }

systems/makanek/gitea.nix

@@ -4,9 +4,9 @@ let
 in {
   services.gitea = {
     enable = true;
-    rootUrl = domain;
     appName = "code.kmein.de";
     settings = {
+      server.ROOT_URL = domain;
       server.SSH_PORT = sshPort;
       service.DISABLE_REGISTRATION = true;
     };

systems/makanek/hardware-configuration.nix

@@ -16,7 +16,6 @@
     extraModulePackages = [];
     loader.grub = {
       enable = true;
-      version = 2;
       devices = ["/dev/sda"];
       configurationLimit = 3;
     };

systems/makanek/nextcloud.nix

@@ -23,7 +23,7 @@ in {
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud25;
+    package = pkgs.nextcloud26;
 
     https = true;
     enableBrokenCiphersForSSE = false;

systems/zaatar/atuin.nix

@@ -6,15 +6,8 @@
   inherit (import ../../lib) tmpfilesConfig;
 in {
   services.postgresql = {
-    enable = true;
     dataDir = "/var/state/postgresql/${config.services.postgresql.package.psqlSchema}";
-    ensureDatabases = ["atuin"];
-    ensureUsers = [
-      {
-        name = "atuin";
-        ensurePermissions."DATABASE atuin" = "ALL PRIVILEGES";
-      }
-    ];
+    package = pkgs.postgresql_11;
   };
 
   services.postgresqlBackup = {
@@ -32,27 +25,10 @@ in {
     })
   ];
 
-  users.groups.atuin = {};
-  users.users.atuin = {
-    isSystemUser = true;
-    group = "atuin";
-    home = "/run/atuin";
-    createHome = true;
+  services.atuin = {
+    host = "0.0.0.0";
+    openFirewall = true;
+    openRegistration = true;
+    port = 8888;
   };
-
-  systemd.services.atuin = {
-    wantedBy = ["multi-user.target"];
-    environment = {
-      ATUIN_HOST = "0.0.0.0";
-      ATUIN_PORT = "8888";
-      ATUIN_OPEN_REGISTRATION = "true";
-      ATUIN_DB_URI = "postgres:///atuin";
-    };
-    serviceConfig = {
-      User = "atuin";
-      ExecStart = "${pkgs.atuin}/bin/atuin server start";
-      Restart = "on-failure";
-    };
-  };
-  networking.firewall.allowedTCPPorts = [8888];
 }

systems/zaatar/configuration.nix

@@ -81,7 +81,7 @@ in {
   ];
 
   # since 22.05 timeout fails?
-  systemd.services.systemd-networkd-wait-online.enable = false;
+  # systemd.services.systemd-networkd-wait-online.enable = false;
 
   networking = {
     hostName = "zaatar";

systems/zaatar/moodle-dl-meinhark.nix

@@ -7,7 +7,7 @@
   moodle-dl-package = pkgs.moodle-dl.overrideAttrs (old:
     old
     // {
-      patches = [../../packages/moodle-dl/telegram-format.patch];
+      # patches = [../../packages/moodle-dl/telegram-format.patch]; TODO?
     });
 in {
   age.secrets = {