cleanup

gurjaka.patch

@@ -0,0 +1,187 @@
+diff --git a/nixos/configuration.nix b/nixos/configuration.nix
+index 1b30ea0..1cd7cd6 100644
+--- a/nixos/configuration.nix
++++ b/nixos/configuration.nix
+@@ -1,23 +1,25 @@
+-{ config, pkgs, ... }:
+-
+-{
+-  imports =
+-    [ # Include the results of the hardware scan.
+-      ./hardware-configuration.nix
+-      ./modules/users/users.nix
+-    ];
++{pkgs, ...}: {
++  imports = [
++    # Include the results of the hardware scan.
++    ./hardware-configuration.nix
++    ./modules/users/users.nix
++  ];
+ 
+   # Bootloader.
+-  boot.loader.grub.enable = true;
+-  boot.loader.grub.device = "/dev/vda";
+-  boot.loader.grub.useOSProber = true;
++  boot.loader.grub = {
++    enable = true;
++    device = "/dev/vda";
++    useOSProber = true;
++  };
+ 
+   # Use latest kernel.
+   boot.kernelPackages = pkgs.linuxPackages_latest;
+ 
+   # Networking
+-  networking.hostName = "testVM"; # Define your hostname.
+-  networking.networkmanager.enable = true;
++  networking = {
++    hostName = "testVM"; # Define your hostname.
++    networkmanager.enable = true;
++  };
+ 
+   # Set your time zone.
+   time.timeZone = "Europe/Berlin";
+@@ -46,14 +48,6 @@
+   # Configure console keymap
+   console.keyMap = "de";
+ 
+-  # Define a user account. Don't forget to set a password with ‘passwd’.
+-  # users.users.cerberus = {
+-  #   isNormalUser = true;
+-  #   description = "cerberus";
+-  #   extraGroups = [ "networkmanager" "wheel" ];
+-  #   packages = with pkgs; [];
+-  # };
+-
+   # Allow unfree packages
+   nixpkgs.config.allowUnfree = true;
+ 
+@@ -84,5 +78,4 @@
+   # networking.firewall.enable = false;
+ 
+   system.stateVersion = "25.05"; # Did you read the comment?
+-
+ }
+diff --git a/nixos/modules/users/packages.nix b/nixos/modules/users/packages.nix
+index 36da781..49e267f 100644
+--- a/nixos/modules/users/packages.nix
++++ b/nixos/modules/users/packages.nix
+@@ -1,12 +1,10 @@
+-{config, pkgs, ...}:
+-
+-{
++{pkgs, ...}: {
+   users.users.users.packages = with pkgs; [
+-  btop
+-  ncdu
+-  tmux
+-  curl
+-  bat
+-  nethogs
+-  ]
++    btop
++    ncdu
++    tmux
++    curl
++    bat
++    nethogs
++  ];
+ }
+diff --git a/nixos/modules/users/users.nix b/nixos/modules/users/users.nix
+index d35d777..7f3f395 100644
+--- a/nixos/modules/users/users.nix
++++ b/nixos/modules/users/users.nix
+@@ -1,14 +1,16 @@
+-{config, pkgs, ...}:
+-
+-{
++{pkgs, ...}: let
++  user = "cerberus";
++in {
+   imports = [
+-    ./zsh.nix
++    (import ./zsh.nix {inherit pkgs user;})
++    ./zoxide.nix
+   ];
++
+   # Define user account and dont forget to set a password with 'passwd'
+-  users.users.cerberus = {
+-  	isNormalUser = true;
++  users.users."${user}" = {
++    isNormalUser = true;
+     description = "cerberus";
+-    extraGroups = [ "networkmanager" "wheel" ];
++    extraGroups = ["networkmanager" "wheel"];
+     shell = pkgs.zsh;
+   };
+ }
+diff --git a/nixos/modules/users/zsh.nix b/nixos/modules/users/zsh.nix
+index 2dd2f98..aa5638e 100644
+--- a/nixos/modules/users/zsh.nix
++++ b/nixos/modules/users/zsh.nix
+@@ -1,36 +1,37 @@
+-{config, pkgs, ...}:
+-
+ {
+-  users.users.cerberus.packages = with pkgs; [
+-  zoxide
+-  fzf
++  pkgs,
++  user,
++  ...
++}: {
++  users.users.${user}.packages = with pkgs; [
++    fzf
+   ];
++
+   # ZSH configuration
+   programs.zsh = {
+-      enable = true;
+-      enableCompletion = true;
+-      autosuggestions.enable = true;
+-      syntaxHighlighting.enable = true;
+-      histSize = 10000;
+-      histFile = "$HOME/.zsh_history";
+-      setOptions = [
+-          "HIST_IGNORE_ALL_DUPS"
+-          "APPEND_HISTORY"
+-          "SHARE_HISTORY"
+-          "HIST_IGNORE_SPACE"
+-          "EXTENDED_GLOB"
+-          "CORRECT"
+-        ];
+-      shellInit = ''
+-        eval "$(zoxide init zsh)"
+-        eval "$(fzf --zsh)"
+-        '';
+-    };
++    enable = true;
++    enableCompletion = true;
++    autosuggestions.enable = true;
++    syntaxHighlighting.enable = true;
++    histSize = 10000;
++    histFile = "$HOME/.zsh_history";
++    setOptions = [
++      "HIST_IGNORE_ALL_DUPS"
++      "APPEND_HISTORY"
++      "SHARE_HISTORY"
++      "HIST_IGNORE_SPACE"
++      "EXTENDED_GLOB"
++      "CORRECT"
++    ];
++    shellInit = ''
++      eval "$(fzf --zsh)"
++    '';
++  };
+ 
+   # Setting aliases
+   environment.shellAliases = {
+-      ls = "ls -l --color --hyperlink=auto";
+-      # ".." = "cd ..";
+-      # "..." = "cd ../.."
+-    };
++    ls = "ls -l --color --hyperlink=auto";
++    # ".." = "cd ..";
++    # "..." = "cd ../.."
++  };
+ }

nixos/configuration.nix

@@ -1,59 +1,21 @@
-{ config, pkgs, ... }:
+{pkgs, ...}: {
-
+  imports = [
-{
+    ./hardware-configuration.nix
-  imports =
+    ./modules/users/users.nix
-    [ # Include the results of the hardware scan.
+    ./modules/system/networking.nix
-      ./hardware-configuration.nix
+    ./modules/system/locale.nix
-      ./modules/users/users.nix
+  ];
-    ];
 
   # Bootloader.
-  boot.loader.grub.enable = true;
+  boot.loader.grub = {
-  boot.loader.grub.device = "/dev/vda";
+    enable = true;
-  boot.loader.grub.useOSProber = true;
+    device = "/dev/vda";
+    useOSProber = true;
+  };
 
   # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # Networking
-  networking.hostName = "testVM"; # Define your hostname.
-  networking.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";
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  # users.users.cerberus = {
-  #   isNormalUser = true;
-  #   description = "cerberus";
-  #   extraGroups = [ "networkmanager" "wheel" ];
-  #   packages = with pkgs; [];
-  # };
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -62,27 +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

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  config,
+  builtins,
+  ...
+}: {
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+
+    configure = {
+      customRC = ''
+      set number
+      '';
+    };
+  };
+}

nixos/modules/users/packages.nix

@@ -1,12 +1,11 @@
-{config, pkgs, ...}:
+{pkgs, user, ...}: {
-
+  users.users.${user}.packages = with pkgs; [
-{
+    btop
-  users.users.users.packages = with pkgs; [
+    ncdu
-  btop
+    tmux
-  ncdu
+    curl
-  tmux
+    bat
-  curl
+    nethogs
-  bat
+    git
-  nethogs
+  ];
-  ]
 }

nixos/modules/users/users.nix

@@ -1,14 +1,18 @@
-{config, pkgs, ...}:
+{pkgs, ...}: let
-
+  user = "cerberus";
-{
+in {
   imports = [
-    ./zsh.nix
+    (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'
-  users.users.cerberus = {
+  users.users."${user}" = {
-  	isNormalUser = true;
+    isNormalUser = true;
     description = "cerberus";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = ["networkmanager" "wheel"];
     shell = pkgs.zsh;
   };
 }

nixos/modules/users/zoxide.nix

@@ -0,0 +1,9 @@
+{
+  pkgs,
+  ...
+}: {
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}

nixos/modules/users/zsh.nix

@@ -1,36 +1,45 @@
-{config, pkgs, ...}:
-
 {
-  users.users.cerberus.packages = with pkgs; [
+  pkgs,
-  zoxide
+  user,
-  fzf
+  ...
+}: {
+  users.users.${user}.packages = with pkgs; [
+    fzf
   ];
+
   # ZSH configuration
   programs.zsh = {
-      enable = true;
+    enable = true;
-      enableCompletion = true;
+    enableCompletion = true;
-      autosuggestions.enable = true;
+    autosuggestions.enable = true;
-      syntaxHighlighting.enable = true;
+    syntaxHighlighting.enable = true;
-      histSize = 10000;
+    histSize = 10000;
-      histFile = "$HOME/.zsh_history";
+    histFile = "$HOME/.zsh_history";
-      setOptions = [
+    setOptions = [
-          "HIST_IGNORE_ALL_DUPS"
+      "HIST_IGNORE_ALL_DUPS"
-          "APPEND_HISTORY"
+      "APPEND_HISTORY"
-          "SHARE_HISTORY"
+      "SHARE_HISTORY"
-          "HIST_IGNORE_SPACE"
+      "HIST_IGNORE_SPACE"
-          "EXTENDED_GLOB"
+      "EXTENDED_GLOB"
-          "CORRECT"
+      "CORRECT"
-        ];
+      # "PROMPT_SUBST"
-      shellInit = ''
+    ];
-        eval "$(zoxide init zsh)"
+  
-        eval "$(fzf --zsh)"
+    shellInit = ''
-        '';
+      eval "$(fzf --zsh)"
-    };
+      alias ..="cd .."
+      alias ...="cd ../.."
+      bindkey -e
+      # export %# '
+    '';
+
+    promptInit = ''
+      PS1='%{%F{green}%}%n@%m %{%F{blue}%}%~%{%f%}❯%{%F{white}%} %# '
+    '';
+  };
 
   # Setting aliases
   environment.shellAliases = {
-      ls = "ls -l --color --hyperlink=auto";
+    ls = "ls -l --color --hyperlink=auto";
-      # ".." = "cd ..";
+  };
-      # "..." = "cd ../.."
-    };
 }