home/default.nix

@@ -1,52 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  albert_autostart = (pkgs.makeAutostartItem {
-    name = "albert";
-    package = pkgs.albert;
-  });
-  guake_autostart = (pkgs.makeAutostartItem {
-    name = "guake";
-    package = pkgs.guake;
-  });
-in {
-  nixpkgs.config = { allowUnfree = true; };
-
-  imports = [ ./git.nix ./zsh.nix ./gnome.nix ./code.nix ];
-
-  home.stateVersion = "21.05";
-
-  home.packages = with pkgs; [
-    albert
-    guake
-
-    firefox
-    chromium
-
-    # reversing
-    rizin
-    
-    nmap 
-
-    slack
-    signal-desktop
-    teams
-    discord
-    element-desktop
-
-    spotify
-
-    bind
-    gparted
-    sshfs
-
-    # autostart
-    albert_autostart
-    guake_autostart
-  ];
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-  };
-}

home/home.nix

@@ -0,0 +1,80 @@
+{ config, pkgs, ... }:
+
+let
+  albert_autostart = (pkgs.makeAutostartItem {
+    name = "albert";
+    package = pkgs.albert;
+  });
+  guake_autostart = (pkgs.makeAutostartItem {
+    name = "guake";
+    package = pkgs.guake;
+  });
+in {
+  nixpkgs.config = { allowUnfree = true; };
+
+  #
+  # imports
+  #
+
+  imports = [ ./git.nix ./gnome.nix ./zsh.nix ./code.nix ];
+
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "giulio";
+  home.homeDirectory = "/home/giulio";
+
+  # This value determines the Home Manager release that your
+  # configuration is compatible with. This helps avoid breakage
+  # when a new Home Manager release introduces backwards
+  # incompatible changes.
+  #
+  # You can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
+  home.stateVersion = "21.05";
+
+  home.packages = with pkgs; [
+    # essentials
+    albert
+    guake
+
+    # browsers
+    firefox
+    brave
+    chromium
+
+    # reversing
+    rizin
+    
+    # networking
+    nmap 
+
+    # development
+    clang
+
+    # social
+    slack
+    signal-desktop
+    teams
+    discord
+    element-desktop
+
+    # music
+    spotify
+
+    # misc
+    bind
+    
+    # system
+    gparted
+
+    # autostart
+    albert_autostart
+    guake_autostart
+  ];
+
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    VISUAL = "nvim";
+  };
+}

hosts/gAluminum/configuration.nix

@@ -0,0 +1,113 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ ./hardware-configuration.nix ];
+
+  nixpkgs.config.allowUnfree = true;
+  networking.hostName = "gAluminum";
+
+  time.timeZone = "Europe/London";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  # Xserver
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.layout = "us";
+  services.xserver.xkbOptions = "eurosign:e";
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound.
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.giulio = {
+    description = "Giulio De Pasquale";
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    extraGroups = [ "wheel" "docker" "networkmanager" ];
+  };
+  programs.zsh.enableCompletion = true;  
+  programs.zsh.enableBashCompletion = true;
+  services.dbus.packages = with pkgs; [ gnome3.dconf ];
+  services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; 
+  environment.systemPackages = with pkgs; [
+    wget
+    git
+    pciutils
+    curl
+    virtualbox
+    cmake
+    ninja
+    gdb
+    htop
+    glances
+    tcpdump
+    restic
+    gnomeExtensions.appindicator
+    binutils
+    efibootmgr
+    neovim
+    home-manager
+  ];
+
+  fonts.fonts = with pkgs; [cascadia-code];
+
+  system.stateVersion = "21.05"; # Did you read the comment?
+
+  security.pam.services.gdm.enableGnomeKeyring = true;
+
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  boot.loader.systemd-boot.enable = true;
+  boot.initrd.luks.devices = {
+    root = {
+      device = "/dev/disk/by-uuid/c2bac3a6-0999-4e1d-a676-bf4bcafee2d4";
+      preLVM = true;
+      allowDiscards = true;
+    };
+  };
+
+  networking.wg-quick.interfaces = {
+    giupi = {
+      address = ["10.3.0.2/32"];
+      privateKeyFile = "/etc/wireguard/giupi.key";
+      dns = ["10.3.0.1"];
+      peers = [
+        {
+          publicKey = "I4glUMvIGjjhvQMKhwGc8copPl2t9Us/YYRjT0BKuiw=";
+          allowedIPs = ["0.0.0.0/0"];
+          endpoint = "giugl.io:1194";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
+  };
+
+  fileSystems."/tmp" = {
+    device = "tmpfs";
+    fsType = "tmpfs";
+    options = ["size=2G"];
+  };
+
+  fileSystems."/home/giulio/Downloads" = {
+    device = "tmpfs";
+    fsType = "tmpfs";
+    options = ["size=3G"];
+  };
+}
+

hosts/gAluminum/default.nix

@@ -1,109 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  hostname = "gAluminum";
-in {
-  imports = [ 
-    ./hardware.nix 
-    ../../variables.nix
-    ../../common.nix
-    ../../users.nix
-  ];
-  
-  variables.hostname = hostname;
-
-  boot = {
-    loader = {
-      efi.canTouchEfiVariables = true;
-      efi.efiSysMountPoint = "/boot/efi";
-      systemd-boot.enable = true;
-    };
-
-    initrd.luks.devices = {
-      root = {
-        device = "/dev/disk/by-uuid/c2bac3a6-0999-4e1d-a676-bf4bcafee2d4";
-        preLVM = true;
-        allowDiscards = true;
-      };
-    };
-  };
-
-  networking = {
-    hostName = hostname;
-
-    wg-quick.interfaces = {
-      giupi = {
-        address = ["10.3.0.2/32"];
-        privateKeyFile = "/etc/wireguard/giupi.key";
-        dns = ["10.3.0.1"];
-        peers = [
-          {
-            publicKey = "I4glUMvIGjjhvQMKhwGc8copPl2t9Us/YYRjT0BKuiw=";
-            allowedIPs = ["0.0.0.0/0"];
-            endpoint = "giugl.io:1194";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
-  };
-
-  time.timeZone = "Europe/London";
-
-  services = {
-    xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-      libinput.enable = true;
-      layout = "us";
-      xkbOptions = "eurosign:e";
-    };
-
-    printing.enable = true;
-    dbus.packages = with pkgs; [ gnome3.dconf ];
-    udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; 
-  };
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    wget
-    git
-    pciutils
-    curl
-    virtualbox
-    cmake
-    ninja
-    gdb
-    htop
-    glances
-    tcpdump
-    restic
-    gnomeExtensions.appindicator
-    binutils
-    efibootmgr
-    neovim
-    home-manager
-  ];
-
-  fonts.fonts = with pkgs; [cascadia-code];
-
-  system.stateVersion = "21.05"; # Did you read the comment?
-
-  security.pam.services.gdm.enableGnomeKeyring = true;
-
-  fileSystems."/tmp" = {
-    device = "tmpfs";
-    fsType = "tmpfs";
-    options = ["size=2G"];
-  };
-
-  fileSystems."/home/giulio/Downloads" = {
-    device = "tmpfs";
-    fsType = "tmpfs";
-    options = ["size=3G"];
-  };
-}
-

users.nix

@@ -7,12 +7,7 @@
     description = "Giulio De Pasquale";
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = [ "wheel" "docker" "networkmanager" ];
-  };
-
-  programs.zsh = {
-    enableBashCompletion = true;
-    enableCompletion = true;
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
   };
 
   home-manager.users.giulio = {