diff --git a/flake.lock b/flake.lock index e0fe118..d28407f 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1792415997, - "narHash": "sha256-ShMVBHmTnReG1GD+VQaw6xwyuYbabLZPS28xSfajiaA=", + "lastModified": 1793023811, + "narHash": "sha256-MkfCvTv7kW8JiPKtZ7gk85Wa+WoTUccMd30YreUDr8w=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "c13dc99193a2adf072892c2e36e70316f4fcca61", + "rev": "48ddf622759f590470b69374fd999f08de96d190", "type": "github" }, "original": { @@ -30,16 +30,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1792011774, - "narHash": "sha256-vPeg7IGdJqJycfi5V31/pt7tZesCWoP+Hz/vo3uKo+k=", + "lastModified": 1792581414, + "narHash": "sha256-gdhGKCfsMUrWyFnf5TaaHM2ZQ1WYgTLOgGg4DlCaUHU=", "owner": "goauthentik", "repo": "authentik", - "rev": "410f46e5cf18f97a1f0056b30984a145242df55d", + "rev": "4ec0d19b98da3c329781894cd550da95d3033954", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2026.8.4", + "ref": "version/2026.8.5", "repo": "authentik", "type": "github" } @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1789770686, - "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=", + "lastModified": 1792526520, + "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=", "owner": "nix-community", "repo": "disko", - "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563", + "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1792274446, - "narHash": "sha256-AM1HmBeDnB2B3dSiXuCYeu7Me+lHNpz/P39lVxGJBuQ=", + "lastModified": 1792818383, + "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab3823b4b24c0c3ca984c1f3ee577fd6d667424c", + "rev": "24f2190587513b9c2f73db112a17844ae912d965", "type": "github" }, "original": { @@ -262,17 +262,17 @@ ] }, "locked": { - "lastModified": 1792708132, - "narHash": "sha256-KWzan2yw8+TNAom52z9fl7QLb9YtlmdBljrU3rHruG0=", - "ref": "refs/heads/main", - "rev": "db9eb1effdb826d92af10da9a15b6fa1a41adc57", - "revCount": 15, + "lastModified": 1793579471, + "narHash": "sha256-7NlQLctib6R8OKslnb7OCO2Gbk9iL7CTjUG89P/TJJw=", + "ref": "refs/heads/master", + "rev": "af1c9236b01b94af2e06e2e9741c99d828c0e299", + "revCount": 18, "type": "git", - "url": "file:///mnt/hdd_01/data/Dev/repos/hyprchrome-claude" + "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-claude.git" }, "original": { "type": "git", - "url": "file:///mnt/hdd_01/data/Dev/repos/hyprchrome-claude" + "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-claude.git" } }, "hyprchrome-files": { @@ -282,27 +282,27 @@ ] }, "locked": { - "lastModified": 1792599601, - "narHash": "sha256-gTialtsxWsqwDJP1g/WXq4zaAdPpxbTPfFNtRT8clvg=", - "ref": "refs/heads/m5-polish", - "rev": "e8a47ccc70b82193acfa595c1070343d6b91bd9e", - "revCount": 8, + "lastModified": 1793608086, + "narHash": "sha256-OJ5KPRyxM057oK7rTdCk5OnIBivLXo0x0fsPhTeVteI=", + "ref": "refs/heads/master", + "rev": "e97631daa4945e9d5c8c903f464270e6e6efbf06", + "revCount": 10, "type": "git", - "url": "file:///mnt/hdd_01/data/Dev/repos/hyprchrome-files" + "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-files.git" }, "original": { "type": "git", - "url": "file:///mnt/hdd_01/data/Dev/repos/hyprchrome-files" + "url": "ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-files.git" } }, "livesync-bridge": { "flake": false, "locked": { - "lastModified": 1792063966, - "narHash": "sha256-GW9e6Vr60/7U+Bx7m1KKzzijzu221nWWg/aVs5M38A8=", + "lastModified": 1793541212, + "narHash": "sha256-TAWgYQ1z0PkGUfvQriJp2ReBDhCr8zagbV99xp1BU9k=", "owner": "vrtmrz", "repo": "livesync-bridge", - "rev": "fc0e028d33b3a12ddee1322951375e05107edc55", + "rev": "5d3aa6fed69fefb8344356ffa4d60fe2d5538fa6", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1792357572, - "narHash": "sha256-2krnWSUcN06EYtUKqFxkbSIQP6NAfhMOrgnxZXB+dcc=", + "lastModified": 1793036394, + "narHash": "sha256-vKNDa2aF7mi8I5SJVlqtePTwel64sYEAiHQR7HbUpwk=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "f7a356f6789bc7d23f44bfbcdd95c71f0385cc1a", + "rev": "d6a7822a43744b6290a0e059bdd032d9b9a2ec94", "type": "github" }, "original": { @@ -378,17 +378,17 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1792357406, - "narHash": "sha256-We8OIJP/5q0nv2RVHQYfjRaHK6ZQuSM88eKa9BezUPk=", + "lastModified": 1792710296, + "narHash": "sha256-e79vMkWWeK7Rk3OjbK82yC+EgVgCCtG9wRMxO1ZP+vE=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "88fb7c16d04d162cb3e94beedb11a51705ec03fb", + "rev": "3858d60a2081f612739f07386ceac9b79f68274b", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "88fb7c16d04d162cb3e94beedb11a51705ec03fb", + "rev": "3858d60a2081f612739f07386ceac9b79f68274b", "type": "github" } }, @@ -419,11 +419,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1788562485, - "narHash": "sha256-tOCjZk7HheGqcyPtEWnMjCO6W9dZI6ATo/RpMsASeLg=", + "lastModified": 1793560706, + "narHash": "sha256-rdq2yGEPkX4pOZJ+7MvUgZuA9OzwEimx01JjoOX+GQ8=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "4d6a91388f113ecdd8aff478a50b947c584b0b2f", + "rev": "f9a3b08ea31c586ffee0e604af9dc7ffc22e9723", "type": "github" }, "original": { @@ -513,11 +513,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1792008544, - "narHash": "sha256-kZvMi1NCIh748Gfg5d9FLkSYnwvBrxoT51w+H1PBoRo=", + "lastModified": 1793171667, + "narHash": "sha256-8h9MU32SjnFWIWRdtP9vYVNV5QrVbai8Oo1LW1rAmwc=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "bc36798d8fcad7ee85ac139c8473e999afbf4a1d", + "rev": "58132e1d1f813b845382a2aeca4203b18d2ac807", "type": "github" }, "original": { @@ -566,11 +566,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1791956154, - "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", + "lastModified": 1792502884, + "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", + "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1792116957, - "narHash": "sha256-EjZqHKObBfIOeHZnMRVV87HB3pPq/WBkmRJWyFxmZu8=", + "lastModified": 1793494649, + "narHash": "sha256-Thn0OE71NF80ZfOMGCgJvKtbCcnnz0fToT/qsvb/Gtc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4", + "rev": "d357a2b54f0b6dc4aeb4e993190a52cf151b6f24", "type": "github" }, "original": { @@ -660,11 +660,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1792295010, - "narHash": "sha256-F7meJtbqGttmUoMmYjRRgkVs42sn7bh7vvRvLPlUN98=", + "lastModified": 1793526781, + "narHash": "sha256-2Cxxgpz1+cRgKZJFi12/9LG3aIBN66f2RvFs34Oj/A0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ce73368d1efd4d657e9064d29b144a52046b4e8", + "rev": "9bb52223f4f6a0cc606fd0852d8784f896c137d5", "type": "github" }, "original": { @@ -690,11 +690,11 @@ ] }, "locked": { - "lastModified": 1791170410, - "narHash": "sha256-pyru9MpuXRiyq0Bd4q0nHpL4T6HCuZT4B+alcgAYE4A=", + "lastModified": 1792499785, + "narHash": "sha256-mGOkvueuMGSRiD75ccxFzfEvSlIU9ztjFluHMKOtogY=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "953d35d03a51dbecaf3feb3fb679eb63e90ebeb4", + "rev": "a17819c85163988e063806ffc4f6d2716bc8ead8", "type": "github" }, "original": { @@ -795,8 +795,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "tbctl": "tbctl", - "tome": "tome", - "turtle-beach-swarm-re": "turtle-beach-swarm-re" + "tome": "tome" } }, "sops-nix": { @@ -806,11 +805,11 @@ ] }, "locked": { - "lastModified": 1792056300, - "narHash": "sha256-YU1LjDe1o2Ymg5zEiCHbmMXLkDCtxHQRiVqZ3nC5GGk=", + "lastModified": 1793052255, + "narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "44931708c62937c2b1bf7953902989fa5bb9ee1b", + "rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d", "type": "github" }, "original": { @@ -841,11 +840,11 @@ ] }, "locked": { - "lastModified": 1791840443, - "narHash": "sha256-wfk8wE8xKzxi3MswzEnBeKu+0Na0TFX8z1h8sVBgVZY=", + "lastModified": 1793410258, + "narHash": "sha256-MMfosPFbaOEEEZsfR3IdtbVrAft+HX+xvznK4ouzXH4=", "ref": "refs/heads/main", - "rev": "9a4c12883b36c8a9a860a6c121308c0763af662b", - "revCount": 30, + "rev": "4b02ee62d4f4ede5378d140c39154e6cb5aeef92", + "revCount": 46, "type": "git", "url": "file:///mnt/hdd_01/data/Dev/repos/openbeach" }, @@ -899,11 +898,11 @@ ] }, "locked": { - "lastModified": 1790542030, - "narHash": "sha256-U6m0B5+ALyOLYG4OVvtguLdem7iYgN6cIP5Q1RhM+g8=", + "lastModified": 1791885023, + "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6aca3b3649eb1edf472eca3e91e6bcc0c84a6ad3", + "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", "type": "github" }, "original": { @@ -912,26 +911,6 @@ "type": "github" } }, - "turtle-beach-swarm-re": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1791720939, - "narHash": "sha256-8MayzYPTXurGlD6nnI5QpRqZlu2Yt7x3OTjMccOYrjM=", - "ref": "refs/heads/main", - "rev": "a75d5121fc38a21349a34b4fd054c3d5140bdae1", - "revCount": 98, - "type": "git", - "url": "ssh://gitea@git.mgaction.town:2222/darman/turtle-beach-swarm-re.git" - }, - "original": { - "type": "git", - "url": "ssh://gitea@git.mgaction.town:2222/darman/turtle-beach-swarm-re.git" - } - }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -944,11 +923,11 @@ ] }, "locked": { - "lastModified": 1792151315, - "narHash": "sha256-PMtgvHuGijoIAtPtrBm7kJOI6fxzX4LYPAIK+QVGY+Y=", + "lastModified": 1792666911, + "narHash": "sha256-UWo7wDPi00YXOI1Io7g4vGKuCSPJ863kHJVDzsgqtoM=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "7aba73a3d85454f1118f8cf9de97979b4d26bcac", + "rev": "0fdaa03ea3c3c16dbb1fe4d69108f07227a4b42d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 021d5c5..4ca0aa8 100644 --- a/flake.nix +++ b/flake.nix @@ -67,12 +67,6 @@ url = "git+ssh://gitea@git.mgaction.town:2222/darman/honcho-console.git"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Turtle Beach Swarm II RE (KB7/KP7); terra uses its `release` module to - # take the KB7 out of host control after a warm reboot from Windows. - turtle-beach-swarm-re = { - url = "git+ssh://gitea@git.mgaction.town:2222/darman/turtle-beach-swarm-re.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; # tbctl (openbeach): KB7/KP7/Kone II Air CLI + desktop GUI on terra. # Local checkout for now (resolved path: Nix rejects the ~/Data symlink); # upstream is git+ssh://git@github.com/darman96/openbeach.git?ref=main. @@ -81,18 +75,17 @@ inputs.nixpkgs.follows = "nixpkgs"; }; # hyprchrome-claude: the HyprChrome desktop app around the claude CLI - # (terra). Dev version from the local checkout, like tbctl: it builds the - # checkout's last commit, so commit there, then + # (terra). Own repo on our gitea: push there, then # `nix flake update hyprchrome-claude` here. hyprchrome-claude = { - url = "git+file:///mnt/hdd_01/data/Dev/repos/hyprchrome-claude"; + url = "git+ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-claude.git"; inputs.nixpkgs.follows = "nixpkgs"; }; # hyprchrome-files: keyboard-first HyprChrome file manager (terra's - # default). Local checkout like hyprchrome-claude: commit there, then + # default). Own repo on our gitea: push there, then # `nix flake update hyprchrome-files` here. hyprchrome-files = { - url = "git+file:///mnt/hdd_01/data/Dev/repos/hyprchrome-files"; + url = "git+ssh://gitea@git.mgaction.town:2222/darman/hyprchrome-files.git"; inputs.nixpkgs.follows = "nixpkgs"; }; # NexusMods.App (terra): source of nixpkgs' package overridden with the diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 21cdd46..7943e3a 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -57,6 +57,7 @@ in settings = { user.name = "Erik Simon"; user.email = "mail@erik-s.dev"; + init.defaultBranch = "master"; }; }; diff --git a/hosts/terra/configuration.nix b/hosts/terra/configuration.nix index 59589e2..4454a0f 100644 --- a/hosts/terra/configuration.nix +++ b/hosts/terra/configuration.nix @@ -13,13 +13,9 @@ ../../services/desktop/qbittorrent-vpn.nix ../../services/desktop/star-citizen.nix ../../services/desktop/nexusmods-app.nix - inputs.turtle-beach-swarm-re.nixosModules.release inputs.tbctl.nixosModules.tbctl ]; - # Swarm leaves the KB7 in host control after a warm reboot from Windows. - services.turtle-beach-release.enable = true; - # tbctl CLI + GUI + tbd daemon/agent for the KB7/KP7/Kone II Air. services.tbctl = { enable = true; @@ -30,15 +26,16 @@ }; # hyprchrome-claude (dev): HyprChrome desktop app around the claude CLI, - # built from the local checkout (see the flake input). Needs `claude` on + # built from its gitea repo (see the flake input). Needs `claude` on # PATH, which home/desktop already provides. environment.systemPackages = [ inputs.hyprchrome-claude.packages.${pkgs.stdenv.hostPlatform.system}.default pkgs.teamspeak6-client # successor of the TeamSpeak 5 beta + pkgs.heroic # Epic/GOG/Amazon launcher ]; # hyprchrome-files (dev): the default file manager and file picker, built - # from the local checkout (see the flake input). Its home-manager module + # from its gitea repo (see the flake input). Its home-manager module # installs it with its fonts. Both defaults are set system-wide instead of # through the module: its defaultFileManager would make home-manager own # ~/.config/mimeapps.list, where apps register handlers, and its filePicker