cleanup

nixos/configuration.nix

@@ -1,8 +1,9 @@
 {pkgs, ...}: {
   imports = [
-    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ./modules/users/users.nix
+    ./modules/system/networking.nix
+    ./modules/system/locale.nix
   ];
 
   # Bootloader.
@@ -15,39 +16,6 @@
   # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # Networking
-  networking = {
-    hostName = "testVM"; # Define your hostname.
-    networkmanager.enable = true;
-  };
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "de";
-    variant = "";
-  };
-
-  # Configure console keymap
-  console.keyMap = "de";
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -56,26 +24,12 @@
   environment.systemPackages = with pkgs; [
     vim
     wget
+    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;
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
 
   system.stateVersion = "25.05"; # Did you read the comment?
 }

nixos/modules/system/locale.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  ...
+}: {
+  time.timeZone = "Europe/Berlin";
+  
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "de_DE.UTF-8";
+      LC_IDENTIFICATION = "de_DE.UTF-8";
+      LC_MEASUREMENT = "de_DE.UTF-8";
+      LC_MONETARY = "de_DE.UTF-8";
+      LC_NAME = "de_DE.UTF-8";
+      LC_NUMERIC = "de_DE.UTF-8";
+      LC_PAPER = "de_DE.UTF-8";
+      LC_TELEPHONE = "de_DE.UTF-8";
+      LC_TIME = "de_DE.UTF-8";
+    };
+  };
+
+  console.keyMap = "de";
+}

nixos/modules/system/networking.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  ...
+}: {
+  networking = {
+    hostName = "nixOS";
+    networkmanager.enable = true;
+  
+    firewall = {
+      enable = true;
+      # allowedTCPPorts = [ 80 443];
+      # allowedUDPPorts = [];
+    };
+  };
+}

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
+  programs.neovim = {
-  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 = {
     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}%} %# '
     '';
   };