changes

esselius · Dec 7, 2024 · 387dd36 · 387dd36
1 parent 4a5d822
commit 387dd36
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/darwin-configurations/Fox.nix b/darwin-configurations/Fox.nix
@@ -5,6 +5,7 @@
     ezModules.tiling-wm
     ezModules.homebrew-packages
     ezModules.user-peteresselius
+    ezModules.linux-builder
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";

diff --git a/darwin-modules/default.nix b/darwin-modules/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ezModules.context
-    ezModules.linux-builder
     ezModules.nix
     ezModules.security
     ../overlays.nix

diff --git a/home-configurations/peteresselius.nix b/home-configurations/peteresselius.nix
@@ -30,8 +30,12 @@ in
     (mkIf (config.context == "home") { })
 
     (mkIf (config.context == "work") {
+      programs.mise = {
+        enable = true;
+        enableFishIntegration = true;
+      };
       profiles.tools = {
-        asdf = true;
+        # asdf = true;
         k8s = true;
         minio = true;
         task = true;

diff --git a/home-modules/fish-shell.nix b/home-modules/fish-shell.nix
@@ -1,6 +1,13 @@
+{ pkgs, ... }:
+
 {
   programs = {
-    fish.enable = true;
+    fish = {
+      enable = true;
+      interactiveShellInit = ''
+        ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
+      '';
+    };
 
     starship = {
       enable = true;

diff --git a/home-modules/neovim.nix b/home-modules/neovim.nix
@@ -58,14 +58,18 @@ in
           nixd.enable = true;
           metals = {
             enable = true;
-            filetypes = [ "sc" "scala" ];
+            filetypes = [ "sc" "scala" "java" ];
           };
           dockerls.enable = true;
           tilt_ls.enable = true;
           protols = { enable = true; package = null; };
           pylsp.enable = true;
           gopls.enable = true;
           clangd.enable = true;
+          regols = {
+            enable = true;
+            filetypes = ["rego"];
+          };
         };
       };
 
@@ -83,16 +87,6 @@ in
           { name = "path"; }
           { name = "buffer"; }
         ];
-        settings = {
-          mapping = {
-            "<C-i>" = ''cmp.mapping(cmp.mapping.complete(), { "i", "c" })'';
-            "<C-e>" = "cmp.mapping({ i = cmp.mapping.abort(), c = cmp.mapping.close(), })";
-            "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
-            "<CR>" = "cmp.mapping.confirm({ select = true })";
-            "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-            "<C-Space>" = "cmp.mapping.complete()";
-          };
-        };
       };
     };
 
@@ -113,7 +107,7 @@ in
     extraConfigLua = ''
       local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true })
       vim.api.nvim_create_autocmd("FileType", {
-        pattern = { "scala", "sbt", "java" },
+        pattern = { "scala", "sbt" },
         callback = function()
           require("metals").initialize_or_attach({})
         end,

diff --git a/nixos-modules/nix.nix b/nixos-modules/nix.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   nix = {
@@ -17,6 +17,7 @@
 
     nixPath = [
       "nixpkgs=${inputs.nixpkgs}"
+      "nixpkgs-unstable=${inputs.nixpkgs-unstable}"
     ];
   };
 }