m

4 files changed, 20 insertions, 50 deletions

diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index da5dcaf..9c68af3 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -47,8 +47,6 @@ in {
     vSync = true;
   };
   environment.systemPackages = with pkgs; [
-    # old-pkgs.vivaldi
-    vivaldi
     #notifications
     dunst
     polybar
@@ -71,47 +69,6 @@ in {
   ];
   services.flatpak.enable = true;
 
-  fonts = {
-    enableDefaultPackages = true;
-    fontconfig = {
-      defaultFonts.emoji = ["Noto Color Emoji"];
-      defaultFonts.monospace = ["Hack" "Sarasa Mono SC"];
-      defaultFonts.sansSerif = ["DejaVu Sans"];
-      defaultFonts.serif = ["DejaVu Serif" "Source Han Serif SC"];
-    };
-    packages = with pkgs;
-      [
-        fira-code
-        fira
-        cooper-hewitt
-        ibm-plex
-        jetbrains-mono
-        iosevka
-        spleen
-        fira-code-symbols
-        powerline-fonts
-        arphic-ukai
-        arphic-uming
-        dejavu_fonts
-        font-awesome
-        inconsolata # monospaced
-        noto-fonts
-        noto-fonts-cjk-sans
-        noto-fonts-emoji
-        noto-fonts-extra
-        powerline-fonts
-        source-han-sans-japanese
-        source-han-sans-korean
-        source-han-sans-simplified-chinese
-        source-han-sans-traditional-chinese
-        source-sans-pro
-        ubuntu_font_family
-        wqy_microhei
-        wqy_zenhei
-      ]
-      ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-  };
-
   # screen capture
   #
 
diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index bf905e8..e57acb9 100644
--- a/hosts/local/master/configuration.nix
+++ b/hosts/local/master/configuration.nix
@@ -11,10 +11,10 @@ in {
     # Include the results of the hardware scan.
     ../../base.nix
     ../../linux.nix
-    # ../../unfree.nix
+    ../../unfree.nix
     #../../android.nix
-    # ../gui.nix
-    # ../i3.nix
+    ../gui.nix
+    ../i3.nix
     # ../gnome.nix
     # ../wayland.nix
     ../nvidia.nix
@@ -50,9 +50,9 @@ in {
   services.tailscale = {
     enable = true;
   };
-  #services.meilisearch = {
-  #  enable = true;
-  #};
+  services.meilisearch = {
+    enable = true;
+  };
 
   zramSwap = {
     enable = true;
diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix
index 5e2e241..8fae8c2 100644
--- a/hosts/local/master/keyboard.nix
+++ b/hosts/local/master/keyboard.nix
@@ -15,7 +15,7 @@
         config = builtins.readFile ./thinkpad.kbd;
       };
       wiredThinkpad = {
-        device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_usb_Keyboard_with_TrackPoint-event-kbd";
+        device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd";
         config = builtins.readFile ./thinkpad.kbd;
       };
     };
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index f496128..37a0bae 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -58,11 +58,23 @@
 
       # images
       imagemagick
+      zsh
       # nix
       #nixfmt
       direnv
       nix-direnv
       devenv
+      nix-tree
+      nix-output-monitor
+      nix-index
+      nix-du
+      nix-diff
+      nurl
+      statix
+      manix
+      inputs.nix-alien.packages.${pkgs.system}.nix-alien
+
+      #
       # inputs.devenv.packages.${pkgs.system}.default
       cachix
       devbox
@@ -82,6 +94,7 @@
       ast-grep
       diffsitter
       #
+      lmstudio
     ]
     ++ lib.optionals pkgs.stdenv.isLinux [
       # linuxKernel.packages.linux_latest_libre.cpupower