ref: nixos config

nix/hosts/thinkpad/bootloader.nix

@@ -1,4 +0,0 @@
-{...}: {
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-}

nix/hosts/thinkpad/default.nix

@@ -1,15 +1,34 @@
 {pkgs, ...}: {
   system.stateVersion = "23.11";
 
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+
+  programs.fish.enable = true;
+  environment.shells = [pkgs.fish];
+  users.users.leana = {
+    shell = pkgs.fish;
+    isNormalUser = true;
+    description = "leana";
+    extraGroups = ["networkmanager" "wheel"];
+    packages = [];
+  };
+
+  sound = {
+    enable = true;
+    mediaKeys.enable = true;
+  };
+  hardware.pulseaudio.enable = true;
+
   imports = [
     ./hardware-configuration.nix
 
-    ./bootloader.nix
     ./locale.nix
     ./networking.nix
     ./packages.nix
-    ./sound.nix
-    ./users.nix
+    ./gui.nix
   ];
 
   nix = {

nix/hosts/thinkpad/gui.nix

@@ -0,0 +1,18 @@
+{pkgs, ...}: {
+  services.xserver = {
+    enable = true;
+    autoRepeatDelay = 300;
+    autoRepeatInterval = 40;
+
+    displayManager.gdm.enable = true;
+
+    windowManager.xmonad = {
+      enable = true;
+      enableContribAndExtras = true;
+      extraPackages = hp: with hp; [neat-interpolation];
+    };
+  };
+  programs.nm-applet.enable = true;
+
+  programs.gnome-terminal.enable = true;
+}

nix/hosts/thinkpad/networking.nix

@@ -1,6 +1,4 @@
 {hostname, ...}: {
   networking.hostName = hostname;
   networking.networkmanager.enable = true;
-
-  services.openssh.enable = true;
 }

nix/hosts/thinkpad/packages.nix

@@ -12,25 +12,4 @@
 
     agenix.default
   ];
-
-  # TODO: try to move this to home-manager
-  programs = {
-    gnome-terminal.enable = true;
-  };
-
-  services.xserver = {
-    enable = true;
-    autoRepeatDelay = 300;
-    autoRepeatInterval = 40;
-    windowManager.xmonad = {
-      enable = true;
-      enableContribAndExtras = true;
-      extraPackages = hp: with hp; [neat-interpolation];
-    };
-    displayManager.gdm.enable = true;
-  };
-  programs.nm-applet.enable = true;
-
-  programs.fish.enable = true;
-  environment.shells = [pkgs.fish];
 }

nix/hosts/thinkpad/sound.nix

@@ -1,6 +0,0 @@
-{...}: {
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
-  sound.mediaKeys.enable = true;
-}

nix/hosts/thinkpad/users.nix

@@ -1,24 +0,0 @@
-{
-  pkgs,
-  unstable,
-  ...
-}: {
-  users.users.leana = {
-    shell = pkgs.fish;
-    isNormalUser = true;
-    description = "leana";
-    extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [
-      # Window Manager related
-      dmenu
-      xmobar
-      scrot
-      xscreensaver
-      trayer
-      xclip
-
-      # GUI apps
-      # discord
-    ];
-  };
-}