From 86f11dc3e7625c7c7c6810952f07c0226bf63099 Mon Sep 17 00:00:00 2001 From: noe Date: Sun, 27 Oct 2024 20:19:18 -0700 Subject: [PATCH] sync --- flake.lock | 137 +++++++++++++++++++++++--------------- nixos/client.nix | 2 +- nixos/features/podman.nix | 7 +- 3 files changed, 89 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 8c83590..1ebe451 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1730070491, + "narHash": "sha256-+RYCbdU6l4E4pr40++lrdhdE3gNC/BR54AL7xWG/YRU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "5c0c6aaa797d6ccbb6cdab14de0248135735709d", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -429,6 +429,34 @@ "url": "https://iceshrimp.dev/noe/withdrawal" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "lightrunner-emotes": { "inputs": { "fedi-emotes": "fedi-emotes_2", @@ -513,11 +541,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -528,11 +556,11 @@ }, "nixlib": { "locked": { - "lastModified": 1728781282, + "lastModified": 1729386149, "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -547,11 +575,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1729127034, - "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -626,11 +654,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1729314777, - "narHash": "sha256-wXXcuFeg4NMu4lX9WvwqoXNwKLKdmh5Wdhh3GK8ViYI=", + "lastModified": 1730084548, + "narHash": "sha256-kKupAepQ12lu7nf3PLixumVJsJFTT8K3TnF2ECV2pAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f3903a92795c2b7c6e7ab7fe6de5804b91a076b", + "rev": "4b0b590fa39550751323db7e0e099439b569cb2a", "type": "github" }, "original": { @@ -658,11 +686,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -674,11 +702,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -706,11 +734,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -722,11 +750,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -738,11 +766,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -767,11 +795,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729301771, - "narHash": "sha256-XBnrpP7a9oYOGiqHXoXRthRBVZbhhEZPE/6YVLqIrAU=", + "lastModified": 1730058276, + "narHash": "sha256-t4fyRWIiDBJiDBnqqnxnk9nfT1SDTZN+koJLiuKkIT8=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a8124ca7bc97e753f89da43b82bbc83d1125a32", + "rev": "a20fbbc4b9665ec215e7bea061a1d64f6fd652ce", "type": "github" }, "original": { @@ -788,11 +816,11 @@ ] }, "locked": { - "lastModified": 1725943815, - "narHash": "sha256-7UpgV2vHFgVC4k0pWS5JMYrjuWvhtoXseiIRs33GLlE=", + "lastModified": 1729316601, + "narHash": "sha256-sn/xeOAkY0vJbea0uxtmsiOlWatEApgyy3T1M2frgf8=", "ref": "refs/heads/main", - "rev": "0697e5f55b188b007612b1d4d5122c8774b05865", - "revCount": 88, + "rev": "095cf7f9b70c8d1006f28342537a9d58c8f1b241", + "revCount": 89, "type": "git", "url": "https://git.sapphic.engineer/noe/noe.sh" }, @@ -804,17 +832,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", + "lastModified": 1730044642, + "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "owner": "NuschtOS", "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", + "rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "type": "github" }, "original": { @@ -918,11 +947,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1004,11 +1033,11 @@ ] }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "type": "github" }, "original": { diff --git a/nixos/client.nix b/nixos/client.nix index a54d0ab..9c2c923 100644 --- a/nixos/client.nix +++ b/nixos/client.nix @@ -26,7 +26,7 @@ }; networking.nameservers = lib.mkForce [ - "100.80.255.88" + #"100.80.255.88" "10.100.69.69" ]; diff --git a/nixos/features/podman.nix b/nixos/features/podman.nix index a441ded..5a2a70e 100644 --- a/nixos/features/podman.nix +++ b/nixos/features/podman.nix @@ -6,8 +6,11 @@ enable = true; dockerSocket.enable = true; dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; - defaultNetwork.settings.ipv6_enabled = true; + defaultNetwork.settings = { + dns_enabled = true; + ipv6_enabled = true; + subnets = [{ gateway = "10.88.0.1"; subnet = "10.88.0.0/16"; } { gateway = "100.69.0.1"; subnet = "100.69.0.0/16"; }]; + }; }; };