m

4 files changed, 29 insertions, 5 deletions

diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index a45c3c1..ba84982 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -12,11 +12,13 @@
       extraPackages = with pkgs; [
         dmenu
         i3status
+        i3status-rust
         i3lock
         i3blocks
       ];
     };
   };
+  # TODO check autotiling
   services.displayManager.defaultSession = "none+i3";
 
   environment.sessionVariables = {
@@ -51,16 +53,23 @@
 
     kitty
     alacritty
+    ghostty
     signal-desktop
     tdesktop
     brave
     gimp
     vlc
+    #
     mpv
     celluloid
+    ffmpeg-full
+    nv-codec-headers
+    #
+    smplayer
     thunderbird
     kmail
     firefox
+    vivaldi
     chromium
     pavucontrol
     # icons
@@ -158,5 +167,9 @@
   # pipewire requires these off
   # sound.enable = true;
   # hardware.pulseaudio.enable = true;
-  # hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+  services.blueman.enable = true;
 }
diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index aa12e1c..e228246 100644
--- a/hosts/local/master/configuration.nix
+++ b/hosts/local/master/configuration.nix
@@ -10,7 +10,7 @@
     #../../android.nix
     ../i3.nix
     # ../gnome.nix
-    #../wayland.nix
+    # ../wayland.nix
     ../nvidia.nix
     ./keyboard.nix
   ];
@@ -41,6 +41,12 @@
   # 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).
+  #
+  #
+  environment.systemPackages = [
+    pkgs.nodejs
+    pkgs.python312
+  ];
 
   system.stateVersion = "23.11"; # Did you read the comment?
 
diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix
index d9f6d84..852f084 100644
--- a/hosts/local/master/keyboard.nix
+++ b/hosts/local/master/keyboard.nix
@@ -29,10 +29,14 @@
   services.kmonad = {
     enable = true;
     keyboards = {
-      usbThinkpad = {
+      wirelessThinkpad = {
         device = "/dev/input/by-id/usb-Lenovo_TrackPoint_Keyboard_II-event-kbd";
         config = builtins.readFile ./thinkpad.kbd;
       };
+      wiredThinkpad = {
+        device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd";
+        config = builtins.readFile ./thinkpad.kbd;
+      };
     };
   };
 }
diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix
index 2d094c9..295d05d 100644
--- a/hosts/local/nvidia.nix
+++ b/hosts/local/nvidia.nix
@@ -32,8 +32,9 @@ in {
 
   services.xserver = {
     videoDrivers = ["nvidia"];
-    displayManager.gdm.wayland = true;
-    displayManager.gdm.nvidiaWayland = true;
+    # wayland only
+    # displayManager.gdm.wayland = true;
+    #
   };
   # environment.systemPackages = with pkgs;[
   # libva-utils