Merge branch 'master' of mygit:/polwex/nixconf

1 files changed, 43 insertions, 8 deletions

diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index 375c10b..83de833 100644
--- a/hosts/local/master/configuration.nix
+++ b/hosts/local/master/configuration.nix
@@ -9,18 +9,19 @@
     ../../unfree.nix
     #../../android.nix
     ../gui.nix
-    ../i3.nix
+    # ../i3.nix
     # ../gnome.nix
-    # ../wayland.nix
+    ../wayland.nix
     ../nvidia.nix
     ./keyboard.nix
-    ./rgb.nix
+    # ./rgb.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   # boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_zen;
   boot.kernelParams = ["intel_pstate=active"];
   # boot.supportedFilesystems = ["ntfs"];
   services.fprintd.enable = true;
@@ -34,8 +35,14 @@
   time.timeZone = "Asia/Bangkok";
 
   # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-  # services.openssh.ports = [5555];
+  services.openssh = {
+    enable = true;
+    ports = [5555];
+    settings.PasswordAuthentication = false;
+  };
+  services.tailscale = {
+    enable = true;
+  };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -46,11 +53,13 @@
   #
   #
   environment.systemPackages = [
-    pkgs.nodejs
-    pkgs.python312
+    # for AI IDE shit
+    # pkgs.nodejs
+    # pkgs.python312
     # pkgs.openrgb-with-all-plugins
   ];
-
+  environment.etc."X11/xorg.conf.d/20-nvidia.conf".source = ./xorg.conf;
+  services.xserver.displayManager.xserverArgs = ["-config ${./xorg.conf}"];
   system.stateVersion = "23.11"; # Did you read the comment?
 
   #debugging segfaults
@@ -71,4 +80,30 @@
 
   # Ensure the script is copied to the system
   # environment.etc."startup.sh".source = ./startup.sh;
+  # temp!
+  # run vllm through docker (its broken in nixpkgs, but this may be better anyway?)
+  # virtualisation.oci-containers = {
+  #   backend = "podman";
+  #   containers = {
+  #     vllm = {
+  #       autoStart = false;
+  #       image = "vllm/vllm-openai:latest";
+  #       ports = ["5000:5000"];
+  #       extraOptions = [
+  #         "--runtime"
+  #         "nvidia"
+  #         "--gpus"
+  #         "all"
+  #         "--ipc"
+  #         "host"
+  #         "--pull=always"
+  #         "--network=host"
+  #       ];
+  #       cmd = [
+  #         "--model"
+  #         "mistralai/Mistral-7B-v0.1"
+  #       ];
+  #     };
+  #   };
+  # };
 }