Update packages

3 files changed, 42 insertions, 44 deletions

diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index 3220997..bf680a8 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -5,7 +5,7 @@
 }: {
   imports = [
     ./packages.nix # home.packages and similar stuff
-    ./neovim-flake.nix
+    ./nvf.nix
     ./ssh.nix
     ./git.nix
   ];
diff --git a/homes/floppydisk/neovim-flake.nix b/homes/floppydisk/nvf.nix
index f4246d0..a8fb245 100644
--- a/homes/floppydisk/neovim-flake.nix
+++ b/homes/floppydisk/nvf.nix
@@ -4,10 +4,10 @@
   ...
 }: {
   imports = [
-    inputs.neovim-flake.homeManagerModules.default
+    inputs.nvf.homeManagerModules.default
   ];
 
-  programs.neovim-flake = {
+  programs.nvf = {
     enable = true;
     settings = {
       vim = {
@@ -92,52 +92,53 @@
       };
 
       vim.filetree = {
-                nvimTree = {
+        nvimTree = {
           enable = true;
           openOnSetup = true;
-          disableNetrw = true;
-
-          hijackUnnamedBufferWhenOpening = true;
-          hijackCursor = true;
-          hijackDirectories = {
-            enable = true;
-            autoOpen = true;
-          };
+          setupOpts = {
+            disable_netrw = true;
+
+            hijack_unnamed_buffer_when_opening = true;
+            hijack_cursor = true;
+            hijack_directories = {
+              enable = true;
+              autoOpen = true;
+            };
 
-          git = {
-            enable = true;
-            showOnDirs = false;
-            timeout = 100;
-          };
+            git = {
+              enable = true;
+              showOnDirs = false;
+              timeout = 100;
+            };
 
-          view = {
-            preserveWindowProportions = false;
-            cursorline = false;
-            width = {
-              min = 35;
-              max = -1;
-              padding = 1;
+            view = {
+              cursorline = false;
+              width = {
+                min = 35;
+                max = -1;
+                padding = 1;
+              };
             };
-          };
 
-          renderer = {
-            indentMarkers.enable = true;
-            rootFolderLabel = false;
+            renderer = {
+              indent_markers.enable = true;
+              root_folder_label = false;
 
-            icons = {
-              modifiedPlacement = "after";
-              gitPlacement = "after";
-              show.git = true;
-              show.modified = true;
+              icons = {
+                modified_placement = "after";
+                git_placement = "after";
+                show.git = true;
+                show.modified = true;
+              };
             };
-          };
 
-          diagnostics.enable = true;
+            diagnostics.enable = true;
 
-          modified = {
-            enable = true;
-            showOnDirs = false;
-            showOnOpenDirs = true;
+            modified = {
+              enable = true;
+              show_on_dirs = false;
+              show_on_open_dirs = true;
+            };
           };
 
           mappings = {
@@ -162,7 +163,7 @@
       vim.git = {
         enable = true;
         gitsigns.enable = true;
-        gitsigns.codeActions = false;
+        gitsigns.codeActions.enable = false;
       };
 
       vim.minimap = {
@@ -210,7 +211,7 @@
         noice.enable = true;
         smartcolumn = {
           enable = true;
-          columnAt.languages = {
+          setupOpts.custom_colorcolumn = {
             nix = 150;
             ruby = 110;
             java = 120;
diff --git a/homes/floppydisk/packages.nix b/homes/floppydisk/packages.nix
index 8ccae80..1dd29d2 100644
--- a/homes/floppydisk/packages.nix
+++ b/homes/floppydisk/packages.nix
@@ -9,7 +9,6 @@
     yt-dlp
     _1password-gui
     _1password
-    git-credential-1password
     firefox-devedition
     rdesktop
     _3llo
@@ -63,7 +62,6 @@
     jetbrains.rider
     jetbrains.phpstorm
     jetbrains.idea-ultimate
-    jetbrains.webstorm
     lazygit
     wakatime
     mongodb-compass
@@ -105,7 +103,6 @@
     pcsx2
     steam
     gzdoom
-    minecraft
     dolphin-emu
     prismlauncher
     fceux