diff --git a/flake.lock b/flake.lock index 97303495..4211fa8f 100644 --- a/flake.lock +++ b/flake.lock @@ -51,31 +51,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "flake-utils": [ - "tritonshell", - "flake-utils" - ], - "nixpkgs": [ - "tritonshell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", - "owner": "numtide", - "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -128,39 +103,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -300,22 +242,6 @@ "type": "github" } }, - "nixos-22-05": { - "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1731403644, @@ -333,32 +259,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-24-05": { - "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -386,12 +296,8 @@ "lix-module": "lix-module", "nix-darwin": "nix-darwin", "nix-direnv": "nix-direnv", - "nixos-22-05": "nixos-22-05", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-24-05": "nixpkgs-24-05", - "triton-vmtools": "triton-vmtools", - "tritonshell": "tritonshell", "unstable": "unstable" } }, @@ -440,21 +346,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -476,53 +367,6 @@ "type": "github" } }, - "triton-vmtools": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "vmtools", - "lastModified": 1698443513, - "narHash": "sha256-wX2JIJ3JmJn6MAurdyjwZU+FZjLCwBArMrVSeeCb/ZU=", - "ref": "main", - "rev": "0d039dcf06afb8cbddd7ac54bae4d0d185f3e88e", - "revCount": 85, - "type": "git", - "url": "https://git.pub.solar/pub-solar/infra-vintage" - }, - "original": { - "dir": "vmtools", - "ref": "main", - "type": "git", - "url": "https://git.pub.solar/pub-solar/infra-vintage" - } - }, - "tritonshell": { - "inputs": { - "devshell": "devshell", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724149317, - "narHash": "sha256-c3eJQ+9zqU0XrfGrBWB5zUuPkCLQg3w04iNHfO8CBWU=", - "ref": "main", - "rev": "c829fa6f6f1e03ebf8d64f83fc27623beaae7bbb", - "revCount": 69, - "type": "git", - "url": "https://git.pub.solar/teutat3s/tritonshell" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://git.pub.solar/teutat3s/tritonshell" - } - }, "unstable": { "locked": { "lastModified": 1731319897, diff --git a/flake.nix b/flake.nix index f9b2592f..e54a520f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,7 @@ inputs = { # Track channels with commits tested and built by hydra - nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05"; - nixpkgs-24-05.url = "github:nixos/nixpkgs/nixos-24.05"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; flake-compat.url = "github:edolstra/flake-compat"; @@ -44,13 +42,6 @@ invoiceplane-template.url = "git+https://git.pub.solar/momo/invoiceplane-templates.git"; invoiceplane-template.inputs.nixpkgs.follows = "nixpkgs"; invoiceplane-template.inputs.flake-parts.follows = "flake-parts"; - - # PubSolarOS additions - triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra-vintage?ref=main&dir=vmtools"; - triton-vmtools.inputs.nixpkgs.follows = "nixpkgs"; - - tritonshell.url = "git+https://git.pub.solar/teutat3s/tritonshell?ref=main"; - tritonshell.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = diff --git a/hosts/powder/powder.nix b/hosts/powder/powder.nix index 13658d2e..91eba9fb 100644 --- a/hosts/powder/powder.nix +++ b/hosts/powder/powder.nix @@ -42,8 +42,6 @@ vim wget caddy - # triton tools for retrieving metadata inside zones, e.g. mdata-get - inputs.triton-vmtools ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index 0a676926..4b9d8c9f 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -9,7 +9,6 @@ let psCfg = config.pub-solar; xdg = config.home-manager.users."${psCfg.user.name}".xdg; - tritonshell = flake.inputs.tritonshell; in { imports = [ @@ -84,7 +83,6 @@ in ]; programs.bash.initExtra = '' source ${config.age.secrets.environment-secrets.path} - source ${flake.inputs.tritonshell.packages.${pkgs.system}.triton-utils}/bin/ttp.sh _tailscale() { @@ -127,9 +125,6 @@ in } complete -F _tailscale tailscale - complete -C ${ - flake.inputs.nixos-22-05.legacyPackages.${pkgs.system}.terraform - }/bin/terraform terraform complete -C ${pkgs.opentofu}/bin/tofu tofu '';