homeManagerModules/default.nix

@@ -3,14 +3,5 @@
   imports = [
     ./desktop
     ./programs
-    ./packages
   ];
-  config = {
-    home.username = "krop";
-    home.homeDirectory = "/home/krop";
-    home.stateVersion = "24.05";
-
-    # Let Home Manager install and manage itself.
-    programs.home-manager.enable = true;
-  };
 }

homeManagerModules/desktop/gnome.nix

@@ -17,14 +17,6 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
-    home.pointerCursor = {
-      name = "Adwaita";
-      package = pkgs.adwaita-icon-theme;
-      gtk.enable = true;
-      x11.enable = true;
-      size = 24;
-    };
-
     home.packages = with pkgs; [
       gnomeExtensions.grand-theft-focus
       gnomeExtensions.vitals

homeManagerModules/packages/default.nix

@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./octave.nix
-    ./development.nix
-    ./misc.nix
-  ];
-}

homeManagerModules/packages/development.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.krop.hm.packages.development;
-in
-{
-  options.krop.hm.packages.development = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      example = false;
-      description = "Enable my development configuration";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      gh
-      d2
-      iperf
-    ];
-    programs.go = {
-      enable = true;
-      goPath = "Repositories/go";
-    };
-  };
-}

homeManagerModules/packages/misc.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.krop.hm.packages.misc;
-in
-{
-  options.krop.hm.packages.misc = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      example = false;
-      description = "Enable my misc applications";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      spotify
-      moonlight-qt
-      jetbrains-mono
-      mattermost-desktop
-      gparted
-      prismlauncher # REMOVE AND MOVE TO games module after refactoring
-      joplin-desktop
-      wireshark
-    ];
-  };
-}

homeManagerModules/packages/octave.nix

@@ -1,29 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.krop.hm.packages.octave;
-in
-{
-  options.krop.hm.packages.octave = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      example = false;
-      description = "Enable my octave configuration";
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      ghostscript
-      (octaveFull.withPackages (
-        ps: with ps; [
-          octavePackages.signal
-        ]
-      ))
-    ];
-  };
-}

homeManagerModules/programs/alacritty.nix

@@ -17,7 +17,6 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ alacritty-theme ];
     programs.alacritty = {
       enable = true;
       settings = {

homeManagerModules/programs/codium.nix

@@ -17,10 +17,6 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      gopls
-      nixd
-    ];
     programs.vscode = {
       enable = true;
       package = pkgs.vscodium;

hosts/base/default.nix

@@ -76,6 +76,9 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   programs = {
+    tmux.enable = true;
+    zsh.enable = true;
+    git.enable = true;
     dconf.enable = true;
     thunderbird.enable = true;
     firefox.enable = true;

hosts/lenar/default.nix

@@ -6,6 +6,7 @@
 }:
 {
   imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     inputs.disko.nixosModules.disko
     inputs.nixos-hardware.nixosModules.common-cpu-intel
@@ -13,9 +14,8 @@
   ];
 
   zramSwap.enable = true;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  networking.hostName = "lenar";
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   services.power-profiles-daemon.enable = false;
   services.tlp = {
     enable = true;
@@ -24,6 +24,8 @@
     };
   };
 
+  networking.hostName = "lenar"; # Define your hostname.
+
   # My own modules configuration
   krop = {
     audio = {

hosts/wenar-nix/default.nix

@@ -6,6 +6,7 @@
 }:
 {
   imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     inputs.disko.nixosModules.disko
     inputs.nixos-hardware.nixosModules.common-cpu-intel
@@ -13,8 +14,10 @@
   ];
 
   zramSwap.enable = true;
+
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  networking.hostName = "wenar-nix";
+
+  networking.hostName = "wenar-nix"; # Define your hostname.
 
   # My own modules configuration
   krop = {
@@ -50,7 +53,7 @@
       inherit inputs;
     };
     users = {
-      "krop" = import ./home.nix;
+      "krop" = import ../../users/krop;
     };
   };
 }

hosts/wenar-nix/home.nix

@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.username = "krop";
-  home.homeDirectory = "/home/krop";
-  home.stateVersion = "24.05";
-}

hosts/work-ntb/default.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  networking.hostName = "work-ntb"; # Define your hostname.
+
+  # My own modules configuration
+  krop = {
+    ide = {
+      enable = true;
+      install-pycharm = true;
+    };
+    python.install-additional = true;
+  };
+
+  home-manager = {
+    extraSpecialArgs = {
+      inherit inputs;
+    };
+    users = {
+      "krop" = import ../../users/krop;
+    };
+  };
+}

hosts/work-ntb/hardware-configuration.nix

@@ -0,0 +1,54 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/360cfb7a-07d9-445b-83e2-6ef19bd55948";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/5F8E-3C09";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

users/krop/default.nix

@@ -0,0 +1,48 @@
+{ config, pkgs, ... }:
+
+{
+  home.username = "krop";
+  home.homeDirectory = "/home/krop";
+  home.stateVersion = "24.05";
+
+  home.packages = with pkgs; [
+    spotify
+    moonlight-qt
+    alacritty
+    alacritty-theme
+    nixd
+    nil
+    jetbrains-mono
+    mattermost-desktop
+    gh
+    gparted
+    prismlauncher # REMOVE AND MOVE TO games module after refactoring
+    joplin-desktop
+    albert
+    ghostscript
+    (octaveFull.withPackages (
+      ps: with ps; [
+        octavePackages.signal
+      ]
+    ))
+    wireshark
+    iperf
+    d2
+    gopls
+  ];
+
+  home.pointerCursor = {
+    name = "Adwaita";
+    package = pkgs.adwaita-icon-theme;
+    gtk.enable = true;
+    x11.enable = true;
+    size = 24;
+  };
+
+  programs.go = {
+    enable = true;
+    goPath = "Repositories/go";
+  };
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}