From 0974d3eb4a176fc2255fb2ffb48ea014bd5301a4 Mon Sep 17 00:00:00 2001
From: Michael Thomson <michael@michaelthomson.dev>
Date: Fri, 17 May 2024 09:55:36 -0400
Subject: [PATCH] update

---
 hosts/thinkpad/configuration.nix | 107 +++++--------------------------
 hosts/thinkpad/home.nix          |   7 +-
 2 files changed, 20 insertions(+), 94 deletions(-)

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index f93c9b5..82f2eea 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -9,99 +9,35 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       inputs.home-manager.nixosModules.default
+      ../../modules/nixos/user.nix
+      ../../modules/nixos/i3.nix
+      ../../modules/nixos/nm.nix
+      ../../modules/nixos/sound.nix
+      ../../modules/nixos/env.nix
     ];
 
-# Bootloader.
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.useOSProber = true;
 
-  networking.hostName = "thinkpad"; # Define your hostname.
-# networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.hostName = "thinkpad";
 
-# Enable networking
-  networking.networkmanager.enable = true;
-
-# Set your time zone.
   time.timeZone = "America/Toronto";
 
-# Select internationalisation properties.
   i18n.defaultLocale = "en_CA.UTF-8";
 
-# i3 relates stuff
-  environment.pathsToLink = [ "/libexec" ];
-  services.xserver = {
-    enable = true; 
-
-    desktopManager = {
-      xterm.enable = false;
-    };
-
-    displayManager = {
-      defaultSession = "none+i3";
-      lightdm.enable = true;
-    };
-
-    windowManager.i3 = {
-      enable = true;
-      package = pkgs.i3-gaps;
-      extraPackages = with pkgs; [
-        dmenu
-        i3status
-        i3lock
-        i3blocks
-        feh
-        arandr
-      ];
-    };
-
-    layout = "us";
-    xkbVariant = "";
-  };
-
-# pipewire
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-# Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.mthomson = {
-    isNormalUser = true;
-    description = "Michael Thomson";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
-  };
-
-# Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  nix.settings = {
-    trusted-users = ["mthomson"];
-
-    substituters = [
-      "https://cache.nixos.org"
-      "https://nix-community.cachix.org"
-    ];
-
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
-
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  environment.systemPackages = with pkgs; [
-    neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-      wget
-      git
-      curl
-  ];
 
-  environment.variables.EDITOR = "nvim";
+  environment.systemPackages = with pkgs; [
+    neovim
+    wget
+    git
+    curl
+  ];
 
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
@@ -112,18 +48,5 @@
     };
   };
 
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-# Add any missing dynamic libraries for unpackaged programs
-# here, NOT in environment.systemPackages
-  ];
-
-# This value determines the NixOS release from which the default
-# settings for stateful data, like file locations and database versions
-# on your system were taken. It‘s perfectly fine and recommended to leave
-# this value at the release version of the first install of this system.
-# Before changing this value read the documentation for this option
-# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
-
+  system.stateVersion = "23.11";
 }
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 8f9e32f..1765dc2 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -3,6 +3,8 @@
 {
   imports = [
     ../../modules/home-manager/i3
+    ../../modules/home-manager/1password
+    ../../modules/home-manager/git
     ../../modules/home-manager/neovim
     ../../modules/home-manager/wezterm
     ../../modules/home-manager/zsh
@@ -11,7 +13,6 @@
     ../../modules/home-manager/zoxide
     ../../modules/home-manager/eza
     ../../modules/home-manager/bat
-    ../../modules/home-manager/irssi
   ];
   home.username = "mthomson";
   home.homeDirectory = "/home/mthomson";
@@ -33,8 +34,10 @@
     ripgrep
     jq
     unzip
+    pavucontrol
+    pasystray
+    networkmanagerapplet
   ];
 
   programs.home-manager.enable = true;
-  programs.git.enable = true;
 }