new machine arti

6 files changed, 223 insertions, 5 deletions

diff --git a/home-manager/.config/home-manager/flake.lock b/home-manager/.config/home-manager/flake.lock
index df87466..4446aa0 100644
--- a/home-manager/.config/home-manager/flake.lock
+++ b/home-manager/.config/home-manager/flake.lock
@@ -116,6 +116,27 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1787144466,
+        "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "0471accf8d0a8210b31d947497d179ecc99e0021",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "0471accf8d0a8210b31d947497d179ecc99e0021",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1785602060,
@@ -153,6 +174,7 @@
         "darwin": "darwin",
         "home-manager": "home-manager",
         "llm-agents": "llm-agents",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2"
       }
     },
diff --git a/home-manager/.config/home-manager/flake.nix b/home-manager/.config/home-manager/flake.nix
index 736ec6d..05993ea 100644
--- a/home-manager/.config/home-manager/flake.nix
+++ b/home-manager/.config/home-manager/flake.nix
@@ -8,10 +8,13 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     llm-agents.url = "github:numtide/llm-agents.nix";
-    # nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware = {
+      url = "github:NixOS/nixos-hardware/0471accf8d0a8210b31d947497d179ecc99e0021";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{ nixpkgs, darwin, home-manager, llm-agents, ... }: {
+  outputs = inputs@{ nixpkgs, darwin, home-manager, llm-agents, nixos-hardware, ... }: {
     # NixOS + Home Manager
     nixosConfigurations = {
       "art-sr" = nixpkgs.lib.nixosSystem {
@@ -23,9 +26,25 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.kdam0 = import ./per-user/kdam0-home/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
+          }
+        ];
+      };
+      "arti" = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          nixos-hardware.nixosModules.lenovo-thinkpad-t420
+         ./per-user/kdam0-arti/configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.kdam0 = {
+              imports = [
+                ./common
+                ./per-user/kdam0-arti/home.nix
+              ];
+            };
+            nixpkgs.overlays = [ llm-agents.overlays.shared-nixpkgs ];
           }
         ];
       };
diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix
new file mode 100644
index 0000000..9e66293
--- /dev/null
+++ b/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix
@@ -0,0 +1,134 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./hosts.nix
+  ];
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+  networking.hostName = "arti";
+  networking.networkmanager.enable = true;
+
+  time.timeZone = "America/Toronto";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true;
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  environment.variables.GTK_THEME = "Adwaita:dark";
+
+  environment.systemPackages = with pkgs; [
+    bmon
+    dmenu
+    git
+    home-manager
+    htop
+    (st.overrideAttrs (old: {
+      postPatch = (old.postPatch or "") + ''
+        substituteInPlace config.def.h \
+          --replace-fail 'Liberation Mono:pixelsize=12:antialias=true:autohint=true' \
+                          'FiraCode Nerd Font Mono:style=Retina:size=11:antialias=true:autohint=true'
+      '';
+    }))
+    tree
+    vim
+    wget
+    (zathura.override {
+      plugins = [ pkgs.zathuraPkgs.zathura_pdf_mupdf ];
+    })
+  ];
+
+  services.xserver.enable = true;
+  services.xserver.windowManager.dwm = {
+    enable = true;
+    package = pkgs.dwm.overrideAttrs (oldAttrs: {
+      pname = "dwm";
+      version = "6.8";
+
+      src = pkgs.fetchgit {
+        url = "https://git.kumardamani.net/dwm";
+        rev = "0e086eac6fb20d81747cec51d8f0bae0f4917b5c";
+        hash = "sha256-RV+DEZb756FzZEoYCoqfObWE6XMHgnoxbG1jjpfUsKQ=";
+      };
+    });
+  };
+
+  services.xserver.xkb.layout = "us";
+  services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+  services.printing.enable = true;
+
+  services.pulseaudio.enable = true;
+  services.pipewire.enable = false;
+
+  services.libinput.enable = true;
+
+  users.users.kdam0 = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    shell = pkgs.zsh;
+  };
+
+  security.sudo.wheelNeedsPassword = false;
+
+  programs.firefox = {
+    enable = true;
+    preferences."ui.systemUsesDarkTheme" = 1;
+    policies = {
+      DisableTelemetry = true;
+      ExtensionSettings = {
+        "uBlock0@raymondhill.net" = {
+          installation_mode = "normal_installed";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+        };
+        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          installation_mode = "normal_installed";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+        };
+      };
+    };
+  };
+
+  programs.slock.enable = true;
+  programs.mtr.enable = true;
+  programs.zsh.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  services.openssh.enable = true;
+
+  services.dwm-status = {
+    enable = true;
+    settings = {
+      order = [ "audio" "battery" "cpu_load" "network" "time" ];
+      time.format = "%F %a %r";
+    };
+  };
+
+  networking.firewall.enable = false;
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-color-emoji
+    liberation_ttf
+    fira-code
+    fira-code-symbols
+    nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
+  ];
+
+  system.stateVersion = "26.05";
+}
diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/hardware-configuration.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/hardware-configuration.nix
new file mode 100644
index 0000000..16ec212
--- /dev/null
+++ b/home-manager/.config/home-manager/per-user/kdam0-arti/hardware-configuration.nix
@@ -0,0 +1,27 @@
+# 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 = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/77deea89-2814-4e2c-9b5a-49d81938a6c2";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/2f136361-4cd4-43bb-8f89-e6f7ddfda01e"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix
new file mode 100644
index 0000000..781ffac
--- /dev/null
+++ b/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home.username = "kdam0";
+  home.homeDirectory = "/home/kdam0";
+
+  home.shellAliases.up = lib.mkForce "cd ~/.config/home-manager && sudo nixos-rebuild switch --flake .#arti";
+}
\ No newline at end of file
diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/hosts.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/hosts.nix
new file mode 100644
index 0000000..975dcf8
--- /dev/null
+++ b/home-manager/.config/home-manager/per-user/kdam0-arti/hosts.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  networking.extraHosts = ''
+    192.168.0.87 art-jr
+    192.168.0.213 sr
+  '';
+}