diff --git a/flake.lock b/flake.lock index 2523748..0968725 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], @@ -26,12 +28,16 @@ "agenix-rekey": { "inputs": { "devshell": "devshell", - "flake-parts": "flake-parts", + "flake-parts": [ + "flake-parts" + ], "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": [ + "treefmt-nix" + ] }, "locked": { "lastModified": 1759699908, @@ -55,11 +61,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1769010248, - "narHash": "sha256-YPP6NN/N0lnhGkXnfWMzE2DwqrUZ9Vm7uk+qezhkXSA=", + "lastModified": 1769023541, + "narHash": "sha256-rcGJ7kz8+2XTSkHJrnW2OFnNvm93FRxsOCCK2AerdXE=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "eebb4827c4e638fda08862f4fd07edbb936c9b1e", + "rev": "39a9e3a89fd1c9bf39f7bf2f97226fdbbc71f782", "type": "github" }, "original": { @@ -215,11 +221,11 @@ ] }, "locked": { - "lastModified": 1769002073, - "narHash": "sha256-7U8upAZbrTUEvxK8T50xIi++71m0Koc7EgnlYD+ZpcQ=", + "lastModified": 1769020098, + "narHash": "sha256-bKz1T7NuW+3+fV2U7wvvs5cHdt6buTJJ8HUot7Kgbe0=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "09e0469a981a5b622bf72b5dc2e4ba18f6702574", + "rev": "1efb9de69942c552eafd83e2a7eb72d756c45965", "type": "github" }, "original": { @@ -277,27 +283,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "agenix-rekey", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "determinate", @@ -318,7 +303,7 @@ "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -338,27 +323,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat_2", @@ -408,27 +372,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -461,11 +404,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768974509, - "narHash": "sha256-V+Uv2EL6MMdYGF4Zg0sWHeRLSgqzC4to01taYDItCNY=", + "lastModified": 1769012261, + "narHash": "sha256-js4+Dq9mT8ZvCiK6SbQI5ckvBkxQM4ug+w4Yfnpeuls=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2f38ab793de773496d2184aa3aa377bc8c99557b", + "rev": "3bd6b28b5a479ca1bb0b643badc887ec9e725fe0", "type": "github" }, "original": { @@ -509,7 +452,7 @@ }, "nix": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "nixpkgs": "nixpkgs", "nixpkgs-23-11": "nixpkgs-23-11", @@ -550,7 +493,9 @@ }, "nix-vscode-extensions": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1768961914, @@ -687,11 +632,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768773494, - "narHash": "sha256-XsM7GP3jHlephymxhDE+/TKKO1Q16phz/vQiLBGhpF4=", + "lastModified": 1768940263, + "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77ef7a29d276c6d8303aece3444d61118ef71ac2", + "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03", "type": "github" }, "original": { @@ -732,22 +677,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1766025857, - "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1768940263, "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=", @@ -763,51 +692,21 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1768302833, - "narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "61db79b0c6b838d9894923920b612048e1201926", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": [ + "flake-parts" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1769009799, - "narHash": "sha256-GWvSz5L3q3sTcy399T7aQY96xgTWT1yBpNfUhIDfAok=", + "lastModified": 1769019932, + "narHash": "sha256-0Du7V5BwqxoEF1G0zV/81uYM8g9GHfTxHGnLmJVQfp4=", "owner": "nix-community", "repo": "NUR", - "rev": "3f4b1964a1e1a6e77f27a0049e4362ee5f10dcb9", + "rev": "73231fdcedc00e3bd8f381a4aa40e7dbf030cef9", "type": "github" }, "original": { @@ -818,14 +717,16 @@ }, "opencode": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1769011116, - "narHash": "sha256-NdDprTEWGvT1bQ6Tu+xBiWEV1x7ATtIE3gt710KyIxQ=", + "lastModified": 1769023543, + "narHash": "sha256-q77OpkDoSG4w5GpOBPOjX6R7ceyeQNeQrBE6+zZ55lY=", "owner": "anomalyco", "repo": "opencode", - "rev": "b10f4237439f6fd0754a305b53a4a318248d4597", + "rev": "b33cec485ae5c148413f60a72fdd530c8ceb58c2", "type": "github" }, "original": { @@ -888,19 +789,19 @@ "dgop": "dgop", "disko": "disko", "dms-plugin-registry": "dms-plugin-registry", - "flake-parts": "flake-parts_3", - "home-manager": "home-manager_2", + "flake-parts": "flake-parts_2", + "home-manager": "home-manager", "niri": "niri", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-facter-modules": "nixos-facter-modules", "nixos-generators": "nixos-generators", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "opencode": "opencode", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" } }, "systems": { @@ -921,28 +822,9 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "agenix-rekey", "nixpkgs" ] }, - "locked": { - "lastModified": 1735135567, - "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, "locked": { "lastModified": 1768158989, "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", diff --git a/flake.nix b/flake.nix index c0ded37..5c1dd92 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ nur.url = "github:nix-community/NUR"; nur.inputs.nixpkgs.follows = "nixpkgs"; + nur.inputs.flake-parts.follows = "flake-parts"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; @@ -41,16 +42,21 @@ disko.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.url = "github:numtide/treefmt-nix"; + treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.inputs.home-manager.follows = "home-manager"; agenix-rekey.url = "github:oddlama/agenix-rekey"; agenix-rekey.inputs.nixpkgs.follows = "nixpkgs"; + agenix-rekey.inputs.treefmt-nix.follows = "treefmt-nix"; + agenix-rekey.inputs.flake-parts.follows = "flake-parts"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + nix-vscode-extensions.inputs.nixpkgs.follows = "nixpkgs"; niri.url = "github:sodiboo/niri-flake"; niri.inputs.nixpkgs.follows = "nixpkgs"; @@ -64,5 +70,6 @@ dms-plugin-registry.inputs.nixpkgs.follows = "nixpkgs"; opencode.url = "github:anomalyco/opencode"; + opencode.inputs.nixpkgs.follows = "nixpkgs"; }; } diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix index f8ef521..3840270 100644 --- a/modules/programs/vscode.nix +++ b/modules/programs/vscode.nix @@ -169,6 +169,7 @@ in { "go" = true; "just" = true; "make" = true; + "uniq" = true; }; # Theme