diff --git a/flake.lock b/flake.lock index 29e9a72..2f626db 100644 --- a/flake.lock +++ b/flake.lock @@ -205,27 +205,6 @@ "url": "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz" } }, - "nix-vscode-extensions": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755568911, - "narHash": "sha256-3hukAjjalnsIpH1N8jkacT5xHA0Z3f+TTW3O63mQWC0=", - "owner": "nix-community", - "repo": "nix-vscode-extensions", - "rev": "8bb1109dab2a4477e226144ba139066b7720af61", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-vscode-extensions", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1755330281, @@ -299,15 +278,15 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "nextcloud-twofactor-totp": "nextcloud-twofactor-totp", - "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "sops-nix": "sops-nix", - "treefmt-nix": "treefmt-nix" + "sops": "sops", + "treefmt": "treefmt", + "vscode-extensions": "vscode-extensions" } }, - "sops-nix": { + "sops": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -372,7 +351,7 @@ "type": "github" } }, - "treefmt-nix": { + "treefmt": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -409,6 +388,27 @@ "repo": "flake-utils", "type": "github" } + }, + "vscode-extensions": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1755655217, + "narHash": "sha256-S6Eaz7L+0Iyh/LyipHNk7+QSReFj8xbZAr4g+G5Pf0Q=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "283b5d15f1b1bfa5e745b9a90793b49fbd6239b0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 740daee..c8a7504 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - sops-nix = { + sops = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -28,7 +28,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - treefmt-nix = { + treefmt = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -38,7 +38,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-vscode-extensions = { + vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/flake/formatter.nix b/flake/formatter.nix index c3f4c72..20411ba 100644 --- a/flake/formatter.nix +++ b/flake/formatter.nix @@ -4,7 +4,7 @@ { pkgs, ... }: { formatter = - (inputs.treefmt-nix.lib.evalModule pkgs { + (inputs.treefmt.lib.evalModule pkgs { projectRootFile = "flake.nix"; programs = { nixfmt.enable = true; diff --git a/modules/home/programs/vscode.nix b/modules/home/programs/vscode.nix index 4814900..247abbb 100644 --- a/modules/home/programs/vscode.nix +++ b/modules/home/programs/vscode.nix @@ -15,7 +15,7 @@ package = pkgs-unstable.vscodium; profiles.default.extensions = let - inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx; + inherit (inputs.vscode-extensions.extensions.${pkgs.system}) open-vsx; in [ # Language Servers diff --git a/modules/home/sops.nix b/modules/home/sops.nix index 1f00af5..9c7a29f 100644 --- a/modules/home/sops.nix +++ b/modules/home/sops.nix @@ -11,7 +11,7 @@ let absoluteSecretsPath = "${self}/" + cfg.secretsFile; in { - imports = [ inputs.sops-nix.homeManagerModules.sops ]; + imports = [ inputs.sops.homeManagerModules.sops ]; options.custom.sops = { enable = lib.mkEnableOption ""; diff --git a/modules/system/sops.nix b/modules/system/sops.nix index 7935ced..04a3c79 100644 --- a/modules/system/sops.nix +++ b/modules/system/sops.nix @@ -11,7 +11,7 @@ let absoluteSecretsPath = "${self}/" + cfg.secretsFile; in { - imports = [ inputs.sops-nix.nixosModules.sops ]; + imports = [ inputs.sops.nixosModules.sops ]; options.custom.sops = { enable = lib.mkEnableOption "";