Flake, flake-part+easy-host, remove unused inputs

IF YOU ARE NOT ME: I would not use this configuration. In the past I would feel confident telling you to drop in your own host and be off to the races, but right now users are in a state which required hard coding some of my nominal preferences. Read on for more specifics Completely refactors the flake.nix part of the repo. This removes my strange legacy code for directory-based hosts+users in favor of using easy-host and flake-parts. As a result of this some specialArgs were lost, namely the list of users and the username being passed. I think this is the right way to go in the short term, but it has lead to some hardcoded values. Namely "pan" is created as a user regardless of configuration In tandem with this is the deprecation of some modules which had inputs in flake which I wasn't using. I'm sure there is a better way to do this, but I didn't like downloading and caching them every time when I knew I wasn't using them. I'm currently very unhappy with the users part of this change, but that wasn't the goal of this branch. I will revisit in a larger commit.
Gitignore, add result directory
2025-11-19 09:36:27 -08:00 · 2025-11-19 09:34:34 -08:00 · 2025-11-19 09:34:27 -08:00 · 2025-11-05 08:25:01 -08:00
4 changed files with 39 additions and 37 deletions
--- a/flake.lock
+++ b/flake.lock
@ -75,11 +75,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1757075491,
-        "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=",
+        "lastModified": 1763416652,
+        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf",
+        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
        "type": "github"
      },
      "original": {
@ -91,11 +91,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1763415215,
-        "narHash": "sha256-20HAylsK5h/DiNMbYfL1xDjgzoMIFz3jCyoIjvoKL5I=",
-        "rev": "08b0ce8736510f816a25061c97d3ca51fb36d757",
+        "lastModified": 1763570812,
+        "narHash": "sha256-A42G8ulTZ1MFCR0VsLF21CoKi0XKGUYwtVBHGm5mFgQ=",
+        "rev": "f3b2f3496bd6d346cba475d0ba152a9d3a83dec7",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/08b0ce8736510f816a25061c97d3ca51fb36d757.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3b2f3496bd6d346cba475d0ba152a9d3a83dec7.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -114,11 +114,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761960361,
-        "narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=",
-        "rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe",
+        "lastModified": 1763435414,
+        "narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=",
+        "rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c47f62187601ea2991b79a9bacdbfdf76cd29fbe.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/192c92b603731fbc1bade6c1b18c8d8a0086f703.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -137,11 +137,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1757071535,
-        "narHash": "sha256-I3ppQKxd2oxQfwMCW04TSWnIwp5an5kTMY+tx0W8jaA=",
+        "lastModified": 1763538184,
+        "narHash": "sha256-6umNY06L6ZUjinthjVZIwyWyAjxOXSPhXfY0U1CVTWw=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "efa08fc58d7da5be64cfebc52b7dc44bf8d19ba9",
+        "rev": "85a16f400641eed912431efcec16f12e2100d46a",
        "type": "github"
      },
      "original": {
@ -170,11 +170,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1756926064,
-        "narHash": "sha256-5/1vyFRLvJWxhBgpPaV2orC0pjSgIny6JM6+joLyZok=",
+        "lastModified": 1763531615,
+        "narHash": "sha256-cMi8tz+0+gWtlYqVnyMv7phOeQ0/4WmzZ/lxCyraUVw=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "c69464c1288789020d9a086f86c970a7dc49b8c7",
+        "rev": "c722634c269ae97a5ea185691bcd0b8c73a600e5",
        "type": "github"
      },
      "original": {
@ -185,11 +185,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1763312402,
-        "narHash": "sha256-uuJnccye1O5FHnnHYBge1lN2Pq4Z2lp1E3+rc2zsUr4=",
-        "rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1",
+        "lastModified": 1763464769,
+        "narHash": "sha256-mU85VDFRIgKGq1EhT71bLjhvjJ5yuMEe0Ip1kwCbR80=",
+        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre897164.85a6c4a07faa/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre898015.6f374686605d/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@ -198,11 +198,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1757020766,
-        "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=",
+        "lastModified": 1763334038,
+        "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a",
+        "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
        "type": "github"
      },
      "original": {
@ -231,11 +231,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754988908,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "lastModified": 1763509310,
+        "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e",
        "type": "github"
      },
      "original": {
@ -279,11 +279,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1756869116,
-        "narHash": "sha256-SGcqX3amLH4xiA+dwF2Fu2mt1O8zHc60v0+NEZGDJhw=",
+        "lastModified": 1762747449,
+        "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "41e865c8d35468c67b991ef5a245a98b3e44108c",
+        "rev": "6338574bc5c036487486acde264f38f39ea15fad",
        "type": "github"
      },
      "original": {
--- a/hmModules/apps/git/app.nix
+++ b/hmModules/apps/git/app.nix
@ -12,10 +12,12 @@
  config = lib.mkIf config.git.enable {
    programs.git = {
      enable = true;
-      userName = config.git.username;
-      userEmail = config.git.email;
-      extraConfig = {
-        user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+      settings = {
+        user = {
+          name = config.git.username;
+          email = config.git.email;
+          signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+        };
        gpg.format = "ssh";
        commit.gpgSign = "true";
        tag.gpgSign = "true";
--- a/hmModules/apps/niri/app.nix
+++ b/hmModules/apps/niri/app.nix
@ -53,8 +53,8 @@
        binds = with config.lib.niri.actions; {
          "Mod+Return".action= spawn "${config.defaultApps.terminal}";
          "Mod+Shift+Return".action = spawn "${pkgs.fuzzel}/bin/fuzzel";
-          "Mod+P".action = screenshot;
-          "Mod+Shift+P".action = screenshot-window;
+          "Mod+P".action.screenshot = [];
+          "Mod+Shift+P".action.screenshot-window = [];

          "Mod+Tab".action = switch-preset-column-width;
          "Mod+Shift+Q".action = quit;
--- a/nixosModules/services/caddy/service.nix
+++ b/nixosModules/services/caddy/service.nix
@ -20,7 +20,7 @@
      '';
      package = pkgs.caddy.withPlugins {
        plugins = [ "github.com/caddy-dns/porkbun@v0.3.1" ];
-        hash = "sha256-g/Nmi4X/qlqqjY/zoG90iyP5Y5fse6Akr8exG5Spf08=";
+        hash = "sha256-j/GODingW5BhfjQRajinivX/9zpiLGgyxvAjX0+amRU=";
      };
      virtualHosts = config.caddy.vhosts;
      email = config.caddy.adminEmail;
Author	SHA1	Message	Date
Julia Lange	13b79063f8	Flake, flake-part+easy-host, remove unused inputs IF YOU ARE NOT ME: I would not use this configuration. In the past I would feel confident telling you to drop in your own host and be off to the races, but right now users are in a state which required hard coding some of my nominal preferences. Read on for more specifics Completely refactors the flake.nix part of the repo. This removes my strange legacy code for directory-based hosts+users in favor of using easy-host and flake-parts. As a result of this some specialArgs were lost, namely the list of users and the username being passed. I think this is the right way to go in the short term, but it has lead to some hardcoded values. Namely "pan" is created as a user regardless of configuration In tandem with this is the deprecation of some modules which had inputs in flake which I wasn't using. I'm sure there is a better way to do this, but I didn't like downloading and caching them every time when I knew I wasn't using them. I'm currently very unhappy with the users part of this change, but that wasn't the goal of this branch. I will revisit in a larger commit.	2025-11-19 09:36:27 -08:00
Julia Lange	728f628f70	Gitignore, add result directory	2025-11-19 09:34:34 -08:00
Julia Lange	34de3e8028	Flake update 2025-11-05 & Niri fix	2025-11-19 09:34:27 -08:00
Julia Lange	1e89810074	Caddy, DNS Challenges; Headscale, Magic_dns Changed to using Porkbun DNS Challenges for Caddy. This enables wildcard certificates. Documentation - https://caddyserver.com/docs/caddyfile/patterns#wildcard-certificates - https://caddyserver.com/docs/automatic-https#dns-challenge Changed headscale to use a domain I own instead of the beautiful madoka OP.	2025-11-05 08:25:01 -08:00