cleanup by gurjaka

nixos/configuration.nix

@@ -1,23 +1,25 @@
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
+{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?
-
 }

nixos/modules/users/packages.nix

@@ -1,6 +1,4 @@
-{config, pkgs, ...}:
-
-{
+{pkgs, ...}: {
   users.users.users.packages = with pkgs; [
     btop
     ncdu
@@ -8,5 +6,5 @@
     curl
     bat
     nethogs
-  ]
+  ];
 }

nixos/modules/users/users.nix

@@ -1,11 +1,13 @@
-{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 = {
+  users.users."${user}" = {
     isNormalUser = true;
     description = "cerberus";
     extraGroups = ["networkmanager" "wheel"];

nixos/modules/users/zoxide.nix

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

nixos/modules/users/zsh.nix

@@ -1,10 +1,12 @@
-{config, pkgs, ...}:
-
 {
-  users.users.cerberus.packages = with pkgs; [
-  zoxide
+  pkgs,
+  user,
+  ...
+}: {
+  users.users.${user}.packages = with pkgs; [
     fzf
   ];
+
   # ZSH configuration
   programs.zsh = {
     enable = true;
@@ -22,15 +24,14 @@
       "CORRECT"
     ];
     shellInit = ''
-        eval "$(zoxide init zsh)"
       eval "$(fzf --zsh)"
+      alias ..="cd .."
+      alias ...="cd ../.."
     '';
   };
 
   # Setting aliases
   environment.shellAliases = {
     ls = "ls -l --color --hyperlink=auto";
-      # ".." = "cd ..";
-      # "..." = "cd ../.."
   };
 }