ricing

flake.lock

@@ -66,18 +66,6 @@
         "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": {
@@ -638,7 +626,6 @@
         "base16": "base16",
         "base16-horizon-scheme": "base16-horizon-scheme",
         "base16-tokyonight-scheme": "base16-tokyonight-scheme",
-        "bibata-tokyonight": "bibata-tokyonight",
         "home-manager": "home-manager",
         "multimc-cracked": "multimc-cracked",
         "nix": "nix",

flake.nix

@@ -29,10 +29,6 @@
       url = "github:alukardbf/base16-tokyonight-scheme";
       flake = false;
     };
-    bibata-tokyonight = {
-      url = "https://code.ataraxiadev.com/AtaraxiaDev/Bibata-Modern-TokyoNight.git";
-      flake = false;
-    };
     multimc-cracked = {
       url = "https://github.com/AfoninZ/MultiMC5-Cracked.git";
       ref = "develop";

profiles/overlay.nix

@@ -28,8 +28,7 @@ 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 { };
-        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 { };
@@ -41,6 +40,7 @@ with lib; {
         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 { };
+        tokyonight-icon-theme = pkgs.callPackage ./packages/tokyonight-icon-theme.nix { };
         vscode = master.vscode;
         vscode-fhs = master.vscode-fhs;
         xonar-fp = pkgs.callPackage ./packages/xonar-fp.nix { };

profiles/packages/bibata-cursors-tokyonight.nix

@@ -1,16 +1,19 @@
-{ lib, stdenv, fetchurl, repo ? null }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "bibata-cursors-tokyonight";
   version = "1.0";
 
-  src = repo;
+  src = fetchgit {
+    url = "https://code.ataraxiadev.com/AtaraxiaDev/Bibata-Modern-TokyoNight.git";
+    sha256 = "sha256-PREfEgv+FQZjYAQijY3bHQ/0E/L8HgJUBWeA0vdBkAA=";
+  };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p "$out/share/icons"
-    cp -r * $out/share/icons
+    cp -r $src/Bibata-Modern-TokyoNight $out/share/icons
   '';
 
   meta = with lib; {

profiles/packages/bibata-cursors.nix

@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "bibata-cursors";
-  version = "1.1.1";
-
-  src = fetchurl {
-    url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/Bibata.tar.gz";
-    sha256 = "sha256-AcX30YL4HSqzlmTiC0MIStNWuWllkQqjNbkRTQkpu18=";
-  };
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p "$out/share/icons"
-    tar -xf $src --directory "$out/share/icons/"
-  '';
-
-  meta = with lib; {
-    description = "Material Based Cursor";
-    homepage = "https://github.com/ful1e5/Bibata_Cursor";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
-  };
-}

profiles/packages/tokyonight-icon-theme.nix

@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tokyonight-icon-theme";
+  version = "unstable-2022-06-21";
+
+  src = fetchFromGitHub {
+    owner = "Fausto-Korpsvart";
+    repo = "Tokyo-Night-GTK-Theme";
+    rev = "39edc3409c39b2d1ed0b5dd9f8defe9a412acd43";
+    sha256 = "sha256-CJ4kDi/Z2X4nihtiieP6b6YJWuGzr6LfOBipAXa8ZwI=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/icons
+    cp -a icons/* $out/share/icons
+
+    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/themes.nix

@@ -62,21 +62,14 @@
           float = 8.0;
         };
       };
-      # font = "IBM Plex Sans";
-      # fontMono = "IBM Plex Mono";
-      # fontSerif = "IBM Plex Serif";
-      # powerlineFont = "IBM Plex Mono for Powerline";
 
-      # fallbackFont = "Roboto";
+      # iconTheme = "Papirus-Dark";
-      # fallbackFontMono = "Roboto Mono";
+      # iconPackage = pkgs.papirus-icon-theme;
-      # fallbackFontSerif = "Roboto Slab";
+      iconTheme = "tokyonight_dark";
+      iconPackage = pkgs.tokyonight-icon-theme;
 
-      # iconFont = "Font Awesome 5 Free";
+      cursorPackage = pkgs.bibata-cursors-tokyonight;
-      # fallbackIcon = "Material Icons";
+      # cursorPackage = pkgs.bibata-cursors;
-      iconTheme = "Papirus-Dark";
-      iconPackage = pkgs.papirus-icon-theme;
-
-      cursorPackage = pkgs.bibata-cursors;
       cursorSize = 16;
     };
   };

profiles/workspace/cursor.nix

@@ -1,21 +1,17 @@
 { pkgs, lib, config, ... }:
 let
   thm = config.lib.base16.theme;
-  profileDir = config.home-manager.users.alukard.home.profileDirectory;
 in {
-  environment.sessionVariables = {
-    XCURSOR_PATH = lib.mkForce "${profileDir}/share/icons";
-  };
   home-manager.users.alukard = {
     home.pointerCursor = {
       package = thm.cursorPackage;
-      name = "Bibata-Modern-Classic";
+      name = "Bibata-Modern-TokyoNight";
       size = thm.cursorSize;
       gtk.enable = true;
-      # x11.enable = true;
+      x11.enable = true;
     };
     # home.file.".icons/default" = {
-    #   source = "${thm.cursorPackage}/share/icons/Bibata-Modern-Classic";
+    #   source = "${thm.cursorPackage}/share/icons/Bibata-Modern-TokyoNight";
     # };
   };
 }

profiles/workspace/gtk.nix

@@ -35,7 +35,6 @@ 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 = {
@@ -43,7 +42,7 @@ in {
         package = thm.iconPackage;
       };
       theme = {
-        name = "Tokyonight-Dark-BL";
+        name = "Generated";
         package = pkgs.generated-gtk-theme;
       };
       # theme = {
@@ -55,7 +54,7 @@ in {
         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/misc.nix

@@ -1,6 +1,7 @@
 { pkgs, lib, config, ... }: {
 
-  environment.sessionVariables = config.home-manager.users.alukard.home.sessionVariables // rec {
+  # environment.sessionVariables = config.home-manager.users.alukard.home.sessionVariables // rec {
+  environment.sessionVariables = rec {
     LESS = "MR";
     LESSHISTFILE = "~/.local/share/lesshist";
     SYSTEMD_LESS = LESS;