diff --git a/modules/home-manager/shell/ssh/default.nix b/modules/home-manager/shell/ssh/default.nix index beff370..9b1369a 100644 --- a/modules/home-manager/shell/ssh/default.nix +++ b/modules/home-manager/shell/ssh/default.nix @@ -1,20 +1,28 @@ -{ - pkgs, - config, - lib, - ... +{ pkgs +, config +, lib +, ... }: lib.mkIf config.programs.ssh.enable { - home.packages = with pkgs; [tea]; + home.packages = with pkgs; [ tea ]; programs = { ssh = { addKeysToAgent = "yes"; forwardAgent = true; matchBlocks = { - "svartalbenheim.odie.intranet" = { - hostname = "svartalbenheim.odie.intranet"; + "svartalbenheim.odie.home.arpa" = { + hostname = "svartalbenheim.odie.home.arpa"; identityFile = "~/.ssh/id_ed25519_local"; - compression =false; + compression = false; + }; + "git.gaja-group.com" = { + hostname = "git.gaja-group.com"; + user = "git"; + extraOptions = { + ProxyCommand = "openssl s_client -quiet -connect rz-de3.gaja-group.com:2222 -servername 10.100.100.170"; + }; + identityFile = "~/.ssh/id_ed25519_local"; + #compression =false; }; }; }; diff --git a/modules/nixvim/plugins/default.nix b/modules/nixvim/plugins/default.nix index fb8c50c..fd670a8 100644 --- a/modules/nixvim/plugins/default.nix +++ b/modules/nixvim/plugins/default.nix @@ -31,6 +31,7 @@ zen-mode.enable = true; web-devicons.enable = true; lazygit.enable = true; + nvim-colorizer.enable = true; cmake-tools = { enable = true; diff --git a/modules/nixvim/plugins/lsp/languages/html.nix b/modules/nixvim/plugins/lsp/languages/html.nix index e7df7d8..e915518 100644 --- a/modules/nixvim/plugins/lsp/languages/html.nix +++ b/modules/nixvim/plugins/lsp/languages/html.nix @@ -10,6 +10,12 @@ }; }; }; + cssls = { + enable = true; + settings = { + css.lint.unknownAtRules = "ignore"; + }; + }; }; }; } diff --git a/modules/nixvim/plugins/neo-tree.nix b/modules/nixvim/plugins/neo-tree.nix index 9fa8303..53d0b18 100644 --- a/modules/nixvim/plugins/neo-tree.nix +++ b/modules/nixvim/plugins/neo-tree.nix @@ -2,6 +2,7 @@ plugins.neo-tree = { enable = true; extraOptions = { + close_if_last_window = true; default_component_configs = { icon = { folder_closed = ""; @@ -39,7 +40,10 @@ }; filesystem = { filtered_items = { + hide_by_name = [ "node_modules" "package-lock.json" "result" ]; hide_by_pattern = [ "*_templ.go" ]; + always_show = [ ".gitignore" ]; + always_show_by_pattern = [ ".env*" ]; }; }; }; diff --git a/modules/nixvim/plugins/none-ls.nix b/modules/nixvim/plugins/none-ls.nix index a51cee9..61aad02 100644 --- a/modules/nixvim/plugins/none-ls.nix +++ b/modules/nixvim/plugins/none-ls.nix @@ -26,6 +26,8 @@ formatting = { phpcbf.enable = true; goimports.enable = true; + xmllint.enable = true; + stylelint.enable = true; #asmfmt.enable = true; }; };