update

hosts/wsl/configuration.nix

@@ -12,6 +12,7 @@
     inputs.home-manager.nixosModules.default
     ../../modules/nixos/user.nix
     ../../modules/nixos/postgres.nix
+    ../../modules/nixos/podman.nix
   ];
 
   wsl = {

hosts/wsl/home.nix

@@ -16,6 +16,7 @@
     ../../modules/home-manager/emacs
     ../../modules/home-manager/syncthing.nix
     ../../modules/home-manager/bitwarden.nix
+    ../../modules/home-manager/kitty.nix
   ];
   home.username = "mthomson";
   home.homeDirectory = "/home/mthomson";
@@ -25,6 +26,8 @@
     gcc
     openconnect
     wsl-vpnkit
+    openshift
+    openssl
   ];
 
   programs.home-manager.enable = true;

modules/home-manager/emacs/init.el

@@ -43,7 +43,7 @@
   (prog-mode . display-line-numbers-mode)
 
   :config
-  (set-face-attribute 'default nil :family "JetBrainsMono Nerd Font"  :height 120)
+  (set-face-attribute 'default nil :family "JetBrainsMono Nerd Font"  :height 100)
 
   :init
   (tool-bar-mode -1)
@@ -210,6 +210,12 @@
   :ensure t
   :mode "\\.nix\\'")
 
+;; EDITOR CONFIG ------
+(use-package editorconfig
+  :ensure nil
+  :config
+  (editorconfig-mode t))
+
 ;; LSP ---------
 (use-package lsp-mode
   :ensure t
@@ -235,7 +241,7 @@
   (setq lsp-enable-file-watchers nil) ;; TODO: check this
   (setq lsp-enable-folding nil)
   (setq lsp-enable-imenu t)
-  (setq lsp-enable-indentation t) ;; TODO: check this as well
+  (setq lsp-enable-indentation nil) ;; TODO: check this as well
   (setq lsp-enable-links t)
   (setq lsp-enable-on-type-formatting t)
   (setq lsp-enable-suggest-server-download nil)
@@ -271,7 +277,11 @@
   (setq lsp-semantic-tokens-enable nil)
 
   ;; misc
-  (setq lsp-use-plists nil))
+  (setq lsp-use-plists nil)
+
+  ;; language specific
+  (setq lsp-eslint-server-command '("vscode-eslint-language-server" "--stdio"))
+  )
 
 (use-package lsp-ui
   :ensure t
@@ -493,6 +503,7 @@
    "] d" '(flycheck-next-error :wk "Goto next error")
    "[ d" '(flycheck-previous-error :wk "Goto prev error")
    "] c" '(diff-hl-next-hunk :wk "Goto next hunk")
+   "g r" '(lsp-find-references :wk "Goto references")
    "K" '(evil-lookup :wk "Describe"))
 
   (general-create-definer my-leader-def
@@ -538,6 +549,9 @@
     "g g" '(magit-status :wk "Magit status")
     "g l" '(magit-log-current :wk "Magit log"))
 
+  (my-leader-def
+    "r n" '(lsp-rename :wk "Rename"))
+
   (my-leader-def
     "u" '(undo-tree-visualize :wk "Undo-tree")))
 

modules/home-manager/nixcats/default.nix

@@ -51,6 +51,10 @@ in {
             stylelint-lsp
             tailwindcss-language-server
           ];
+          yaml = with pkgs; [
+            yaml-language-server
+            gitlab-ci-ls
+          ];
           c = with pkgs; [
             clang
           ];
@@ -166,6 +170,7 @@ in {
             nix = true;
             go = true;
             typescript = true;
+            yaml = true;
             c = true;
             csharp = true;
             gitlab = true;

modules/home-manager/nixcats/init.lua

@@ -718,6 +718,16 @@ require('lze').load {
     enabled = nixCats('typescript') or false,
     lsp = {},
   },
+  {
+    "yamlls",
+    enabled = nixCats('yaml') or false,
+    lsp = {},
+  },
+  {
+    "gitlab_ci_ls",
+    enabled = nixCats('yaml') or false,
+    lsp = {},
+  },
   {
     "clangd",
     enabled = nixCats('c') or false,

modules/nixos/podman.nix

@@ -0,0 +1,17 @@
+{
+  virtualisation = {
+    podman = {
+      enable = true;
+
+      dockerCompat = true;
+
+      defaultNetwork.settings.dns_enabled = true;
+    };
+    containers = {
+      enable = true;
+      registries = {
+        insecure = [ "artifactory.symcor.com" ];
+      };
+    };
+  };
+}