nvf changes

hosts/vali/hermit/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
@@ -13,15 +17,15 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
+    device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
     fsType = "ext4";
   };
 
   boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e";
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/E355-67EA";
+    device = "/dev/disk/by-uuid/E355-67EA";
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };

hosts/vali/hermit/programs.nix

@@ -1,5 +1,8 @@
-{ inputs, pkgs, ... }:
+{
-let
+  inputs,
+  pkgs,
+  ...
+}: let
   fenix = inputs.fenix.packages.${pkgs.system};
   nixpkgs-wayland = inputs.nixpkgs-wayland.packages.${pkgs.system};
 in {

modules/editors/nvf/nvf.nix

@@ -1,6 +1,11 @@
 # Thank your Mr. poz! (https://git.jacekpoz.pl/jacekpoz/niksos)
-{ config, inputs, lib, pkgs, ... }:
+{
-let
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.modules.editors.neovim;
   inherit (config.modules.other.system) username;
 

modules/editors/nvf/plugins/extra.nix

@@ -1,12 +1,14 @@
 {
+  config,
   self,
   pkgs,
   ...
 }: let
+  inherit (config.modules.other.system) username;
   inherit (pkgs.vimPlugins) friendly-snippets aerial-nvim nvim-surround undotree mkdir-nvim ssr-nvim direnv-vim legendary-nvim;
   pluginSources = import ./sources {inherit self pkgs;};
 in {
-  programs.neovim-flake.settings.vim.extraPlugins = {
+  home-manager.users.${username}.programs.neovim-flake.settings.vim.extraPlugins = {
     # plugins that are pulled from nixpkgs
     direnv = {package = direnv-vim;};
     friendly-snippets = {package = friendly-snippets;};

modules/editors/nvf/plugins/settings/assistant.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     assistant.copilot = {
       enable = true;
       cmp.enable = true;

modules/editors/nvf/plugins/settings/autocomplete.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     autocomplete = {
       enable = true;
       type = "nvim-cmp";

modules/editors/nvf/plugins/settings/autopairs.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     autopairs.enable = true;
   };
 }

modules/editors/nvf/plugins/settings/binds.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     binds = {
       whichKey.enable = true;
       cheatsheet.enable = false;

modules/editors/nvf/plugins/settings/comments.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     comments.comment-nvim.enable = true;
   };
 }

modules/editors/nvf/plugins/settings/dashboard.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     dashboard = {
       alpha.enable = true;
     };

modules/editors/nvf/plugins/settings/debugger.nix

@@ -1,5 +1,7 @@
-{
+{config, ...}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.programs.neovim-flake.settings.vim = {
     debugger.nvim-dap = {
       enable = true;
       ui.enable = true;

modules/editors/nvf/plugins/settings/filetree.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     filetree = {
       nvimTree = {

modules/editors/nvf/plugins/settings/gestures.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     gestures.gesture-nvim.enable = false;
   };

modules/editors/nvf/plugins/settings/git.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     git = {
       enable = true;

modules/editors/nvf/plugins/settings/languages.nix

@@ -3,8 +3,10 @@
   pkgs,
   lib,
   ...
-}: {
+}: let
-  programs.neovim-flake.settings.vim = {
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.users.${username}.programs.neovim-flake.settings.vim = {
     languages = {
       enableLSP = true;
       enableFormat = true;

modules/editors/nvf/plugins/settings/lsp.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     lsp = {
       formatOnSave = true;

modules/editors/nvf/plugins/settings/minimap.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     minimap = {
       # cool for vanity but practically useless on small screens

modules/editors/nvf/plugins/settings/notes.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     notes = {
       todo-comments.enable = true;

modules/editors/nvf/plugins/settings/notify.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     notify = {
       nvim-notify.enable = true;

modules/editors/nvf/plugins/settings/presence.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     presence.neocord.enable = false;
   };

modules/editors/nvf/plugins/settings/projects.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     projects = {
       project-nvim = {

modules/editors/nvf/plugins/settings/session.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     session.nvim-session-manager = {
       enable = false;

modules/editors/nvf/plugins/settings/statusline.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     statusline = {
       lualine = {

modules/editors/nvf/plugins/settings/tabline.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     tabline = {
       nvimBufferline.enable = true;

modules/editors/nvf/plugins/settings/telescope.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     telescope.enable = true;
   };

modules/editors/nvf/plugins/settings/template.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
   };
 }

modules/editors/nvf/plugins/settings/terminal.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     terminal = {
       toggleterm = {

modules/editors/nvf/plugins/settings/theme.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     theme = {
       enable = true;

modules/editors/nvf/plugins/settings/treesitter.nix

@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     treesitter = {
       fold = true;

modules/editors/nvf/plugins/settings/ui.nix

@@ -1,4 +1,11 @@
 {
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     ui = {
       noice.enable = true;

modules/editors/nvf/plugins/settings/utility.nix

@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     utility = {
       ccc.enable = true;

modules/editors/nvf/plugins/settings/visuals.nix

@@ -1,4 +1,7 @@
-{
+{config, ...}: let
+  inherit (config.modules.other.system) username;
+in {
+  home-manager.${username}.
   programs.neovim-flake.settings.vim = {
     visuals = {
       enable = true;

modules/editors/nvf/plugins/sources/default.nix

@@ -15,12 +15,11 @@
 
     smart-splits = buildVimPlugin {
       name = "smart-splits";
-      src = pins."smart-splits.nvim";
+      src = fetchFromGitHub {
-    };
+        owner = "mrjones2014";
-
+        repo = "smart-splits.nvim";
-    slides-nvim = buildVimPlugin {
+        rev = "95833675cd92538bf9cded1d2d58d1fc271c5428";
-      name = "slides.nvim";
+        hash = "";
-      src = pins."slides.nvim";
       };
 
       regexplainer = buildVimPlugin {
@@ -52,7 +51,6 @@
           hash = "sha256-nanNQEtpjv0YKEkkrPmq/5FPxq+Yj/19cs0Gf7YgKjU=";
         };
       };
-
       data-viewer-nvim = buildVimPlugin {
         name = "data-viewer.nvim";
         src = fetchFromGitHub {
@@ -62,7 +60,6 @@
           hash = "sha256-D5hvLhsYski11H9qiDDL2zlZMtYmbpHgpewiWR6C7rE=";
         };
       };
-
       vim-nftables = buildVimPlugin {
         name = "vim-nftables";
         src = fetchFromGitHub {
@@ -83,5 +80,6 @@
         };
       };
     };
+  };
 in
   sources

modules/gui/foot.nix

@@ -1,5 +1,10 @@
-{ config, inputs, lib, pkgs, ... }:
+{
-let
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}: let
   cfg = config.modules.programs.foot;
   inherit (config.modules.other.system) username;
 
@@ -36,8 +41,7 @@ in {
             pad = "5x5 center";
             resize-delay-ms = 100;
 
-            notify =
+            notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
-              "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
 
             bold-text-in-bright = "no";
             word-delimiters = '',│`|:"'()[]{}<>'';
@@ -59,8 +63,7 @@ in {
             launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
             label-letters = "sadfjklewcmpgh";
             osc8-underline = "always";
-            protocols =
+            protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
-              "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
             uri-characters = ''
               abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]'';
           };

modules/wms/wayland/hypr/land.nix

@@ -61,7 +61,6 @@ in {
           ];
           # Workspace config
           workspace = [
-
             "1,monitor:HDMI-A-1, default:true"
             "2,monitor:HDMI-A-1"
             "3,monitor:HDMI-A-1"

options/common/bluetooth.nix

@@ -1,5 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-let inherit (config.modules.other.system) username;
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
 in {
   hardware.bluetooth = {
     enable = true;