cleanup

nixos/configuration.nix

@@ -27,16 +27,6 @@
     cifs-utils
   ];
 
-  # 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:
-
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 

nixos/modules/users/nvf.nix

@@ -0,0 +1,21 @@
+{
+  pkgs,
+  config,
+  builtins,
+  ...
+}: 
+let
+  nvf = import (builtins.fetchTarball {
+    url = "https://github.com/notashelf/nvf/archive/v0.8.tar.gz";
+    # Optionally, you can add 'sha256' for verification and caching
+    # sha256 = "<sha256>";
+  });
+in{
+  imports = [
+    nvf.nixosModules.nvf
+  ];
+  
+  programs.nvf = {
+    enable = true;
+  };
+}

nixos/modules/users/nvim.nix

@@ -1,19 +1,19 @@
 {
   pkgs,
+  config,
+  builtins,
   ...
-}: 
-let
-  nvf = import (builtins.fetchTarball {
-    url = "https://github.com/notashelf/nvf/archive/v0.7.tar.gz";
-    # Optionally, you can add 'sha256' for verification and caching
-    # sha256 = "<sha256>";
-  });
-in{
-  imports = [
-    nvf.nixosModules.nvf
-  ];
-
-  programs.nvf = {
+}: {
+  programs.neovim = {
     enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+
+    configure = {
+      customRC = ''
+      set number
+      '';
+    };
   };
 }

nixos/modules/users/packages.nix

@@ -6,5 +6,6 @@
     curl
     bat
     nethogs
+    git
   ];
 }

nixos/modules/users/users.nix

@@ -5,6 +5,7 @@ in {
     (import ./zsh.nix {inherit pkgs user;})
     ./zoxide.nix
     (import ./packages.nix {inherit pkgs user;})
+    ./nvim.nix
   ];
 
   # Define user account and dont forget to set a password with 'passwd'

nixos/modules/users/zsh.nix

@@ -22,11 +22,19 @@
       "HIST_IGNORE_SPACE"
       "EXTENDED_GLOB"
       "CORRECT"
+      # "PROMPT_SUBST"
     ];
+  
     shellInit = ''
       eval "$(fzf --zsh)"
       alias ..="cd .."
       alias ...="cd ../.."
+      bindkey -e
+      # export %# '
+    '';
+
+    promptInit = ''
+      PS1='%{%F{green}%}%n@%m %{%F{blue}%}%~%{%f%}❯%{%F{white}%} %# '
     '';
   };