New CPU + Cleanup

3 files changed, 11 insertions, 8 deletions

diff --git a/nix_archive/nix/programs/foot.nix b/nix_archive/nix/programs/foot.nix
index 5c85ce7..5a322eb 100644
--- a/nix_archive/nix/programs/foot.nix
+++ b/nix_archive/nix/programs/foot.nix
@@ -12,9 +12,9 @@ in {
       server.enable = true;
       settings = {
         main = {
-          font = "${s.font.name}:size=${toString s.font.size}";
+          font = "${loc.font.name}:size=${toString loc.font.size}";
         };
-        colors = {
+        colors-dark = {
           foreground = "${colo.foreground}";
           background = "${colo.background}";
           regular0 = "${colo.color0}";
diff --git a/nix_archive/nix/programs/nvim.nix b/nix_archive/nix/programs/nvim.nix
index 3cdf12e..2d36e64 100644
--- a/nix_archive/nix/programs/nvim.nix
+++ b/nix_archive/nix/programs/nvim.nix
@@ -215,11 +215,13 @@ in {
       #  };
       #  meta.homepage = "";
       #})
+      withRuby = false;
+      withPython = false;
       plugins = with pkgs.vimPlugins; [
         local-nvim
         wal
         undotree
-        fzfWrapper
+        fzf-wrapper
         fzf-vim
         vim-gitbranch
         vim-signify
diff --git a/nix_archive/nix/programs/sway.nix b/nix_archive/nix/programs/sway.nix
index b5dcb5f..1fa762a 100644
--- a/nix_archive/nix/programs/sway.nix
+++ b/nix_archive/nix/programs/sway.nix
@@ -18,10 +18,10 @@ in {
       grim
       wf-recorder
       wlsunset
-      xorg.xprop
-      xorg.xset
-      xorg.xrdb
-      xorg.xrandr
+      xprop
+      xset
+      xrdb
+      xrandr
     ];
   };
   local.scripts.imports = [
@@ -141,12 +141,13 @@ in {
       '';
       extraCss4 = ''
       '';
-    in {
+    in rec {
       enable = true;
       theme = {
         name = "adw-gtk3" + (if colo.lightness == "light" then "" else "-dark");
         package = pkgs.adw-gtk3;
       };
+      gtk4.theme = theme;
       cursorTheme = {
         name = "WhiteSur-cursors";
       };