some cleanup

profiles/applications/himalaya.nix

@@ -7,7 +7,7 @@
 
   home-manager.users.alukard = {
     home.packages = [ pkgs.himalaya ];
-    # home.packages = [ inputs.himalaya.defaultPackage.${system} ];
+    # home.packages = [ inputs.himalaya.defaultPackage.${pkgs.system} ];
 
     xdg.configFile."himalaya/config.toml".text = ''
       downloads-dir="/home/alukard/Downloads/mail"

profiles/applications/packages.nix

@@ -10,13 +10,10 @@ with config.deviceSpecific; {
     fd
     ffmpeg.bin
     git-filter-repo
-    glib.bin # gio
-    gptfdisk
+    # glib.bin # gio
+    # gptfdisk
     libqalculate
     lm_sensors
-    lnav
-    manix
-    neofetch
     nix-prefetch-git
     p7zip
     # (p7zip.override { enableUnfree = true; })
@@ -68,6 +65,9 @@ with config.deviceSpecific; {
     youtube-to-mpv
     zathura
     zoom-us
+
+    # awesome-shell
+    lnav
   ] ++ lib.optionals (!(isVM || isISO)) [
     libreoffice
   ] ++ lib.optionals isGaming [

profiles/applications/vivaldi.nix

@@ -6,7 +6,16 @@
 
   home-manager.users.alukard = {
     home.packages = with pkgs; [
-      (vivaldi.override { proprietaryCodecs = true; })
+      # (vivaldi.override { proprietaryCodecs = true; })
+      ((vivaldi.overrideAttrs (oldAttrs: rec {
+          buildInputs = oldAttrs.buildInputs ++ [ pkgs.libglvnd pkgs.pipewire pkgs.wayland ];
+          # --enable-features=UseOzonePlatform,UseSkiaRenderer,Vulkan --ozone-platform=wayland
+          postInstall = ''
+            substituteInPlace "$out"/bin/vivaldi \
+              --replace 'vivaldi-wrapped"  "$@"' 'vivaldi-wrapped" --ignore-gpu-blocklist --enable-gpu-rasterization \
+              --enable-zero-copy --use-gl=desktop "$@"'
+          '';
+        })).override { proprietaryCodecs = true; })
     ];
 
     xdg.configFile."vivaldi/css/custom.css".source = pkgs.writeText "custom.css" ''

profiles/overlay.nix

@@ -12,9 +12,8 @@ let
 in
 with lib; {
   nixpkgs.overlays = [
-    # (import "${inputs.nixpkgs-mozilla}/lib-overlay.nix")
-    # (import "${inputs.nixpkgs-mozilla}/rust-overlay.nix")
     inputs.android-nixpkgs.overlay
+    inputs.nixpkgs-wayland.overlay
     (self: super:
       rec {
         inherit inputs;
@@ -32,15 +31,7 @@ with lib; {
         vscode-fhs = master.vscode-fhs;
         xonar-fp = pkgs.callPackage ./packages/xonar-fp.nix { };
         youtube-to-mpv = pkgs.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
-
-        vivaldi = master.vivaldi.overrideAttrs (old: rec {
-          postInstall = ''
-            substituteInPlace "$out"/bin/vivaldi \
-              --replace 'vivaldi-wrapped"  "$@"' 'vivaldi-wrapped" --ignore-gpu-blocklist --enable-gpu-rasterization \
-              --enable-zero-copy --use-gl=desktop --enable-features=VaapiVideoDecoder --disable-features=UseOzonePlatform "$@"'
-          '';
-        });
-        # nix-direnv = inputs.nix-direnv.defaultPackage.${system};
+        vivaldi = master.vivaldi;
         wine = super.wineWowPackages.staging;
         qbittorrent = super.qbittorrent.overrideAttrs (old: rec {
           version = "enchanced-edition";
@@ -61,18 +52,6 @@ with lib; {
               --prefix PATH ':' "${with self; lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
           '';
         }) else super.btrbk;
-        mullvad-vpn = if (versionOlder super.mullvad-vpn.version "2021.5") then super.mullvad-vpn.overrideAttrs (old: rec {
-          version = "2021.5";
-          src = super.fetchurl {
-            url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
-            sha256 = "186va4pllimmcqnlbry5ni8gi8p3mbpgjf7sdspmhy2hlfjvlz47";
-          };
-          nativeBuildInputs = [ self.makeWrapper ] ++ old.nativeBuildInputs;
-          postInstall = ''
-            wrapProgram "$out/bin/mullvad-gui" \
-              --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1
-          '';
-        }) else super.mullvad-vpn;
       }
     )
   ];
@@ -81,17 +60,4 @@ with lib; {
     allowUnfree = true;
     android_sdk.accept_license = true;
   };
-
-  # home-manager.users.alukard = {
-  #   nixpkgs.config = {
-  #     allowUnfree = true;
-  #     android_sdk.accept_license = true;
-  #   };
-  #   xdg.configFile."nixpkgs/config.nix".text = ''
-  #     {
-  #       allowUnfree = true;
-  #       android_sdk.accept_license = true;
-  #     }
-  #   '';
-  # };
 }

profiles/workspace/kde/default.nix

@@ -5,6 +5,8 @@ with config.lib.base16.theme; {
     [ pkgs.systemd iconPackage ];
   services.udev.packages = [ pkgs.libmtp pkgs.media-player-info ];
 
+  qt5.enable = false;
+
   environment.sessionVariables = {
     QT_XFT = "true";
     QT_SELECT = "5";
@@ -18,7 +20,7 @@ with config.lib.base16.theme; {
   home-manager.users.alukard = {
     services.kdeconnect.enable = true;
 
-    xdg.configFile."kdeglobals".text = lib.generators.toINI {} {
+    xdg.configFile."kdeglobals".text = lib.generators.toGitINI {
       "Colors:Button" = {
         BackgroundAlternate = base01-hex;
         BackgroundNormal = base01-hex;