Updated flake

flake.lock

@@ -638,18 +638,16 @@
         "nvf": "nvf"
       },
       "locked": {
-        "dir": "nixos/modules/neovim",
+        "lastModified": 1736335130,
-        "lastModified": 1736204012,
+        "narHash": "sha256-9EZtqVX0QrR3sjKYSU7Q+zczwTRq6TWei7NedCM6v5A=",
-        "narHash": "sha256-vfhrQ5M887eQ5pb2/6azQE+NzlphHAIZPEBqBF7ozAc=",
         "owner": "kylekrein",
-        "repo": "nixos-config",
+        "repo": "neovim",
-        "rev": "cbbe4aea64911e2eb34b603106137e3969695e50",
+        "rev": "05a67cf92bf0fe80a8ff857f5c9e8ccd0750f63a",
         "type": "github"
       },
       "original": {
-        "dir": "nixos/modules/neovim",
         "owner": "kylekrein",
-        "repo": "nixos-config",
+        "repo": "neovim",
         "type": "github"
       }
     },

flake.nix

@@ -6,7 +6,7 @@
       url = "github:nixos/nixpkgs?ref=nixos-unstable";
     };
     neovim = {
-      url = "github:kylekrein/nixos-config?dir=nixos/modules/neovim";
+      url = "github:kylekrein/neovim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "github:hyprwm/Hyprland";

nixos/configuration.nix

@@ -1,9 +1,15 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, lib, pkgs, hwconfig, first-nixos-install, inputs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  hwconfig,
+  first-nixos-install,
+  inputs,
+  ...
+}: {
   imports =
     [
       inputs.sops-nix.nixosModules.sops
@@ -21,7 +27,10 @@
   facter.reportPath = ./hosts/${hwconfig.hostname}/facter.json;
   kylekrein.services.autoUpgrade = {
     enable = true;
-	pushUpdates = if hwconfig.hostname == "kylekrein-homepc" then true else false;
+    pushUpdates =
+      if hwconfig.hostname == "kylekrein-homepc"
+      then true
+      else false;
     configDir = "/etc/nixos-config";
     user = "root";
   };
@@ -34,7 +43,10 @@
     };
     loader = {
       systemd-boot.enable = true;
-	efi.canTouchEfiVariables = if hwconfig.hostname != "kylekrein-mac" then true else false;
+      efi.canTouchEfiVariables =
+        if hwconfig.hostname != "kylekrein-mac"
+        then true
+        else false;
     };
     # Enable "Silent Boot"
     consoleLogLevel = 0;
@@ -114,14 +126,12 @@
   environment.systemPackages = with pkgs; [
     (catppuccin-sddm.override {
       flavor = "mocha";
-#	font = "";
+      #	font = "";
       fontSize = "16";
       #background;
       loginBackground = false;
     })
-     joplin-desktop
     kdenlive
-     super-productivity
     system-config-printer
     libreoffice
     helvum
@@ -237,20 +247,19 @@
 
   security.polkit.enable = true;
 
-
   programs.steam = {
- 	enable = (hwconfig.system == "x86_64-linux");
+    enable = hwconfig.system == "x86_64-linux";
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
   };
 
   #programs.thunar = {
-#	enable = true;
+  #	enable = true;
-#	plugins = with pkgs.xfce; [
+  #	plugins = with pkgs.xfce; [
-#		thunar-archive-plugin
+  #		thunar-archive-plugin
-#		thunar-volman
+  #		thunar-volman
-#	];
+  #	];
   # };
   #programs.xfconf.enable = true; # so thunar can save config
   #services.gvfs.enable = true; # Mount, trash, and other functionalities
@@ -268,7 +277,12 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-	extraSpecialArgs = {inherit pkgs; inherit hwconfig; inherit first-nixos-install; inherit inputs;};
+    extraSpecialArgs = {
+      inherit pkgs;
+      inherit hwconfig;
+      inherit first-nixos-install;
+      inherit inputs;
+    };
   };
   stylix = {
     enable = true;
@@ -309,15 +323,13 @@
     enable = true;
     nssmdns4 = true;
     openFirewall = true;
-};
+  };
-
 
   #services.flatpak.enable = true;
   #services.flatpak.packages = [
