p

6 files changed, 39 insertions, 26 deletions

diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index 26adeb1..7f023d4 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -56,4 +56,24 @@
     glib # gio
     desktop-file-utils
   ];
+
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      # mozc-ut is better, wat do
+      fcitx5-gtk
+      libsForQt5.fcitx5-qt
+      fcitx5-lua
+      fcitx5-configtool
+      fcitx5-rime
+    ];
+  };
+  environment.variables = {
+    GTK_IM_MODULE = "fcitx";
+    QT_IM_MODULE = "fcitx";
+    XMODIFIERS = "@im=fcitx";
+    FCITX_SOCKET = "default";
+  };
 }
diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index d49a9d6..da9d503 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -52,7 +52,8 @@ in {
     vSync = true;
   };
   environment.systemPackages = with pkgs; [
-    old-pkgs.vivaldi
+    # old-pkgs.vivaldi
+    vivaldi
     #notifications
     dunst
     polybar
diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index cad65c8..bf905e8 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
diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix
index 6cdcd98..5e2e241 100644
--- a/hosts/local/master/keyboard.nix
+++ b/hosts/local/master/keyboard.nix
@@ -5,25 +5,6 @@
   };
 
   # config file keeps getting rewritten but I don't know by who
-  i18n.inputMethod = {
-    enable = true;
-    type = "fcitx5";
-    fcitx5.addons = with pkgs; [
-      fcitx5-mozc
-      # mozc-ut is better, wat do
-      fcitx5-gtk
-      libsForQt5.fcitx5-qt
-      fcitx5-lua
-      fcitx5-configtool
-      fcitx5-rime
-    ];
-  };
-  environment.variables = {
-    GTK_IM_MODULE = "fcitx";
-    QT_IM_MODULE = "fcitx";
-    XMODIFIERS = "@im=fcitx";
-    FCITX_SOCKET = "default";
-  };
 
   #kmonad
   services.kmonad = {
diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix
index b8b335a..b17c708 100644
--- a/hosts/local/nvidia.nix
+++ b/hosts/local/nvidia.nix
@@ -12,7 +12,14 @@
     else config.boot.kernelPackages.nvidiaPackages.beta;
 in {
   boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
-  environment.systemPackages = [pkgs.nvitop];
+  environment.systemPackages = [
+    pkgs.nvitop
+  ];
+
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
+
   # boot.kernelPackages = lib.mkForce unfreePkgs.linuxKernel.packages.linux_xanmod_latest;
   # boot.kernelParams = ["video=HDMI-A-1:1920x1080"];
   #
@@ -66,6 +73,9 @@ in {
     # nvidiaSettings = true;
     open = false;
   };
+  hardware.nvidia-container-toolkit = {
+    enable = true;
+  };
   # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
   #     version = "525.116.04";
   #     sha256_64bit = "sha256-hhDsgkR8/3LLXxizZX7ppjSlFRZiuK2QHrgfTE+2F/4=";
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 436851a..a6023f5 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -55,9 +55,10 @@
       #nixfmt
       direnv
       nix-direnv
-      # devenv
+      devenv
+      # inputs.devenv.packages.${pkgs.system}.default
+      cachix
       devbox
-      inputs.devenv.packages.${pkgs.system}.default
       bun
       # scraping
       python312Packages.yt-dlp