loki: Make logind ignore power button, make suspend key hibernate the system

flake: Use overlay in devshell
flake.lock: Update
2024-10-03 11:59:29 +02:00 · 2024-10-03 08:36:01 +02:00 · 2024-10-03 08:35:14 +02:00 · 2024-10-03 08:34:36 +02:00 · 2024-10-03 08:34:20 +02:00
7 changed files with 189 additions and 19 deletions
--- a/flake.lock
+++ b/flake.lock
@ -193,11 +193,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727856734,
-        "narHash": "sha256-YGKkZJGZiopMia83mf04zbK2p2OHdtbyJq05jkmGGis=",
+        "lastModified": 1727872461,
+        "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "da8f49246ce226b70feaf132d9b73a4cb7595f10",
+        "rev": "568727a884ae7cd9f266bd19aea655def8cafd78",
        "type": "github"
      },
      "original": {
@ -217,11 +217,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1727860369,
-        "narHash": "sha256-sS83Q/2pl6U+LnRKVH95ntBRIpzr2x1llLPZlfX0GXg=",
+        "lastModified": 1727886024,
+        "narHash": "sha256-9cpTSjtShCU5MJwEm3cbL2pALTMwjCDTM3zeQ1wrkRI=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "7bdcd77e2b8fd8e10d8d8bfae5ba7302dbd69d3e",
+        "rev": "a483757de48eba86f4ab373fd522341555aecfd7",
        "type": "github"
      },
      "original": {
@ -575,11 +575,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1727444402,
-        "narHash": "sha256-IhKB3RPTrblfiq6DW9MiGrS0ULcn/0qWtlefL+Gfg0o=",
+        "lastModified": 1727872811,
+        "narHash": "sha256-78hOotCZ/G8l4nyWPdMWSOojdJ5NwHTR0usBVVBNTtU=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "04f643d06b6f3f79cb289a8c94f051b012e1750e",
+        "rev": "e832ffc16b09b1b5c7c1224532d03ed3ce68afd0",
        "type": "github"
      },
      "original": {
@ -780,11 +780,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1727634051,
-        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
        "type": "github"
      },
      "original": {
@ -880,11 +880,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727836133,
-        "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=",
+        "lastModified": 1727922550,
+        "narHash": "sha256-pJoN5Qd83coaoEJmpkxw+cuh89IJORvLm8qyw3GMLIQ=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "02321540b0c8000b36889b1b974d1fec585b25a4",
+        "rev": "5e3eee4bc42a2504653bedfe95bceda9a1e85ae7",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -219,10 +219,16 @@
          inputs',
          pkgs,
          config,
+          system,
          ...
        }:
        {

+          _module.args.pkgs = import inputs.nixpkgs {
+            inherit system;
+            overlays = [ self.overlays.default ];
+          };
+
          pre-commit = {
            settings = {
              hooks = {
@ -258,7 +264,7 @@

          packages = {
            dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
-            git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
+            git-repo-go = pkgs.git-repo-go;
            hassbridge = pkgs.callPackage ./pkgs/hassbridge { };
            peakperf = pkgs.callPackage ./pkgs/peakperf { };
            tinyows = pkgs.callPackage ./pkgs/tinyows { };
--- a/machines/loki/barman.nix
+++ b/machines/loki/barman.nix
@ -0,0 +1,32 @@
+{ pkgs, config, ... }:
+{
+  services.barman = {
+    enable = true;
+    package = (
+      pkgs.barman.overrideAttrs (prevAttrs: {
+        propagatedBuildInputs = prevAttrs.propagatedBuildInputs ++ [ pkgs.python3Packages.distutils ];
+      })
+    );
+
+    settings = {
+      barman = {
+        # log_file = "/var/log/barman/barman.log";
+        configuration_files_directory = "/etc/barman.d";
+        create_slot = "auto";
+      };
+    };
+    servers = {
+      ha = {
+        description = "Home Assistant database";
+        conninfo = "host=10.0.0.254 user=postgres dbname=homeassistant passfile=${config.sops.secrets.barman-passwords.path}";
+        wal_streaming_conninfo = "host=10.0.0.254 user=postgres dbname=homeassistant passfile=${config.sops.secrets.barman-passwords.path}";
+        streaming_archiver = true;
+        backup_method = "postgres";
+        slot_name = "barman";
+        retention_policy = "RECOVERY WINDOW OF 4 WEEKS";
+      };
+    };
+
+    # passwordsFile = config.sops.secrets.barman-passwords.path;
+  };
+}
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@ -8,6 +8,7 @@
    nixos-hardware.nixosModules.common-pc-ssd

    # ./vm.nix
+    ./barman.nix

    ../../users/erwin
    ../../users/root
@ -379,6 +380,17 @@
      '';
    };

+    logind = {
+      hibernateKey = "ignore";
+      powerKey = "ignore";
+      rebootKey = "ignore";
+      suspendKey = "hibernate";
+      hibernateKeyLongPress = "ignore";
+      powerKeyLongPress = "ignore";
+      rebootKeyLongPress = "ignore";
+      suspendKeyLongPress = "ignore";
+    };
+
    openssh.enable = true;

    colord.enable = true;
@ -543,6 +555,10 @@
      owner = "systemd-network";
    };
    k3s-token = { };
+
+    barman-passwords = {
+      owner = "barman";
+    };
  };

  # This value determines the NixOS release from which the default
--- a/machines/loki/secrets.yaml
+++ b/machines/loki/secrets.yaml
@ -5,6 +5,7 @@ livebook-password: ENC[AES256_GCM,data:FaMIr0GxLTvAzrYt7blGbJuGDbr+lDiIMnvY2c/r,
 renovate_env: ENC[AES256_GCM,data:mzeS0FXsycD4hWMzRMgeEgTY+x2QtYtxmhcFCJcjwlD/q577kprHaU8otr1sOu9mwNud7K8kJGk=,iv:MMhr6CPsyvmP7+dKJUwt9cjnATm9JKZ/KbG4Dkj7hJ0=,tag:ubLmcW/CtT/uPiyswvr93w==,type:str]
 wireguard-horus-privkey: ENC[AES256_GCM,data:JVhdbvNqfdPWFCg24F56Hmu1Tf/EA6BOqa1uPuu8C/FrJhNaGi4S+KYOook=,iv:z8cq4C5vu/QqJ3UZdL1zEH22Ht3rKSbdHgAQbRSk8Kk=,tag:AVBvV8wJqw5jgDRiES89eQ==,type:str]
 k3s-token: ENC[AES256_GCM,data:agr9ihvrufHJ+zsWUTT7tT6oXwhQfp1VjlzvL/YrjhfsQsWdA2wqQOBG8Fgi6gDlqz+3DwWr3wdy/jclEEwrnA==,iv:zgYrN9CSraugO+LMIpJ2jDvxjCnQ9a3GHj6ffO/K0uY=,tag:6en6lNNvNMyOVf1Rfow6ew==,type:str]
+barman-passwords: ENC[AES256_GCM,data:M7HCuXsq8kSqoEfbn94/Hdl1tvb93i5oDYOr+QeuDVD33aF/xxuOwDVZM7wz7OcuozV7f6URtMGDy26KaHqekWhn2hFoRi5WHOxjE7M6oYLP6V4F+IGQBeMOHjjzqjQ9ti/BfhGpi3oHf0RK4RxLCmoNzAfWuP6zZnCyKgwyxBVu6lCHG2I08CJ8w2novts8,iv:EMLqvGIb1WK71Aw+LWr7JrQydA89CTTOavsFUZ6M3G8=,tag:PXu0JVzHjbH9wQfijf9V7A==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -38,8 +39,8 @@ sops:
            c0dlMkVlRG9LYU00M2M3UGJpUkxDOWsKiwc5oM63ezv1TVng0zQOqILOxuRMU+j7
            hHl6AWg0iorXJ1IWmGxLINDAK/RQVEFLK6gRjfN7qB+6wdmrKl8seQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-07T22:49:34Z"
-    mac: ENC[AES256_GCM,data:e3HW2LmCFwxXt2QkKf7pGKrpBQLFETVzz6w4/EEtxSzcuFn7p/S0AYk/4/FPXO+Gke1ccklXINFb/Qk0KlaWeToNg3Pp19xt5b9apvJQsoXQOuzjxqHDRkwZjGIFsYUvVgt/YNXs3AsTJzeMq0RjaI96xbwCitKvZl+sJP1nUBY=,iv:vA8xjOljqXwHwG+aJuCORgcHcNGgNf4L9RRV+dZv4+w=,tag:1Ukh7LQ/yTurdANzygxvXQ==,type:str]
+    lastmodified: "2024-10-01T18:48:17Z"
+    mac: ENC[AES256_GCM,data:TjNyX17d3PaScsPidp1wTc4DVK2Jl5/QRmlfH3WN/Hs+lsPn9BvFHmuy50Fs9TLfDjTBQ4WdreWw3Tz2SSBw12WO9tt7vt2b8MudLr1EqHP2rGN6u6cxz9xKYSm0v8j+mJFuL3VJvGAKdSvHS0lxo3SooEhONGkrhDwPidhhcks=,iv:9DhtXHJo6JTGJY/nPCAt11x8ZZwv/1B37dSaqFVAOiE=,tag:xfnRBecHFKOY09VTMBh9dw==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0
--- a/modules/barman/default.nix
+++ b/modules/barman/default.nix
@ -0,0 +1,114 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  cfg = config.services.barman;
+  iniFormat = pkgs.formats.ini { };
+  defaultUser = "barman";
+  defaultHome = "/var/lib/barman";
+in
+{
+  options.services.barman = {
+    enable = lib.mkEnableOption "barman";
+    package = lib.mkPackageOption pkgs "barman" { };
+
+    settings = lib.mkOption {
+      description = "Global barman configuration that goes in the `[barman]` section of `barman.conf`";
+      type = lib.types.submodule { freeformType = iniFormat.type; };
+      example = {
+        barman_user = defaultUser;
+        barman_home = defaultHome;
+        log_file = "/var/log/barman/barman.log";
+      };
+    };
+
+    servers = lib.mkOption {
+      description = "Server configurations";
+      type = lib.types.submodule { freeformType = iniFormat.type; };
+      default = { };
+    };
+
+    # passwordsFile = lib.mkOption {
+    #   description = "Path to the PostgreSQL password file. See [the documentation](https://www.postgresql.org/docs/current/libpq-pgpass.html) for the format.";
+    #   type = lib.types.path;
+    #   default = null;
+    # };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.barman.settings = {
+      barman = {
+        barman_user = lib.mkDefault defaultUser;
+        barman_home = lib.mkDefault defaultHome;
+        compression = lib.mkDefault "pigz";
+        backup_compression = lib.mkDefault "zstd";
+      };
+    };
+
+    users.users."${cfg.settings.barman.barman_user}" = {
+      isSystemUser = true;
+      home = cfg.settings.barman.barman_home;
+      createHome = true;
+      group = cfg.settings.barman.barman_user;
+    };
+
+    users.groups."${cfg.settings.barman.barman_user}" = { };
+
+    environment = {
+      etc =
+        {
+          "barman.conf" = {
+            user = cfg.settings.barman.barman_user;
+            source = iniFormat.generate "barman.conf" cfg.settings;
+          };
+        }
+        // (lib.mapAttrs' (name: serverConfig: {
+          name = "barman.d/${name}.conf";
+          value = {
+            user = cfg.settings.barman.barman_user;
+            source = iniFormat.generate "${name}.conf" { "${name}" = serverConfig; };
+          };
+        }) cfg.servers);
+
+      systemPackages = [ cfg.package ];
+    };
+    systemd = {
+      timers.barman = {
+        description = "Update timer for barman";
+        partOf = [ "barman.service" ];
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = "*:*:0";
+        };
+      };
+
+      services.barman = {
+        description = "Run barman maintenance tasks";
+        path = with pkgs; [
+          cfg.package
+          bash
+          bzip2
+          gzip
+          lz4
+          pigz
+          postgresql
+          zstd
+        ];
+        # environment = {
+        #   PGPASSFILE = lib.mkIf (cfg.passwordsFile != null) cfg.passwordsFile;
+        # };
+
+        serviceConfig = {
+          Type = "oneshot";
+          User = cfg.settings.barman.barman_user;
+          ExecStart = "${cfg.package}/bin/barman cron";
+          WorkingDirectory = cfg.settings.barman.barman_home;
+        };
+      };
+    };
+
+  };
+}
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@ -163,6 +163,7 @@ in
          waybar = {
            enable = true;
            sway = true;
+            cpuTempPath = "/sys/class/hwmon/hwmon2/temp2_input";
          };
          zathura.enable = true;
          zellij = {
Author	SHA1	Message	Date
Erwin Boskma	6f927ad62f	loki: Make logind ignore power button, make suspend key hibernate the system	2024-10-03 11:59:29 +02:00
Erwin Boskma	31e1c335e8	flake: Use overlay in devshell	2024-10-03 08:36:01 +02:00
Erwin Boskma	b04ec25a57	flake.lock: Update Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/da8f49246ce226b70feaf132d9b73a4cb7595f10?narHash=sha256-YGKkZJGZiopMia83mf04zbK2p2OHdtbyJq05jkmGGis%3D' (2024-10-02) → 'github:nix-community/disko/568727a884ae7cd9f266bd19aea655def8cafd78?narHash=sha256-4Pw3fVhN6xey5%2B2gUBm9nQJAjBqivffr%2Ba5ZsXYjzJ8%3D' (2024-10-02) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/7bdcd77e2b8fd8e10d8d8bfae5ba7302dbd69d3e?narHash=sha256-sS83Q/2pl6U%2BLnRKVH95ntBRIpzr2x1llLPZlfX0GXg%3D' (2024-10-02) → 'github:nix-community/emacs-overlay/a483757de48eba86f4ab373fd522341555aecfd7?narHash=sha256-9cpTSjtShCU5MJwEm3cbL2pALTMwjCDTM3zeQ1wrkRI%3D' (2024-10-02) • Updated input 'microvm': 'github:astro/microvm.nix/04f643d06b6f3f79cb289a8c94f051b012e1750e?narHash=sha256-IhKB3RPTrblfiq6DW9MiGrS0ULcn/0qWtlefL%2BGfg0o%3D' (2024-09-27) → 'github:astro/microvm.nix/e832ffc16b09b1b5c7c1224532d03ed3ce68afd0?narHash=sha256-78hOotCZ/G8l4nyWPdMWSOojdJ5NwHTR0usBVVBNTtU%3D' (2024-10-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9?narHash=sha256-S5kVU7U82LfpEukbn/ihcyNt2%2BEvG7Z5unsKW9H/yFA%3D' (2024-09-29) → 'github:nixos/nixpkgs/27e30d177e57d912d614c88c622dcfdb2e6e6515?narHash=sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs%3D' (2024-10-01) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/02321540b0c8000b36889b1b974d1fec585b25a4?narHash=sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg%3D' (2024-10-02) → 'github:oxalica/rust-overlay/5e3eee4bc42a2504653bedfe95bceda9a1e85ae7?narHash=sha256-pJoN5Qd83coaoEJmpkxw%2Bcuh89IJORvLm8qyw3GMLIQ%3D' (2024-10-03)	2024-10-03 08:35:14 +02:00
Erwin Boskma	dc87ea1eea	home: Configure temperature input for waybar	2024-10-03 08:34:36 +02:00
Erwin Boskma	bc89904efa	loki: Initial setup of barman	2024-10-03 08:34:20 +02:00