-#	"flathub:app/org.kde.dolphin//stable"
+  #	"flathub:app/org.kde.dolphin//stable"
   # ];
 
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -332,8 +344,8 @@
   # services.openssh.enable = true;
 
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 22 ];
+  networking.firewall.allowedTCPPorts = [22];
-  networking.firewall.allowedUDPPorts = [ 22 ];
+  networking.firewall.allowedUDPPorts = [22];
   # Or disable the firewall altogether.
   #networking.firewall.enable = false;
 
@@ -356,7 +368,7 @@
     settings = {
       experimental-features = ["nix-command" "flakes"];
       auto-optimise-store = true;
-	substituters = ["https://hyprland.cachix.org" "https://nix-gaming.cachix.org" ];
+      substituters = ["https://hyprland.cachix.org" "https://nix-gaming.cachix.org"];
       trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];
     };
   };

nixos/home.nix

@@ -1,15 +1,25 @@
-{ config, lib, pkgs, hwconfig, first-nixos-install, username, inputs, ... }:
-
-  let
-  in
 {
+  config,
+  lib,
+  pkgs,
+  hwconfig,
+  first-nixos-install,
+  username,
+  inputs,
+  ...
+}: let
+in {
   imports =
     [
       ./modules/fastfetch
       ./modules/tmux/home.nix
-    ] ++ lib.optional (hwconfig.useImpermanence) (import ./modules/impermanence/home.nix { inherit username; inherit inputs; } )
+    ]
+    ++ lib.optional (hwconfig.useImpermanence) (import ./modules/impermanence/home.nix {
+      inherit username;
+      inherit inputs;
+    })
     ++ lib.optional (config.programs.hyprland.enable) ./modules/hyprland/home.nix
-    ++ lib.optional (builtins.pathExists ./homes/${username}) (import ./homes/${username} { inherit username; });
+    ++ lib.optional (builtins.pathExists ./homes/${username}) (import ./homes/${username} {inherit username;});
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = username;
@@ -23,7 +33,7 @@
     style.name = "kvantum";
   };
   #xdg.configFile."Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
-#	General.theme = "Catppuccin-Mocha";
+  #	General.theme = "Catppuccin-Mocha";
   # };
   #xdg.configFile = {
   #   "Kvantum/kvantum.kvconfig".text = ''
@@ -47,8 +57,8 @@
   };
 
   #xdg.configFile."qt5ct/qt5ct.conf".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
-#	Appearance.icon_theme = "Breeze Dark";
+  #	Appearance.icon_theme = "Breeze Dark";
-#  };
+  #  };
 
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
@@ -61,7 +71,7 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = with pkgs;[
+  home.packages = with pkgs; [
     # # Adds the 'hello' command to your environment. It prints a friendly
     # # "Hello, world!" when run.
     # pkgs.hello
@@ -83,7 +93,6 @@
     #vscode-fhs
   ];
 
-
   programs.kitty = {
     enable = true;
     font = {
@@ -99,7 +108,6 @@
     # See all available kitty themes at: https://github.com/kovidgoyal/kitty-themes/blob/46d9dfe230f315a6a0c62f4687f6b3da20fd05e4/themes.json
   };
 
-  
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {

nixos/modules/neovim/flake.nix

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

nixos/modules/neovim/nvf-configuration.nix

@@ -1,205 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  vim = {
-    spellcheck.enable = true;
-    viAlias = true;
-    vimAlias = true;
-    shiftwidth = 16;
-    tabstop = 16;
-    useSystemClipboard = true;
-    lineNumberMode = "number";
-
-    languages = {
-      enableFormat = true;
-      enableLSP = true;
-      enableTreesitter = true;
-
-      nix.enable = true;
-      rust.enable = true;
-      clang.enable = true;
-      rust.crates.enable = true;
-      csharp.enable = true;
-      # Nim LSP is broken on Darwin and therefore
-      # should be disabled by default. Users may still enable
-      # `vim.languages.vim` to enable it, this does not restrict
-      # that.
-      # See: <https://github.com/PMunch/nimlsp/issues/178#issue-2128106096>
-      nim.enable = false;
-    };
-
-    lsp = {
-      formatOnSave = true;
-      lspkind.enable = false;
-      lightbulb.enable = true;
-      lspsaga.enable = false;
-      trouble.enable = true;
-      lspSignature.enable = true;
-      otter-nvim.enable = true;
-      lsplines.enable = true;
-      nvim-docs-view.enable = true;
-    };
-
-    debugger = {
-      nvim-dap = {
-        enable = true;
-        ui.enable = true;
-      };
-    };
-    visuals = {
-      nvim-scrollbar.enable = true;
-      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;
-    };
-  };
-}