m

10 files changed, 72 insertions, 9 deletions

diff --git a/flake.nix b/flake.nix
index cde2e4c..b70b44d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,6 +95,11 @@
     ########### this fucking guy ########
 
     nixos-rk3588.url = "github:ryan4yin/nixos-rk3588";
+
+    devenv = {
+      url = "github:cachix/devenv";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs = inputs: import ./outputs.nix inputs;
 }
diff --git a/hosts/cloud/sortug/nginx.nix b/hosts/cloud/sortug/nginx.nix
index 78e93b8..68a0c5b 100644
--- a/hosts/cloud/sortug/nginx.nix
+++ b/hosts/cloud/sortug/nginx.nix
@@ -27,7 +27,7 @@
       enableACME = true;
       forceSSL = true;
       locations."/stt" = {
-        proxyPass = "http://127.0.0.1:8000";
+        proxyPass = "http://127.0.0.1:8010";
         extraConfig = ''
           proxy_connect_timeout 300s;
           proxy_send_timeout 300s;
@@ -76,6 +76,24 @@
         proxy_cache off;
       '';
     };
+    virtualHosts."mcp.sortug.com" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "http://127.0.0.1:8000";
+        proxyWebsockets = true; # needed if you need to use WebSocket
+        extraConfig = ''
+          proxy_set_header Host $host;
+          proxy_set_header Forwarded $proxy_add_x_forwarded_for;
+        '';
+      };
+      extraConfig = ''
+        proxy_http_version 1.1;
+        chunked_transfer_encoding off;
+        proxy_buffering off;
+        proxy_cache off;
+      '';
+    };
     virtualHosts."line.sortug.com" = {
       enableACME = true;
       forceSSL = true;
diff --git a/hosts/editors.nix b/hosts/editors.nix
index bd2acca..b3e6e69 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -8,6 +8,7 @@
   environment.systemPackages = [
     pkgs.neovim
     inputs.helix.packages.${pkgs.system}.helix
+    pkgs.nodePackages.prettier
     # pkgs.helix
   ];
 }
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
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 0f1703f..953b7fd 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -1,5 +1,10 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = with pkgs; [
+    moreutils
     alejandra
     # nixfmt
     #
@@ -17,6 +22,7 @@
     lsd
     lsof
     tmux
+    socat
     tmate
     curlFull
     ripgrep
@@ -57,7 +63,8 @@
     nil
     direnv
     nix-direnv
-    devenv
+    # devenv
+    inputs.devenv.packages.${pkgs.system}.default
     # scraping
     python312Packages.yt-dlp
     # markdown lsp
@@ -71,5 +78,10 @@
     superhtml
     sshfs
     sxiv
+
+    # ai stuff!
+    # aider-chat
+    yek
+    # python312Packages.google-generativeai
   ];
 }
diff --git a/hosts/unfree.nix b/hosts/unfree.nix
index 169b086..803c04d 100644
--- a/hosts/unfree.nix
+++ b/hosts/unfree.nix
@@ -15,7 +15,7 @@
     # opera
     spotify
     microsoft-edge
-    # vscode
+    vscode
     # fonts
     corefonts
     #  symbola
@@ -26,7 +26,9 @@
     # lutris
     # bottles
     # heroic
+    code-cursor
     inputs.claude-desktop.packages.x86_64-linux.claude-desktop
+    inputs.windsurf.packages.x86_64-linux.default
   ];
   # fucking vscode requires this for github copilot
 
diff --git a/hosts/users.nix b/hosts/users.nix
index 8377c2a..3572fbc 100644
--- a/hosts/users.nix
+++ b/hosts/users.nix
@@ -44,6 +44,7 @@ in {
           "docker"
           "plugdev"
           "uinput"
+          "jellyfin"
         ];
         createHome = true;
         home = "/home/y";