Add my user to the podman group for socket access.

For some reason I have to list the snapshot content before Restic can access it.
Minor reformat.
2025-06-18 08:14:07 -04:00 · 2025-06-18 08:13:32 -04:00 · 2025-06-18 08:12:33 -04:00 · 2025-06-18 08:11:27 -04:00 · 2025-06-18 08:09:45 -04:00 · 2025-06-18 08:09:09 -04:00
7 changed files with 128 additions and 104 deletions
--- a/flake.lock
+++ b/flake.lock
@ -62,11 +62,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@ -75,6 +75,54 @@
        "type": "github"
      }
    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "simple-nixos-mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -103,11 +151,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747556831,
-        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
        "type": "github"
      },
      "original": {
@ -119,11 +167,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1747723695,
-        "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
+        "lastModified": 1749195551,
+        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
+        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
        "type": "github"
      },
      "original": {
@ -149,38 +197,7 @@
        "type": "github"
      }
    },
-    "nixpkgs-24_05": {
-      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgsUnstable": {
-      "locked": {
-        "lastModified": 1747542820,
-        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
+    "nixpkgs-25_05": {
      "locked": {
        "lastModified": 1747610100,
        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
@ -196,19 +213,52 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
+    "nixpkgsUnstable": {
      "locked": {
-        "lastModified": 1717602782,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
        "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1749494155,
+        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "88331c17ba434359491e8d5889cce872464052c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "root": {
@ -225,21 +275,21 @@
      "inputs": {
        "blobs": "blobs",
        "flake-compat": "flake-compat",
+        "git-hooks": "git-hooks",
        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-24_05": "nixpkgs-24_05",
-        "utils": "utils"
+        "nixpkgs-25_05": "nixpkgs-25_05"
      },
      "locked": {
-        "lastModified": 1734885828,
-        "narHash": "sha256-G0fB1YBlkalu8lLGRB07K8CpUWNVd+unfrjNomSL7SM=",
+        "lastModified": 1747965231,
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "636b82f4175e3f6b1e80d2189bb0469e2ae01a55",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.05",
+        "ref": "nixos-25.05",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
@ -258,39 +308,6 @@
        "repo": "default",
        "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"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -8,7 +8,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    agenix.url = "github:ryantm/agenix";
-    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
  };

  outputs =
--- a/hosts/flynode/default.nix
+++ b/hosts/flynode/default.nix
@ -37,8 +37,6 @@
    hostId = "9dfa34d8";
  };

-  time.timeZone = "America/Chicago";
-
  i18n.defaultLocale = "en_US.UTF-8";
  console.keyMap = "us";

--- a/roles/gui.nix
+++ b/roles/gui.nix
@ -13,22 +13,26 @@
    };
    xserver = {
      enable = true;
-      xkb.layout = "us";
-      displayManager.lightdm = {
+      displayManager.gdm = {
        enable = true;
-        greeters.gtk = {
-          extraConfig = ''
-            a11y-states = +reader
-            reader = orca
-          '';
-        };
+        wayland = false;
      };
+      xkb.layout = "us";
+      # displayManager.lightdm = {
+      #   enable = true;
+      #   greeters.gtk = {
+      #     extraConfig = ''
+      #       a11y-states = +reader
+      #       reader = orca
+      #     '';
+      #   };
+      # };
      excludePackages = [ pkgs.xterm ];
    };
  };

-  users.users.lightdm.extraGroups = [
-    "pipewire"
-    "pulse-access"
-  ];
+  # users.users.lightdm.extraGroups = [
+  #   "pipewire"
+  #   "pulse-access"
+  # ];
 }
--- a/roles/laptop.nix
+++ b/roles/laptop.nix
@ -1,6 +1,8 @@
 {
-  services.logind = {
+  services = {
+    logind = {
      lidSwitch = "suspend-then-hibernate";
      lidSwitchExternalPower = "ignore";
    };
+  };
 }
--- a/roles/restic.nix
+++ b/roles/restic.nix
@ -13,7 +13,9 @@
    backupPrepareCommand = ''
      #!${pkgs.bash}/bin/sh
      ${pkgs.zfs}/bin/zfs snapshot zpool/home@restic
+      ${pkgs.coreutils}/bin/ls /home/.zfs/snapshot/restic
      ${pkgs.zfs}/bin/zfs snapshot zpool/var@restic
+      ${pkgs.coreutils}/bin/ls /var/.zfs/snapshot/restic
    '';
    backupCleanupCommand = ''
      #!${pkgs.bash}/bin/sh
--- a/users/nolan/default.nix
+++ b/users/nolan/default.nix
@ -13,6 +13,7 @@
      "networkmanager"
      "pipewire"
      "pulse-access"
+      "podman"
    ];
    shell = pkgs.fish;
  };
Author	SHA1	Message	Date
Nolan Darilek	525a896506	Add my user to the podman group for socket access.	2025-06-18 08:14:07 -04:00
Nolan Darilek	604239fd0a	For some reason I have to list the snapshot content before Restic can access it.	2025-06-18 08:13:32 -04:00
Nolan Darilek	89aca57f76	Minor reformat.	2025-06-18 08:12:33 -04:00
Nolan Darilek	021c26b82c	Disable LightDM, switch to the regular GTK greeter, and disable Wayland for now.	2025-06-18 08:11:27 -04:00
Nolan Darilek	9035ebe6bc	Remove timezone so it can be set/changed automatically.	2025-06-18 08:09:45 -04:00
Nolan Darilek	c1231dcab5	Bump dependencies.	2025-06-18 08:09:09 -04:00