more nvim config

common/desktop/home.nix

@@ -30,7 +30,6 @@ in {
     mattermost-desktop
     mullvad-vpn
     neofetch
-    nixfmt
     nixpkgs-review
     plex-media-player
     plexamp
@@ -77,8 +76,11 @@ in {
       enable = true;
       profiles.default = { isDefault = true; };
     };
+  kitty = {
+    enable = true;
+    shellIntegration.enableZshIntegration = true;
+  };
 };
-
   # Syncthing
   services.syncthing.enable = true;
   xdg.userDirs = let home = config.home.homeDirectory;

common/hm-modules/catppuccin/default.nix

@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }:
 with lib;
-let cfg = config.themes.v.catppuccin;
+let
+  cfg = config.themes.v.catppuccin;
 in {
   options.themes.v.catppuccin = { enable = mkEnableOption "catppuccin"; };
   config = let
@@ -13,6 +14,9 @@ in {
       package = pkgs.bibata-cursors-translucent;
     };
 
+    programs.kitty.theme = "Catppuccin-Frappe";
+    programs.kitty.font.name = "DejaVuSansMono Nerd Font";
+
     gtk = {
       enable = true;
       theme = {

common/hm-modules/default.nix

@@ -1,3 +1,3 @@
 { ... }: {
-  imports = [ ./catppuccin.nix ./nvim ./riff.nix ./vscode.nix ./git.nix ./rust.nix ];
+  imports = [ ./catppuccin ./nvim ./riff.nix ./vscode.nix ./git.nix ./rust.nix ];
 }

common/hm-modules/nvim/default.nix

@@ -1,12 +1,20 @@
-{ config, pkgs, lib, ... }:
+{
-let cfg = config.programs.v.nvim;
+  config,
-in with lib; {
+  pkgs,
-  options.programs.v.nvim = { enable = mkEnableOption "nvim"; };
+  lib,
+  ...
+}:
+let
+  cfg = config.programs.v.nvim;
+in
+with lib;
+{
+  options.programs.v.nvim = {
+    enable = mkEnableOption "nvim";
+  };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [ fd ];
-    home.file.".config/nvim/lua/startup/themes/my_theme.lua" = {
+    home.file.".config/nvim/lua".source = ./lua;
-      source = ./dashboard.lua;
-    };
     programs.nixvim = {
       enable = true;
       package = pkgs.neovim-unwrapped;
@@ -55,16 +63,22 @@ in with lib; {
           key = "<leader>fr";
           action = ":Telescope frecency<CR>";
         }
+        {
+          mode = "n";
+          key = "<leader>ob";
+          action = "require('obsidian_picker').obsidian_picker";
+          lua = true;
+        }
         # Commenting
         {
           mode = "n";
-          key = "<C-_>";
+          key = "<C-/>";
           action = "require('Comment.api').toggle.linewise.current";
           lua = true;
         }
         {
           mode = "x";
-          key = "<C-_>";
+          key = "<C-/>";
           action = ''
             function()
               local esc = vim.api.nvim_replace_termcodes(
@@ -138,8 +152,7 @@ in with lib; {
           mode = "n";
           key = "<leader>nf";
           lua = true;
-          action =
+          action = "function() require('neotest').run.run(vim.fn.expand('%')) end";
-            "function() require('neotest').run.run(vim.fn.expand('%')) end";
         }
         # LSP
         {
@@ -162,6 +175,9 @@ in with lib; {
       extraConfigLua = "";
 
       plugins = {
+        image = {
+          enable = true;
+        };
         bufferline.enable = true;
         nix.enable = true;
         luasnip.enable = true;
@@ -170,7 +186,6 @@ in with lib; {
           enable = true;
           theme = "my_theme";
         };
-        none-ls.enable = false;
         obsidian = {
           enable = true;
           settings = {
@@ -219,7 +234,9 @@ in with lib; {
             ignoreDoneAlready = true;
             ignore = [ "ltex" ];
           };
-          notification = { overrideVimNotify = true; };
+          notification = {
+            overrideVimNotify = true;
+          };
         };
         neotest = {
           enable = true;
@@ -252,8 +269,20 @@ in with lib; {
           extensions.fzf-native.enable = true;
           extensions.fzf-native.fuzzy = true;
           extensions.frecency.enable = true;
+          extraOptions = { };
         };
         comment-nvim.enable = true;
+        none-ls = {
+          enable = true;
+          sources = {
+            formatting = {
+              nixfmt = {
+                enable = true;
+                package = pkgs.nixfmt-rfc-style;
+              };
+            };
+          };
+        };
         lsp = {
           enable = true;
           keymaps = {
@@ -274,6 +303,7 @@ in with lib; {
             nil_ls.enable = true;
             dockerls.enable = true;
             rust-analyzer = {
+              enable = true;
               installCargo = false;
               installRustc = false;
             };
@@ -285,12 +315,15 @@ in with lib; {
                   enabled = true;
                   cache_config = true;
                 };
-                pycodestyle = { maxLineLength = 100; };
+                pycodestyle = {
+                  maxLineLength = 100;
+                };
               };
             };
             elixirls.enable = true;
             clangd.enable = true;
             yamlls.enable = true;
+            lua-ls.enable = true;
           };
         };
         trouble.enable = true;
@@ -306,13 +339,11 @@ in with lib; {
           enable = true;
           autoEnableSources = true;
           settings = {
-            snippet.expand =
+            cmdline.":".sources = [ { name = "path"; } ];
-              "function(args) require('luasnip').lsp_expand(args.body) end";
+            snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
             mapping = {
-              "<S-Tab>" =
+              "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-                "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+              "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
-              "<Tab>" =
-                "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
               "<CR>" = "cmp.mapping.confirm({ select = true })";
               "<C-Space>" = "cmp.mapping.complete()";
               "<C-e>" = "cmp.mapping.close()";

common/hm-modules/nvim/lua/obsidian_picker.lua

@@ -0,0 +1,44 @@
+local pickers = require "telescope.pickers"
+local finders = require "telescope.finders"
+local conf = require("telescope.config").values
+local actions = require("telescope.actions")
+local action_state = require("telescope.actions.state")
+
+local obsidian_commands = require("obsidian.commands").commands
+local results = {}
+for key, _ in pairs(obsidian_commands) do
+  table.insert(results, string.sub(key, 9))
+end
+
+local obsidian_picker = function(opts)
+  opts = opts or require("telescope.themes").get_dropdown{}
+  pickers.new(opts, {
+    prompt_title = "Obsidian",
+    finder = finders.new_table {
+      results = results,
+      -- entry_maker = function(entry)
+      --   return {
+      --     value = entry,
+      --     display = entry[1],
+      --     ordinal = entry[1],
+      --   }
+      -- end
+    },
+    sorter = conf.generic_sorter(opts),
+    attach_mappings = function(prompt_bufnr, map)
+      actions.select_default:replace(function()
+        actions.close(prompt_bufnr)
+        local selection = action_state.get_selected_entry()
+        vim.cmd(':Obsidian' .. selection[1])
+      end)
+      return true
+    end,
+  }):find()
+end
+
+-- obsidian_picker()
+
+return {
+  obsidian_picker = obsidian_picker
+}
+

common/hm-modules/nvim/obsidian_picker.lua

@@ -0,0 +1,35 @@
+local pickers = require "telescope.pickers"
+local finders = require "telescope.finders"
+local conf = require("telescope.config").values
+local actions = require("telescope.actions")
+local action_state = require("telescope.actions.state")
+
+local obsidian_commands = require("obsidian.commands").commands
+local results = {}
+for key, _ in pairs(obsidian_commands) do
+  table.insert(results, string.sub(key, 9))
+end
+
+local obsidian_picker = function(opts)
+  opts = opts or require("telescope.themes").get_dropdown {}
+  pickers.new(opts, {
+    prompt_title = "Obsidian",
+    finder = finders.new_table {
+      results = results,
+    },
+    sorter = conf.generic_sorter(opts),
+    attach_mappings = function(prompt_bufnr, map)
+      actions.select_default:replace(function()
+        actions.close(prompt_bufnr)
+        local selection = action_state.get_selected_entry()
+        vim.cmd(':Obsidian' .. selection[1])
+      end)
+      return true
+    end,
+  }):find()
+end
+
+
+return {
+  obsidian_picker = obsidian_picker
+}

common/modules/gnome/hm.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 with lib.hm.gvariant;
 let
@@ -120,7 +120,7 @@ in {
   } // generate_custom_keybindings {
     "terminal" = {
       binding = "<Super>Return";
-      command = "kgx";
+      command = "${pkgs.kitty}/bin/kitty";
       name = "Open Terminal";
     };
     "firefox" = {

flake.lock

@@ -764,11 +764,11 @@
         "systems": "systems_10"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1710146030,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -840,11 +840,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703887061,
+        "lastModified": 1709087332,
-        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -918,11 +918,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710714957,
+        "lastModified": 1710820906,
-        "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=",
+        "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989",
+        "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
         "type": "github"
       },
       "original": {
@@ -944,11 +944,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1710754079,
+        "lastModified": 1710837180,
-        "narHash": "sha256-i2GEmGDjFP8K86x5OcH0JbCoYZqLW5H+P866pVTSxU4=",
+        "narHash": "sha256-WVkLclGrUliLJUl+XaJplo09VdxyqHxZtkEmmDW2QYY=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "67dbf85b7c35b5e0be476facf1b360b791e4a3ae",
+        "rev": "ded8d23709f94aedb1407bee9e26581f258e9e3a",
         "type": "github"
       },
       "original": {
@@ -1393,11 +1393,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1710803033,
+        "lastModified": 1710861126,
-        "narHash": "sha256-7sRXMRZPHUbHY9n3unU5/2SxT50MH9uJAFr1vkjiQYc=",
+        "narHash": "sha256-q8fiy9mgUvTAt2OMjiVpQgDlykyGury9Fpsm0jekBfY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c2f60aeadc7af3f832c1ffa86bae06518d227fbf",
+        "rev": "2dcadb7087e38314cebb15af65f8f2a15d2940cc",
         "type": "github"
       },
       "original": {
@@ -1408,11 +1408,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1710631334,
+        "lastModified": 1710806803,
-        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
+        "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
+        "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
         "type": "github"
       },
       "original": {
@@ -1449,11 +1449,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1710799652,
+        "lastModified": 1710936779,
-        "narHash": "sha256-TWX1slRN1IQcalrY64ltQUpVhbxGnT0PaIHqNcC0VtY=",
+        "narHash": "sha256-ecYnUzSWqRae10pp7J6ZE2BznTPJ9f8sLiIoDBQtRBw=",
         "owner": "pta2002",
         "repo": "nixvim",
-        "rev": "975f1ca526e37c9cb9c646399f03613ea77f5ec2",
+        "rev": "4f6e90212c7ec56d7c03611fb86befa313e7f61f",
         "type": "github"
       },
       "original": {
@@ -1464,11 +1464,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1710833135,
+        "lastModified": 1710940845,
-        "narHash": "sha256-vtF350PUNgnQpVSy0EPS5uwza8gIFpaIx9dDk14EWI4=",
+        "narHash": "sha256-hDL4J2VgG0fmCuq+X1M6e7nVp2a5xHl05PfQZlANhkQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "cee2a9bfe726df39af812591e8b17e8a2f319bd5",
+        "rev": "1593636f37dc0b788e75fb843916ce1afd21fcd0",
         "type": "github"
       },
       "original": {
@@ -1509,11 +1509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708018599,
+        "lastModified": 1710843117,
-        "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
+        "narHash": "sha256-b6iKQeHegzpc697rxTPA3bpwGN3m50eLCgdQOmceFuE=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
+        "rev": "e8dc1b4fe80c6fcededde7700e6a23bcdf7f3347",
         "type": "github"
       },
       "original": {

flake.nix

@@ -139,16 +139,10 @@
             deploy.packages.${system}.deploy-rs
             deadnix
             statix
-            # nixfmt
-            # nixpkgs-fmt
             nixUnstable
-            # nil
             vault
             yamllint
             jq
-            # (vault-push-approle-envs self { })
-            # (vault-push-approles self { })
-            # fast-repl
             fup-repl
           ];
         };