Remove nvf and clean up

flake.nix

@@ -2,7 +2,6 @@
   description = "My highly sophisticated and complicated flake";
 
   outputs = {
-    self,
     nixpkgs,
     nixpkgs-stable,
     ...
@@ -65,7 +64,6 @@
           inputs.nix-ld.nixosModules.nix-ld
           inputs.sops-nix.nixosModules.sops
           inputs.auto-cpufreq.nixosModules.default
-          inputs.nvf.nixosModules.default
         ];
       };
       ginoza = nixpkgs.lib.nixosSystem {
@@ -94,22 +92,9 @@
         };
       };
     };
-    packages."x86_64-linux".nvf =
-      (inputs.nvf.lib.neovimConfiguration {
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
-        modules = [
-          ./nixos/system/packages/nvf.nix
-        ];
-      })
-      .neovim;
   };
 
   inputs = {
-    install-script = {
-      url = "git+https://git.foglar.tech/foglar/nix-flake-install-script";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
 
@@ -163,7 +148,13 @@
       url = "github:ghostty-org/ghostty";
     };
 
-    nvf.url = "github:notashelf/nvf";
+    shinya-nvf.url = "git+https://git.foglar.tech/foglar/neovim-config";
+
+    # Nix Flake Install Script
+    install-script = {
+      url = "git+https://git.foglar.tech/foglar/psychonix-install";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Nix on Droid Configuration
     nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05";

kogami/configuration.nix

@@ -79,7 +79,10 @@
     nix-ld.dev.enable = true;
   };
 
-  environment.systemPackages = [inputs.install-script.packages.x86_64-linux.default];
+  environment.systemPackages = [
+    inputs.install-script.packages.x86_64-linux.default
+    inputs.shinya-nvf.packages.x86_64-linux.nvf
+  ];
 
   #services.twingate.enable = true;
 

kogami/home.nix

@@ -58,7 +58,7 @@
     };
 
     git.enable = true;
-    neovim.enable = true;
+    neovim.enable = false;
 
     firefox.enable = true;
     spotify.enable = true;

nvf/flake.nix

@@ -1,18 +0,0 @@
-{
-  description = "My neovim nvf configuration";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  };
-
-  outputs = {nixpkgs, ...} @ inputs: {
-    packages."x86_64-linux".nvf =
-      (inputs.nvf.lib.neovimConfiguration {
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
-        modules = [
-          ./nvf.nix
-        ];
-      })
-      .neovim;
-  };
-}

nvf/nvf.nix

@@ -1,214 +0,0 @@
-{...}: {
-  config.vim = {
-    viAlias = true;
-    vimAlias = true;
-
-    spellcheck = {
-      enable = true;
-    };
-
-    lsp = {
-      formatOnSave = true;
-      lspkind.enable = false;
-      lightbulb.enable = true;
-      lspsaga.enable = false;
-      trouble.enable = true;
-      lspSignature.enable = true;
-      #otter-nvim.enable = isMaximal;
-      #lsplines.enable = isMaximal;
-      #nvim-docs-view.enable = isMaximal;
-    };
-
-    debugger = {
-      nvim-dap = {
-        enable = true;
-        ui.enable = true;
-      };
-    };
-
-    # This section does not include a comprehensive list of available language modules.
-    # To list all available language module options, please visit the nvf manual.
-    languages = {
-      enableLSP = true;
-      enableFormat = true;
-      enableTreesitter = true;
-      enableExtraDiagnostics = true;
-
-      # Languages that will be supported in default and maximal configurations.
-      nix.enable = true;
-      markdown.enable = true;
-
-      # Languages that are enabled in the maximal configuration.
-      bash.enable = true;
-      clang.enable = true;
-      css.enable = true;
-      html.enable = true;
-      go.enable = true;
-      lua.enable = true;
-      python.enable = true;
-      rust = {
-        enable = true;
-        crates.enable = true;
-      };
-
-      # Language modules that are not as common.
-      assembly.enable = true;
-      csharp.enable = false;
-    };
-
-    visuals = {
-      nvim-scrollbar.enable = false;
-      nvim-web-devicons.enable = true;
-      nvim-cursorline.enable = true;
-      cinnamon-nvim.enable = true;
-      fidget-nvim.enable = true;
-
-      highlight-undo.enable = true;
-      indent-blankline.enable = true;
-
-      # Fun
-      cellular-automaton.enable = false;
-    };
-
-    statusline = {
-      lualine = {
-        enable = true;
-        theme = "catppuccin";
-      };
-    };
-
-    theme = {
-      enable = true;
-      name = "catppuccin";
-      style = "mocha";
-      transparent = false;
-    };
-
-    autopairs.nvim-autopairs.enable = true;
-
-    autocomplete.nvim-cmp.enable = true;
-    snippets.luasnip.enable = true;
-
-    filetree = {
-      neo-tree = {
-        enable = true;
-      };
-    };
-
-    tabline = {
-      nvimBufferline.enable = true;
-    };
-
-    treesitter.context.enable = true;
-
-    binds = {
-      whichKey.enable = true;
-      cheatsheet.enable = true;
-    };
-
-    telescope.enable = true;
-
-    git = {
-      enable = true;
-      gitsigns.enable = true;
-      gitsigns.codeActions.enable = false; # throws an annoying debug message
-    };
-
-    minimap = {
-      minimap-vim.enable = false;
-      codewindow.enable = true; # lighter, faster, and uses lua for configuration
-    };
-
-    dashboard = {
-      dashboard-nvim.enable = false;
-      alpha.enable = true;
-    };
-
-    notify = {
-      nvim-notify.enable = true;
-    };
-
-    projects = {
-      project-nvim.enable = true;
-    };
-
-    utility = {
-      ccc.enable = false;
-      vim-wakatime.enable = false;
-      icon-picker.enable = true;
-      surround.enable = true;
-      diffview-nvim.enable = true;
-      motion = {
-        hop.enable = true;
-        leap.enable = true;
-        precognition.enable = true;
-      };
-
-      images = {
-        image-nvim.enable = false;
-      };
-    };
-
-    notes = {
-      obsidian.enable = false; # FIXME: neovim fails to build if obsidian is enabled
-      neorg.enable = false;
-      orgmode.enable = false;
-      mind-nvim.enable = true;
-      todo-comments.enable = true;
-    };
-
-    terminal = {
-      toggleterm = {
-        enable = true;
-        lazygit.enable = true;
-      };
-    };
-
-    ui = {
-      borders.enable = true;
-      noice.enable = true;
-      colorizer.enable = true;
-      modes-nvim.enable = false; # the theme looks terrible with catppuccin
-      illuminate.enable = true;
-      breadcrumbs = {
-        enable = true;
-        navbuddy.enable = true;
-      };
-      smartcolumn = {
-        enable = true;
-        setupOpts.custom_colorcolumn = {
-          # this is a freeform module, it's `buftype = int;` for configuring column position
-          nix = "110";
-          ruby = "120";
-          java = "130";
-          go = ["90" "130"];
-        };
-      };
-      fastaction.enable = true;
-    };
-
-    assistant = {
-      chatgpt.enable = false;
-      copilot = {
-        enable = false;
-        cmp.enable = true;
-      };
-    };
-
-    session = {
-      nvim-session-manager.enable = false;
-    };
-
-    gestures = {
-      gesture-nvim.enable = false;
-    };
-
-    comments = {
-      comment-nvim.enable = true;
-    };
-
-    presence = {
-      neocord.enable = false;
-    };
-  };
-}