diff --git a/flake.lock b/flake.lock index 5f5f28d..4246c50 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722526024, - "narHash": "sha256-kt9YUDyYOrTAwHdQgOlOYfuC4tqrLSVrmbiIDW7r3g0=", + "lastModified": 1725961517, + "narHash": "sha256-fRnGgth3NfdEPntdnY7btBxl94bXrTHGsO3GfQFYZfs=", "owner": "alexghr", "repo": "alacritty-theme.nix", - "rev": "a0bb7695365cd465a1cb5ac974468ad766d82f35", + "rev": "912f7de97495bbd06ce780041196aee5c43ba84b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "alacritty-theme_2": { "flake": false, "locked": { - "lastModified": 1722389905, - "narHash": "sha256-1tt4GL3KNa3S4dEFiRZf4B1+CM6e7/gO3Q34847lYkI=", + "lastModified": 1725333321, + "narHash": "sha256-cZ+ziE+VbQFpJ+iDS7X9Q2YC1Ziu+JITzDmX79BCcRY=", "owner": "alacritty", "repo": "alacritty-theme", - "rev": "4091fddff8da892d5594e94116927c7445620867", + "rev": "e759dafb8e2e00abb428592979ce006da7fba4a7", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "copilot-chat-nvim": { "flake": false, "locked": { - "lastModified": 1725121224, - "narHash": "sha256-AVXFRriB13T5XEaB0JbnszuOOUjwhv4evBjdm1l9lyo=", + "lastModified": 1725620013, + "narHash": "sha256-rQZfUy2dKppyBswPAtVjXNUiX4mPs8mATjROvDI0Ous=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "b8d713a0b6179448c05bfa8eb25826ba0c71256d", + "rev": "9e7010bd33808e31d3f729b5e18a772d8e84f704", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1724994893, - "narHash": "sha256-yutISDGg6HUaZqCaa54EcsfTwew3vhNtt/FNXBBo44g=", + "lastModified": 1725975477, + "narHash": "sha256-sBnXxmYBb0S85Vkny97z2TFLd5SJW5o0k6KQNwpSLb0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c8d3157d1f768e382de5526bb38e74d2245cad04", + "rev": "5b2d8e9a47c3e17514650d1ce7d5e907114db82b", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1724430000, - "narHash": "sha256-NkO/RPNAlAl4b8HiaIMJJLQRPIPKoN86jPwl283+whk=", + "lastModified": 1725921911, + "narHash": "sha256-YuAQf3IP3eTITYrptapH8xeU9aHkN0ncNnUnWtHg3Zk=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "88ecf2f0f8fe496c2f8994df4d820dd791aea69a", + "rev": "acfb8210d4366ff63fa23d6a7a8ddbacd0234532", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1725158714, - "narHash": "sha256-47mUZCvjaXPkomp2+hO5NA2BfI+jfkeOej4vim+RrIU=", + "lastModified": 1725980799, + "narHash": "sha256-wdSnBKjOA2KvCEYIswmSVXeGV1meq3fr2HELn0J5QkY=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "a31c3ccdb667a1b0b3ae9879e6196228a5d5b3eb", + "rev": "d89ef3f50127383efdd3ce42065440e737f216f0", "type": "github" }, "original": { @@ -357,20 +357,18 @@ }, "nixCats": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1721661107, - "narHash": "sha256-c9IDQhe4dmyj1CfHLs7gMV3lth5VODWkYOC5lhTVbzI=", - "owner": "chrishrb", + "lastModified": 1725925707, + "narHash": "sha256-AT9tKu3wbUyWCw+FoaP/sxpvGj1rQ0q3V9bdARVw2Ts=", + "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "99f5ad454dc4bd78fb6a987f5542a08b9e69abef", + "rev": "bec49a10a76ceeaa93dfaa29d49104822232caf9", "type": "github" }, "original": { - "owner": "chrishrb", + "owner": "BirdeeHub", "repo": "nixCats-nvim", "type": "github" } @@ -423,11 +421,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1725826545, + "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "type": "github" }, "original": { @@ -484,21 +482,37 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725099143, + "narHash": "sha256-CHgumPZaC7z+WYx72WgaLt2XF0yUVzJS60rO4GZ7ytY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "5629520edecb69630a3f4d17d3d33fc96c13f6fe", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -560,7 +574,7 @@ "macos-keyboard-layout-german-programming": "macos-keyboard-layout-german-programming", "nix-homebrew": "nix-homebrew", "nixCats": "nixCats", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", "nvim-nio": "nvim-nio", "nvim-tmux-navigation": "nvim-tmux-navigation", @@ -600,14 +614,14 @@ "talhelper": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1725066594, - "narHash": "sha256-ErejI3LhFY+K9wVd4GC7jHGXxx/2EIyU1catPuEQzl4=", + "lastModified": 1725956947, + "narHash": "sha256-blc9qWcSQ92FSCWaodubYbk7C7ZVnFmu4PAOjdChl+A=", "owner": "budimanjojo", "repo": "talhelper", - "rev": "b4809d3d79b663b7355e8e3617bb5e85a1a26400", + "rev": "ab3b24d57583353580c669d447eb5b60890e8dcd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index accab90..788e291 100644 --- a/flake.nix +++ b/flake.nix @@ -45,8 +45,7 @@ talhelper.url = "github:budimanjojo/talhelper"; # chrisNvim - nixCats.url = "github:chrishrb/nixCats-nvim"; - nixCats.inputs.nixpkgs.follows = "nixpkgs"; + nixCats.url = "github:BirdeeHub/nixCats-nvim"; # plugins that are not in nixpkg gx-nvim = { @@ -88,7 +87,7 @@ # Common overlays overlays = [ inputs.alacritty-theme.overlays.default - (import ./overlays/aws-sam-cli.nix inputs) + (import ./overlays/stable.nix inputs) ]; # System types to support. diff --git a/modules/common/nvim/default.nix b/modules/common/nvim/default.nix index f89bacf..cd4af0a 100644 --- a/modules/common/nvim/default.nix +++ b/modules/common/nvim/default.nix @@ -12,16 +12,11 @@ let (forEachSystem ( system: let - dependencyOverlays = [ - (utils.mergeOverlayLists inputs.nixCats.dependencyOverlays.${system} ( - (import ./overlays inputs) - ++ [ - (utils.standardPluginOverlay inputs) - # add any flake overlays here. - #inputs.neorg-overlay.overlays.default - # inputs.neovim-nightly-overlay.overlays.default - ] - )) + dependencyOverlays = (import ./overlays inputs) ++ [ + (utils.standardPluginOverlay inputs) + # add any flake overlays here. + #inputs.neorg-overlay.overlays.default + # inputs.neovim-nightly-overlay.overlays.default ]; in { @@ -75,7 +70,7 @@ let nodePackages.typescript-language-server tailwindcss-language-server vue-language-server - nodePackages.eslint + eslint nodePackages.prettier ]; java = with pkgs; [ jdt-language-server ]; diff --git a/modules/common/programming/devops.nix b/modules/common/programming/devops.nix index b87dd46..bd46f63 100644 --- a/modules/common/programming/devops.nix +++ b/modules/common/programming/devops.nix @@ -37,6 +37,8 @@ ''; shellAliases = { + dockerup = "colima start"; + tg = "terragrunt"; ka = "kubectl apply -f"; diff --git a/overlays/aws-sam-cli.nix b/overlays/aws-sam-cli.nix deleted file mode 100644 index cc62c0a..0000000 --- a/overlays/aws-sam-cli.nix +++ /dev/null @@ -1 +0,0 @@ -inputs: _final: prev: { aws-sam-cli = inputs.nixpkgs-stable.legacyPackages.${prev.system}.aws-sam-cli; } diff --git a/overlays/stable.nix b/overlays/stable.nix new file mode 100644 index 0000000..a4284e7 --- /dev/null +++ b/overlays/stable.nix @@ -0,0 +1,6 @@ +# INFO: these packages are buggy and don‘t work in unstable +inputs: _final: prev: { + aws-sam-cli = inputs.nixpkgs-stable.legacyPackages.${prev.system}.aws-sam-cli; + colima = inputs.nixpkgs-stable.legacyPackages.${prev.system}.colima; + eslint = inputs.nixpkgs-stable.legacyPackages.${prev.system}.nodePackages.eslint; +}