configuration.nix

@@ -21,9 +21,6 @@ in
     ./fonts.nix
     ./extra/dvd.nix
     ./extra/bluray.nix
-    ./extra/platformio.nix
-    ./extra/yubikey.nix
-    ./extra/language-server.nix
   ];
 
   hardware.bluetooth.enable = true;
@@ -195,6 +192,11 @@ in
 
     sass
 
+    # embedded board development
+    platformio-core # toolchain manager for various microcontrollers
+    openocd         # on-chip programming and debugging support
+    avrdude         # esp32 and others support
+
     devbox
     filelight
     ffmpeg-full
@@ -238,6 +240,8 @@ in
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
+  services.udev.packages = [ pkgs.platformio ];
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

extra/language-server.nix

@@ -1,8 +0,0 @@
-{ pkgs, config, ... }: {
-    # various language server used by IDEs and by my Neovim config
-    environment.systemPackages = with pkgs; [
-        shellcheck
-        lua-language-server
-        pyright
-    ];
-}

extra/platformio.nix

@@ -1,11 +0,0 @@
-{ pkgs, config, ... }: {
-
-    services.udev.packages = [ pkgs.platformio ];
-
-    # embedded board development
-    environment.systemPackages = with pkgs; [
-        platformio-core # toolchain manager for various microcontrollers
-        openocd         # on-chip programming and debugging support
-        avrdude         # esp32 and others support
-    ];
-}

extra/yubikey.nix

@@ -1,12 +0,0 @@
-{ pkgs, config, ... }: {
-
-    services.pcscd.enable = true; # enable support for smart cards
-
-    environment.systemPackages = with pkgs; [
-        # Yubikey stuff
-        yubioath-flutter    # Yubico authentictor app for managing accounts
-        yubikey-manager     # CLI tool for ykman
-        yubikey-manager-qt  # GUI tool for ykman
-        pcsclite
-    ];
-}

users/servostar/config/kitty/kitty.conf

@@ -1,7 +0,0 @@
-include ./tokyonight.conf
-
-background_opacity 1.0
-cursor_shape beam
-font_size 12.0
-update_check_interval 0
-

users/servostar/config/kitty/tokyonight.conf

@@ -1,77 +0,0 @@
-# Tokyo Night color scheme for kitty terminal emulator
-# https://github.com/davidmathers/tokyo-night-kitty-theme
-#
-# Based on Tokyo Night color theme for Visual Studio Code
-# https://github.com/enkia/tokyo-night-vscode-theme
-
-foreground #a9b1d6
-background #1a1b26
-
-# Black
-color0 #414868
-color8 #414868
-
-# Red
-color1 #f7768e
-color9 #f7768e
-
-# Green
-color2  #73daca
-color10 #73daca
-
-# Yellow
-color3  #e0af68
-color11 #e0af68
-
-# Blue
-color4  #7aa2f7
-color12 #7aa2f7
-
-# Magenta
-color5  #bb9af7
-color13 #bb9af7
-
-# Cyan
-color6  #7dcfff
-color14 #7dcfff
-
-# White
-color7  #c0caf5
-color15 #c0caf5
-
-# Cursor
-cursor #c0caf5
-cursor_text_color #1a1b26
-
-# Selection highlight
-selection_foreground none
-selection_background #28344a
-
-# The color for highlighting URLs on mouse-over
-url_color #9ece6a
-
-# Window borders
-active_border_color #3d59a1
-inactive_border_color #101014
-bell_border_color #e0af68
-
-# Tab bar
-tab_bar_style fade
-tab_fade 1
-active_tab_foreground   #3d59a1
-active_tab_background   #16161e
-active_tab_font_style   bold
-inactive_tab_foreground #787c99
-inactive_tab_background #16161e
-inactive_tab_font_style bold
-tab_bar_background #101014
-
-# Title bar
-macos_titlebar_color #16161e
-
-# Storm
-# background #24283b
-# cursor_text_color #24283b
-# active_tab_background   #1f2335
-# inactive_tab_background #1f2335
-# macos_titlebar_color #1f2335

users/servostar/user.nix

@@ -9,6 +9,8 @@
   #
   # Configuration for user servostar
 
+  services.pcscd.enable = true; # enable support for smart cards
+
   services.printing.enable = true;
   services.avahi.enable = true;
   # for a WiFi printer
@@ -42,6 +44,12 @@
     # user packages
 
     packages = with pkgs; [
+
+      # language server
+      shellcheck
+      lua-language-server
+      pyright
+
       # browsers
       librewolf
       ungoogled-chromium
@@ -125,6 +133,12 @@
       tor
       xournalpp
 
+      # Yubikey stuff
+      yubioath-flutter    # Yubico authentictor app for managing accounts
+      yubikey-manager     # CLI tool for ykman
+      yubikey-manager-qt  # GUI tool for ykman
+      pcsclite
+
       jetbrains-toolbox
    ];
   };
@@ -163,6 +177,14 @@
     };
     programs.kitty = {
       enable = true;
+      theme = "Tokyo Night";
+      shellIntegration.enableZshIntegration = true;
+      settings = {
+        update_check_interval = 0;
+        cursor_shape = "beam";
+        background_opacity = "0.85";
+        font_size = "12.0";
+      };
     };
 
     # ------------------------------------------------------
@@ -170,9 +192,6 @@
     xdg.configFile."starship.toml".source = config/starship.toml;               # starship prompt configuration
     xdg.configFile."VSCodium/User/settings.json".source = config/settings.json; # VSCodium settings
     xdg.configFile."aacs/KEYDB.cfg".source = config/keydb.cfg;                  # key database for blueray decryption
-    # kitty configuration
-    xdg.configFile."kitty/kitty.conf".source = config/kitty/kitty.conf
-    xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf
 
     # ------------------------------------------------------
     # ZSH
@@ -204,6 +223,7 @@
         plugins = [
           { name = "MichaelAquilina/zsh-you-should-use"; }
           { name = "akash329d/zsh-alias-finder"; }
+          { name = "johannchangpro/zsh-interactive-cd"; }
           { name = "zsh-users/zsh-completions"; }
         ];
       };