Skip to content

Commit

Permalink
Fix everything
Browse files Browse the repository at this point in the history
  • Loading branch information
chrishrb committed Sep 10, 2024
1 parent fbc9a82 commit 80ce9ef
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 56 deletions.
96 changes: 55 additions & 41 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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.
Expand Down
17 changes: 6 additions & 11 deletions modules/common/nvim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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 ];
Expand Down
2 changes: 2 additions & 0 deletions modules/common/programming/devops.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
'';

shellAliases = {
dockerup = "colima start";

tg = "terragrunt";

ka = "kubectl apply -f";
Expand Down
1 change: 0 additions & 1 deletion overlays/aws-sam-cli.nix

This file was deleted.

6 changes: 6 additions & 0 deletions overlays/stable.nix
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit 80ce9ef

Please sign in to comment.