yea

hosts/lungmen/default.nix

@@ -182,16 +182,6 @@ in {
       directories = ["/etc/nixos"];
       files = ["/etc/machine-id"];
     };
-    variables = {
-      VK_ICD_FILENAMES =
-        lib.mkForce
-        "${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json";
-    };
-    sessionVariables = {
-      VK_ICD_FILENAMES =
-        lib.mkForce
-        "${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json";
-    };
   };
 
   networking.interfaces.enp6s0.useDHCP = true;

pkgs-set/overlays/discord-canary.nix

@@ -1,31 +0,0 @@
-final: prev: {
-  discord-canary =
-    prev.discord-canary.overrideAttrs
-    (
-      old: let
-        binaryName = "DiscordCanary";
-      in rec {
-        version = "0.0.123";
-        src =
-          prev.fetchurl
-          {
-            url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-            sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
-          };
-        installPhase = ''
-          mkdir -p $out/{bin,opt/${binaryName},share/pixmaps}
-          mv * $out/opt/${binaryName}
-          chmod +x $out/opt/${binaryName}/${binaryName}
-          patchelf --set-interpreter ${prev.stdenv.cc.bintools.dynamicLinker} \
-              $out/opt/${binaryName}/${binaryName}
-          wrapProgram $out/opt/${binaryName}/${binaryName} \
-              "''${gappsWrapperArgs[@]}" \
-              --prefix XDG_DATA_DIRS : "${prev.gtk3}/share/gsettings-schemas/${prev.gtk3.name}/" \
-              --prefix LD_LIBRARY_PATH : "${old.libPath}:${prev.electron_9}/lib/electron:${prev.libdrm}/lib:${prev.libGL_driver.out}/lib"
-          ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
-          ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${old.pname}.png
-          ln -s "${old.desktopItem}/share/applications" $out/share/
-        '';
-      }
-    );
-}

users/patriot/config/helix/mytheme.nix

@@ -7,7 +7,7 @@
   "ui.linenr" = {fg = "subtle" }
   "ui.liner.selected" = "highlightOverlay"
   "ui.selection" = { bg = "highlight" }
-  "comment" = { fg = "subtle", modifiers = ["italic"] }
+  "comment" = { fg = "subtle" }
   "ui.statusline" = {fg = "foam", bg = "surface" }
   "ui.statusline.inactive" = { fg = "iris", bg = "surface" }
   "ui.help" = { fg = "foam", bg = "surface" }

users/patriot/config/wezterm/cfg.nix

@@ -4,6 +4,9 @@
   return {
     font = wezterm.font("${font.name}"),
     font_size = ${builtins.toJSON font.size},
-    color_scheme = "mytheme"
+    color_scheme = "Grape",
+    default_cursor_style = "BlinkingBar",
+    enable_wayland = true,
+    enable_tab_bar = false
   }
 ''

users/patriot/config/wezterm/mytheme.nix

@@ -1,13 +0,0 @@
-{...}: ''
-  [colors]
-  foreground = "#e0def4"
-  background = "#191724"
-  cursor_bg = "#ebbcba"
-  cursor_border = "#ebbcba"
-  cursor_fg = "#ebbcba"
-  selection_bg = "#2a2837"
-  selection_fg = "#191724"
-
-  ansi = ["#191724","#1f1d2e","#26233a","#555169","#6e6a86","#e0def4","#f0f0f3","#c5c3ce"]
-  brights = ["#e2e1e7","#eb6f92","#f6c177","#ebbcba","#31748f","#9ccfd8","#c4a7e7","#e5e5e5"]
-''

users/patriot/default.nix

@@ -68,7 +68,7 @@ in {
       };
       displayManager = {
         autoLogin = {
-          enable = true;
+          enable = false;
           user = "patriot";
         };
         gdm = {
@@ -142,20 +142,7 @@ in {
         ffmpeg
         mupdf
         transmission-qt
-        (
-          lib.hiPrio
-          (
-            lutris.overrideAttrs
-            (
-              old: {
-                profile = ''
-                  ${old.profile or ""}
-                  unset VK_ICD_FILENAMES
-                  export VK_ICD_FILENAMES=${nixosConfig.environment.variables.VK_ICD_FILENAMES}'';
-              }
-            )
-          )
-        )
+        lutris
         xdg_utils
         tagref
         hydrus
@@ -168,9 +155,6 @@ in {
             steam.override
             {
               extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols];
-              extraProfile = ''
-                unset VK_ICD_FILENAMES
-                export VK_ICD_FILENAMES=${nixosConfig.environment.variables.VK_ICD_FILENAMES}'';
             }
           )
         )
@@ -380,7 +364,6 @@ in {
       enable = true;
       configFile = {
         "wezterm/wezterm.lua".text = import ./config/wezterm/cfg.nix {inherit font;};
-        "wezterm/colors/mytheme.toml".text = import ./config/wezterm/mytheme.nix {};
         "helix/themes/mytheme.toml".text = import ./config/helix/mytheme.nix {};
         "helix/config.toml".text = import ./config/helix/cfg.nix {};
         "helix/languages.toml".text = import ./config/helix/languages.nix {inherit pkgBin;};