.gitmodules

@@ -4,6 +4,3 @@
 [submodule "dwm"]
 	path = dwm
 	url = git://git.suckless.org/dwm
-[submodule "st"]
-	path = st
-	url = https://git.suckless.org/st

configuration.nix

@@ -1,5 +1,5 @@
 # Edit this configuration file to define what should be installed on
-#your system. Help is available in the configuration.nix(5) man page, on
+# your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 { config, lib, pkgs, ... }:
@@ -85,18 +85,12 @@ clipcatd &
     builtins.elem (lib.getName pkg) [
       "obsidian"
     ];
-
-  nixpkgs.config.permittedInsecurePackages =
-    lib.optional (pkgs.obsidian.version == "1.4.16") "electron-25.9.0";
-
   home-manager.useGlobalPkgs = true; 
   # Home Manager for Sky
   home-manager.users.sky = {pkgs, ...}: {
     home.packages = with pkgs; [
-      obsidian
+      #obsidian
       (callPackage (./rolldice/default.nix) {})
-      clang-tools
-      rclone
       trash-cli
       mumble
       nheko
@@ -107,6 +101,7 @@ clipcatd &
       neofetch
       ncpamixer
       tree
+      neovim
       xclip
       grpc
       clipcat
@@ -126,6 +121,7 @@ clipcatd &
       };
     };
     
+
     programs.bash = {
       enable = true;
       shellAliases = {
@@ -144,157 +140,18 @@ clipcatd &
       };
     };
 
-    programs.neovim = {
+    programs.neovim.plugins = [
-    enable = true;
+      pkgs.vimPlugins.nvim-lspconfig 
-    defaultEditor = true;
-    extraConfig = ''
-      set shiftwidth=2 smarttab
-      set expandtab
-      set tabstop=8 softtabstop=0
-    '';
-    extraPackages = with pkgs; [
-    #  Use the project flake's language server to prevent version mismatches
-    #  clang_12
-    #  rust-analyzer
-    ];
-    plugins = with pkgs.vimPlugins; [
       {
-        plugin = gruvbox-nvim;
+        plugin = pkgs.vimPlugins.nvim-lspconfig;
-        type = "viml";
-        # Better performance is off until I can figure out a way to make the cache outside the nix store
-        config = ''
-	  if has('termguicolors')
-	    set termguicolors
-	  endif
-	  colorscheme gruvbox
-        '';
       }
-      {
-        plugin = lualine-nvim;
-        type = "lua";
-        config = ''
-          require'lualine'.setup {
-            options = {
-              theme = 'gruvbox'
-            },
-            sections = {
-              lualine_c = {'lsp_progress'}
-            }
-          }
-	'';
-      }
-      {
-        plugin = lsp-status-nvim;
-        type = "lua";
-        config = ''
-          require'lsp-status'.register_progress()
-        '';
-      }
-      {
-        plugin = nvim-lspconfig;
-        type = "lua";
-        config = ''
-          -- Mappings.
-          -- See `:help vim.diagnostic.*` for documentation on any of the below functions
-          local opts = { noremap=true, silent=true }
-          vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
-          vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-          vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-          vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
-          -- Use an on_attach function to only map the following keys
+      pkgs.vimPlugins.nvim-tree-lua
-          -- after the language server attaches to the current buffer
-          local on_attach = function(client, bufnr)
-            -- Set up status tracking
-            require'lsp-status'.on_attach(client)
-            -- Enable completion triggered by <c-x><c-o>
-            vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-            -- Mappings.
-            -- See `:help vim.lsp.*` for documentation on any of the below functions
-            local bufopts = { noremap=true, silent=true, buffer=bufnr }
-            vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-            vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-            vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
-            vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-            vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
-            vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
-            vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
-            vim.keymap.set('n', '<space>wl', function()
-              print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-            end, bufopts)
-            vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
-            vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
-            vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
-            vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-            vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
-          end
-
-          local lsp_flags = {
-            -- This is the default in Nvim 0.7+
-            debounce_text_changes = 150,
-          }
-
-          local servers = { 'clangd', 'rust_analyzer' }
-
-          for _, lsp in ipairs(servers) do
-            require'lspconfig'[lsp].setup(
-              vim.tbl_extend('keep',
-                require('coq').lsp_ensure_capabilities({
-                  on_attach = on_attach,
-                  flags = lsp_flags
-                }) or {},
-                require'lsp-status'.capabilities
-              )
-            )
-          end
-        '';
-      }
       {
-        plugin = coq_nvim;
+        plugin = pkgs.vimPlugins.vim-startify;
-        type = "lua";
+        config = "let g:startify_change_to_vcs_root = 0";
-        config = ''
-          vim.g.coq_settings = { auto_start = 'shut-up', xdg = true }
-        '';
-      }
-      {
-        plugin = nvim-treesitter.withAllGrammars;
-	type = "lua";
-	config = ''
-	  require'nvim-treesitter.configs'.setup {
-            -- TODO: Make this use stdpath("data")
-            -- parser_install_dir = "~/.local/share/nvim/site",
-	    -- ensure_installed = { "nix", "help", "rust", "c", "lua" },
-	    -- auto_install = true,
-	    highlight = {
-	      enable = true
-	    },
-            incremental_selection = {
-              enable = true,
-              keymaps = {
-                init_selection = "gnn", -- set to `false` to disable one of the mappings
-                node_incremental = "grn",
-                scope_incremental = "grc",
-                node_decremental = "grm",
-	      }
-	    },
-	    indent = {
-	      enable = true
-	    },
-	  }
-          vim.cmd([[
-	    set foldmethod=expr
-            set foldexpr=nvim_treesitter#foldexpr()
-            set nofoldenable
-	  ]])
-	'';
-      }
-      {
-        plugin = telescope-nvim;
       } 
     ];
-  };
-
     home.stateVersion = "23.11";
   };
   # List packages installed in system profile. To search, run:
@@ -305,13 +162,10 @@ clipcatd &
     vim
     wget
     acpi
+    st
     dmenu
     dunst
     libnotify
-    (pkgs.st.overrideAttrs (_: {
-        src = ./st;
-      })
-    )
     (pkgs.slstatus.overrideAttrs (_: {
         src = ./slstatus;
       })
@@ -322,6 +176,10 @@ clipcatd &
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   programs.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
 
   # List services that you want to enable:
    

dwm

@@ -1 +1 @@
-Subproject commit 5d30ee7db5800ccbc7d99ef718d133cb9fddc420
+Subproject commit 1a7ba5c47946d78d6f3e4e6ee218c9f32f7c8ccc

st

@@ -1 +0,0 @@
-Subproject commit 7544d3c13dfae83ed19697265daa2ef46882f089