some changes

flake.lock

@@ -66,6 +66,18 @@
         "type": "github"
       }
     },
+    "bibata-tokyonight": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-liXppPL6yxxpUpW7XjHIAUSRHX7tj9GPDgCzEGQFu0o=",
+        "type": "file",
+        "url": "https://code.ataraxiadev.com/AtaraxiaDev/Bibata-Modern-TokyoNight.git"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://code.ataraxiadev.com/AtaraxiaDev/Bibata-Modern-TokyoNight.git"
+      }
+    },
     "blobs": {
       "flake": false,
       "locked": {
@@ -251,22 +263,6 @@
         "type": "github"
       }
     },
-    "materia-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1638461758,
-        "narHash": "sha256-+E8eJQcDw4F12MmGrCoFUeGFZzYZWQtY7PVhXVAZRFY=",
-        "owner": "nana-4",
-        "repo": "materia-theme",
-        "rev": "af63425f9bbb2ac9bc4853a4357457d743c65308",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nana-4",
-        "repo": "materia-theme",
-        "type": "github"
-      }
-    },
     "multimc-cracked": {
       "flake": false,
       "locked": {
@@ -642,8 +638,8 @@
         "base16": "base16",
         "base16-horizon-scheme": "base16-horizon-scheme",
         "base16-tokyonight-scheme": "base16-tokyonight-scheme",
+        "bibata-tokyonight": "bibata-tokyonight",
         "home-manager": "home-manager",
-        "materia-theme": "materia-theme",
         "multimc-cracked": "multimc-cracked",
         "nix": "nix",
         "nix-alien": "nix-alien",

flake.nix

@@ -29,8 +29,8 @@
       url = "github:alukardbf/base16-tokyonight-scheme";
       flake = false;
     };
-    materia-theme = {
-      url = "github:nana-4/materia-theme";
+    bibata-tokyonight = {
+      url = "https://code.ataraxiadev.com/AtaraxiaDev/Bibata-Modern-TokyoNight.git";
       flake = false;
     };
     multimc-cracked = {

profiles/applications/packages.nix

@@ -52,6 +52,7 @@ with config.deviceSpecific; {
     foliate
     gparted
     jellyfin-media-player
+    parsec
     # persepolis
     pinta
     qbittorrent

profiles/overlay.nix

@@ -29,15 +29,18 @@ with lib; {
         android-emulator = self.callPackage ./packages/android-emulator.nix { };
         arkenfox-userjs = pkgs.callPackage ./packages/arkenfox-userjs.nix { arkenfox-repo = inputs.arkenfox-userjs; };
         bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
+        bibata-cursors-tokyonight = pkgs.callPackage ./packages/bibata-cursors-tokyonight.nix { repo = inputs.bibata-tokyonight; };
         ceserver = pkgs.callPackage ./packages/ceserver.nix { };
         gamescope = pkgs.callPackage ./packages/gamescope.nix { };
         ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
         kitti3 = pkgs.python3Packages.callPackage ./packages/kitti3.nix { };
         mpris-ctl = pkgs.callPackage ./packages/mpris-ctl.nix { };
         multimc = pkgs.qt5.callPackage ./packages/multimc.nix { multimc-repo = inputs.multimc-cracked; };
+        parsec = pkgs.callPackage ./packages/parsec.nix { };
         reshade-shaders = pkgs.callPackage ./packages/reshade-shaders.nix { };
         seadrive-fuse = pkgs.callPackage ./packages/seadrive-fuse.nix { };
         tidal-dl = pkgs.callPackage ./packages/tidal-dl.nix { };
+        tokyonight-gtk-theme = pkgs.callPackage ./packages/tokyonight-gtk-theme.nix { };
         vscode = master.vscode;
         vscode-fhs = master.vscode-fhs;
         xonar-fp = pkgs.callPackage ./packages/xonar-fp.nix { };

profiles/packages/bibata-cursors-tokyonight.nix

@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchurl, repo ? null }:
+
+stdenv.mkDerivation rec {
+  pname = "bibata-cursors-tokyonight";
+  version = "1.0";
+
+  src = repo;
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out/share/icons"
+    cp -r * $out/share/icons
+  '';
+
+  meta = with lib; {
+    description = "Material Based Cursor";
+    homepage = "https://code.ataraxiadev.com/AtaraxiaDev/Bibata-Modern-TokyoNight";
+    license = licenses.unlicense;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ];
+  };
+}

profiles/packages/parsec.nix

@@ -0,0 +1,180 @@
+# based on https://github.com/clefru/nur-packages/blob/master/pkgs/parsecgaming/default.nix
+
+{ lib
+, stdenv
+, buildFHSUserEnv
+, fetchurl
+, copyDesktopItems
+, curl
+, jq
+, writeScript
+, dpkg
+, alsa-lib
+, cups
+, dbus
+, fontconfig
+, freetype
+, libGL
+, libsamplerate
+, makeDesktopItem
+, udev
+, libva
+, vaapiVdpau
+, libxkbcommon
+, nas
+, vulkan-loader
+, libX11
+, libXScrnSaver
+, libXcursor
+, libXext
+, libXi
+, libXinerama
+, libXrandr
+, libXrender
+, libXxf86vm
+, libxcb
+, openssl
+, extraPkgs ? [ ]
+}:
+
+let
+  version = "150-78";
+
+  src = stdenv.mkDerivation {
+    name = "parsec-pkg";
+    src = fetchurl {
+      url = "https://s3.amazonaws.com/parsec-build/package/parsec-linux.deb";
+      sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
+    };
+    phases = [ "buildPhase" ];
+    buildInputs = [ dpkg ];
+    buildPhase = ''
+      mkdir $out
+      dpkg-deb -x $src $out
+      # dpkg-deb makes $out group-writable, which nix doesn't like
+      chmod 755 $out
+      mv $out/usr/* $out
+      rmdir $out/usr
+    '';
+  };
+
+  launchScript = writeScript "update-appdata-and-launch-parsec" ''
+    #! ${stdenv.shell}
+    set -exuo pipefail
+    curl=${curl}/bin/curl
+    jq=${jq}/bin/jq
+
+    pushd $HOME
+
+    if [ ! -d .parsec ]; then
+      rm -f .parsec
+      mkdir .parsec
+    fi
+
+    cd .parsec
+
+    outdated=""
+    if [ ! -e appdata.json ]; then
+      outdated=y
+    else
+      so_version=$($jq -r .so_name appdata.json | grep -o '[0-9]\+-[0-9]\+')
+      [[ "${version}" > "$so_version" ]] && outdated=y
+    fi
+
+    if [ "$outdated" ]; then
+      rm -f appdata.json
+      $curl -L -o appdata.json https://builds.parsecgaming.com/channel/release/appdata/linux/latest
+      so_name=$($jq -r .so_name appdata.json)
+      if [ ! -e $so_name ]; then
+        $curl -L -O https://builds.parsecgaming.com/channel/release/binary/linux/gz/$so_name
+      fi
+    fi
+
+    popd
+    /usr/bin/parsecd
+  '';
+
+  linkAlsaConf = stdenv.mkDerivation {
+    name = "parsec-alsa-conf";
+    buildCommand = ''
+      mkdir -p $out/etc
+      cd $out/etc
+      ln -s /host/etc/alsa alsa
+    '';
+  };
+
+  fhsEnv = buildFHSUserEnv {
+    name = "parsec-fhs-wrapper";
+    targetPkgs = pkgs: [
+      alsa-lib
+      cups
+      dbus
+      src
+      fontconfig
+      freetype
+      libGL
+      libsamplerate
+      udev
+      libva
+      vaapiVdpau
+      libxkbcommon
+      nas
+      vulkan-loader
+      libX11
+      libXScrnSaver
+      libXcursor
+      libXext
+      libXi
+      libXinerama
+      libXrandr
+      libXrender
+      libXxf86vm
+      libxcb
+      openssl
+      stdenv.cc.cc.lib
+      linkAlsaConf
+      # Those libraries are missing from buildInputs
+      # libGLES_CM.so.1        # Can't find in my /nix/store
+      # libudev.so.0           # Covered by libudev.so.1
+      # libva.so.1             # Covered by libva.so.2
+      # libwayland-client.so.0 # No wayland support
+      # libwayland-cursor.so.0 # No wayland support
+      # libwayland-egl.so.1    # No wayland support
+    ] ++ extraPkgs;
+    runScript = launchScript;
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "parsec";
+  inherit version;
+
+  nativeBuildInputs = [ copyDesktopItems ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "parsec";
+      desktopName = "Parsec";
+      comment = "Simple, low-latency game streaming.";
+      exec = "parsec %u";
+      icon = "parsecd";
+      categories = [ "Network" "Game" "Utility" ];
+    })
+  ];
+
+  phases = [ "installPhase" ];
+  installPhase = ''
+    mkdir $out
+    runHook preInstall
+    mkdir $out/bin
+    ln -s ${fhsEnv}/bin/parsec-fhs-wrapper $out/bin/parsec
+    for d in ${src}/share/icons/hicolor/*; do
+      install -Dm0644 -t $out/share/icons/hicolor/$(basename $d)/apps/ $d/apps/parsecd.png
+    done
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Simple, low-latency game streaming.";
+    homepage = "https://parsec.app";
+    license = licenses.unfree;
+  };
+}

profiles/packages/tokyonight-gtk-theme.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gtk-engine-murrine
+, jdupes
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tokyonight-gtk-theme";
+  version = "unstable-2022-06-21";
+
+  src = fetchFromGitHub {
+    owner = "Fausto-Korpsvart";
+    repo = "Tokyo-Night-GTK-Theme";
+    rev = "39edc3409c39b2d1ed0b5dd9f8defe9a412acd43";
+    sha256 = "sha256-CJ4kDi/Z2X4nihtiieP6b6YJWuGzr6LfOBipAXa8ZwI=";
+  };
+
+  nativeBuildInputs = [ jdupes ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes
+    cp -a themes/Tokyonight* $out/share/themes
+
+    # Replace duplicate files with hardlinks to the first file in each
+    # set of duplicates, reducing the installed size
+    jdupes -L -r $out/share
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A GTK theme based on the Tokyo Night colour palette";
+    homepage = "https://github.com/Fausto-Korpsvart/Tokyo-Night-GTK-Theme";
+    license = licenses.gpl3Only;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}

profiles/workspace/gtk.nix

@@ -11,8 +11,8 @@ in {
             kind = "dark";
             colors = {
               base00.hex.rgb = "${thm.base00-hex}";
-              base01.hex.rgb = "${thm.base00-hex}";
-              base02.hex.rgb = "${thm.base00-hex}";
+              base01.hex.rgb = "${thm.base01-hex}";
+              base02.hex.rgb = "${thm.base02-hex}";
               base03.hex.rgb = "${thm.base03-hex}";
               base04.hex.rgb = "${thm.base04-hex}";
               base05.hex.rgb = "${thm.base05-hex}";
@@ -35,6 +35,7 @@ in {
   programs.dconf.enable = true;
   services.dbus.packages = with pkgs; [ dconf gcr ];
   home-manager.users.alukard = {
+    home.packages = [ pkgs.tokyonight-gtk-theme ];
     gtk = {
       enable = true;
       iconTheme = {
@@ -42,14 +43,19 @@ in {
         package = thm.iconPackage;
       };
       theme = {
-        name = "Generated";
+        name = "Tokyonight-Dark-BL";
         package = pkgs.generated-gtk-theme;
       };
+      # theme = {
+      #   name = "Tokyonight-Dark-BL";
+      #   package = pkgs.tokyonight-gtk-theme;
+      # };
       font = {
         name = "${thm.fonts.main.family}";
         size = thm.fontSizes.normal.int;
       };
     };
-    home.sessionVariables.GTK_THEME = "Generated";
+    # home.sessionVariables.GTK_THEME = "Tokyonight-Dark-BL";
+    home.sessionVariables.GTK_THEME = "Tokyonight-Dark-BL";
   };
 }

profiles/workspace/kde/default.nix

@@ -12,7 +12,7 @@ with config.lib.base16.theme; {
     KDE_SESSION_VERSION = "5";
     QT_SCALE_FACTOR = "1";
     QT_AUTO_SCREEN_SCALE_FACTOR = "0";
-    QT_QPA_PLATFORMTHEME = "kde";
+    QT_QPA_PLATFORMTHEME = "qt5ct";
     KDEDIRS =
       "/run/current-system/sw:/run/current-system/sw/share/kservices5:/run/current-system/sw/share/kservicetypes5:/run/current-system/sw/share/kxmlgui5";
   };

profiles/workspace/mako.nix

@@ -1,14 +1,10 @@
 { pkgs, config, ... }: {
   home-manager.users.alukard = {
     systemd.user.services.mako = {
-      Service = {
-        ExecStart = "${pkgs.mako}/bin/mako";
-      };
+      Service = { ExecStart = "${pkgs.mako}/bin/mako"; };
       Install = {
-        WantedBy = [ "sway-session.target" ];
-      };
-      Unit = {
         After = [ "sway-session.target" ];
+        WantedBy = [ "sway-session.target" ];
       };
     };
     programs.mako = with config.lib.base16; {
@@ -19,12 +15,12 @@
       height = 80;
       defaultTimeout = 10000;
       maxVisible = 10;
-      backgroundColor = "#${theme.base00-hex}AA";
+      backgroundColor = "${theme.base00-hex}AA";
       textColor = "#${theme.base05-hex}";
-      borderColor = "#${theme.base0D-hex}AA";
-      progressColor = "over #${theme.base0B-hex}";
+      borderColor = "${theme.base0D-hex}AA";
+      progressColor = "over ${theme.base0B-hex}";
       iconPath = "${theme.iconPackage}/share/icons/${theme.iconTheme}";
       maxIconSize = 24;
     };
   };
-}
+}

profiles/workspace/zsh.nix

@@ -59,7 +59,6 @@
         "hpd" = "bluetoothctl disconnect D8:37:3B:60:5D:55";
       };
       initExtra = ''
-
         nixify() {
           if [ ! -e ./.envrc ]; then
             echo 'use flake' > .envrc
@@ -105,6 +104,8 @@
           manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix
         }
 
+        XDG_DATA_DIRS=$XDG_DATA_DIRS:$GSETTINGS_SCHEMAS_PATH
+
         source ${pkgs.nix-zsh-completions}/share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh
         fpath=(${pkgs.nix-zsh-completions}/share/zsh/site-functions $fpath)
         autoload -U compinit && compinit