refactor(pkgs): use tsutsumi

11 files changed, 36 insertions, 32 deletions

diff --git a/home/ebisu/fortune/desktop/default.nix b/home/ebisu/fortune/desktop/default.nix
index 2f5f255..0db5e79 100644
--- a/home/ebisu/fortune/desktop/default.nix
+++ b/home/ebisu/fortune/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   imports = [
     ./hyprland
@@ -17,7 +17,7 @@
     swappy
     swww
     hyprpicker
-    (pkgs.callPackage ../../../../pkgs/swaddle.nix { })
+    inputs.tsutsumi.packages.${pkgs.system}.swaddle
     showmethekey
     brightnessctl
     bibata-cursors
diff --git a/home/ebisu/fortune/development/languages/rust.nix b/home/ebisu/fortune/development/languages/rust.nix
index 9664669..80b22ae 100644
--- a/home/ebisu/fortune/development/languages/rust.nix
+++ b/home/ebisu/fortune/development/languages/rust.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   home.packages = with pkgs; [
     cargo-outdated
@@ -7,7 +7,7 @@
     cargo-cache
     rustup
     cargo-udeps
-    (callPackage ../../../../../pkgs/cargo-clean-all.nix { })
+    inputs.tsutsumi.packages.${pkgs.system}.cargo-clean-all
   ];
 
   home.file.".local/share/cargo/config.toml".text = with pkgs; ''
diff --git a/home/ebisu/fortune/development/tools/git.nix b/home/ebisu/fortune/development/tools/git.nix
index eb4bb42..2dc56d8 100644
--- a/home/ebisu/fortune/development/tools/git.nix
+++ b/home/ebisu/fortune/development/tools/git.nix
@@ -1,11 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   home.packages = with pkgs; [
     delta
     gh
     onefetch
     gitoxide
-    (callPackage ../../../../../pkgs/git-sumi.nix { })
+    inputs.tsutsumi.packages.${pkgs.system}.git-sumi
     git-crypt
     git-lfs
   ];
diff --git a/home/ebisu/fortune/multimedia/browser/default.nix b/home/ebisu/fortune/multimedia/browser/default.nix
index 03cd2bd..7c3d879 100644
--- a/home/ebisu/fortune/multimedia/browser/default.nix
+++ b/home/ebisu/fortune/multimedia/browser/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   imports = [ ./thorium.nix ];
 
@@ -11,7 +11,7 @@
     ladybird
     web-ext
     tor-browser-bundle-bin
-    (pkgs.callPackage ../../../../../pkgs/zen-browser-bin.nix { })
+    inputs.tsutsumi.packages.${pkgs.system}.zen-browser-bin
     epiphany
   ];
 }
diff --git a/home/ebisu/fortune/multimedia/browser/thorium.nix b/home/ebisu/fortune/multimedia/browser/thorium.nix
index 20cdb73..9487271 100644
--- a/home/ebisu/fortune/multimedia/browser/thorium.nix
+++ b/home/ebisu/fortune/multimedia/browser/thorium.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
-  home.packages = [ (pkgs.callPackage ../../../../../pkgs/thorium.nix { }) ];
+  home.packages = [ inputs.tsutsumi.packages.${pkgs.system}.thorium ];
 
   xdg.configFile."thorium-flags.conf".text = ''
     --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer,TouchpadOverscrollHistoryNavigation
diff --git a/home/ebisu/fortune/multimedia/document.nix b/home/ebisu/fortune/multimedia/document.nix
index 77ff570..dec0460 100644
--- a/home/ebisu/fortune/multimedia/document.nix
+++ b/home/ebisu/fortune/multimedia/document.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   home.packages = with pkgs; [
     libreoffice-fresh
@@ -7,6 +7,6 @@
     thunderbird
     rfc
     tdf
-    (pkgs.callPackage ../../../../pkgs/t.nix { })
+    inputs.tsutsumi.packages.${pkgs.system}.t
   ];
 }
diff --git a/home/ebisu/fortune/multimedia/image.nix b/home/ebisu/fortune/multimedia/image.nix
index ec1cd34..0983d3a 100644
--- a/home/ebisu/fortune/multimedia/image.nix
+++ b/home/ebisu/fortune/multimedia/image.nix
@@ -1,15 +1,18 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
-  home.packages = with pkgs; [
-    (pkgs.callPackage ../../../../pkgs/ahoviewer.nix { })
-    emulsion
-    feh
-    imv
-    gallery-dl
-    gthumb
-    pngcrush
-    viu
-    optipng
-    (pkgs.callPackage ../../../../pkgs/chan-downloader.nix { })
-  ];
+  home.packages =
+    with pkgs;
+    with inputs;
+    [
+      tsutsumi.packages.${pkgs.system}.ahoviewer
+      emulsion
+      feh
+      imv
+      gallery-dl
+      gthumb
+      pngcrush
+      viu
+      optipng
+      tsutsumi.packages.${pkgs.system}.chan-downloader
+    ];
 }
diff --git a/home/ebisu/fortune/networking/smolnet/bollux.nix b/home/ebisu/fortune/networking/smolnet/bollux.nix
index b33575d..0c8d110 100644
--- a/home/ebisu/fortune/networking/smolnet/bollux.nix
+++ b/home/ebisu/fortune/networking/smolnet/bollux.nix
@@ -1,5 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
-  home.packages = with pkgs; [ (pkgs.callPackage ../../../../../pkgs/bollux { }) ];
+  home.packages = with pkgs; [ inputs.tsutsumi.packages.${pkgs.system}.bollux ];
+
   xdg.configFile."bollux/bollux.conf".text = '''';
 }
diff --git a/home/ebisu/fortune/networking/tools/default.nix b/home/ebisu/fortune/networking/tools/default.nix
index 70113a3..3a3045f 100644
--- a/home/ebisu/fortune/networking/tools/default.nix
+++ b/home/ebisu/fortune/networking/tools/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   imports = [
     ./http
@@ -17,7 +17,7 @@
     traceroute
     iptraf-ng
     tcpdump
-    (pkgs.callPackage ../../../../../pkgs/bindtointerface.nix { })
+    inputs.tsutsumi.packages.${pkgs.system}.bindtointerface
     trayscale
     nmap
     bandwhich
diff --git a/home/ebisu/fortune/networking/tools/http/default.nix b/home/ebisu/fortune/networking/tools/http/default.nix
index b47540f..17ea836 100644
--- a/home/ebisu/fortune/networking/tools/http/default.nix
+++ b/home/ebisu/fortune/networking/tools/http/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   imports = [
     ./httpie.nix
     ./wget.nix
   ];
 
-  home.packages = [ (pkgs.callPackage ../../../../../../pkgs/yaak.nix { }) ];
+  home.packages = [ inputs.tsutsumi.packages.${pkgs.system}.yaak ];
 }
diff --git a/home/ebisu/fortune/nix/default.nix b/home/ebisu/fortune/nix/default.nix
index c05f920..1b6117b 100644
--- a/home/ebisu/fortune/nix/default.nix
+++ b/home/ebisu/fortune/nix/default.nix
@@ -24,6 +24,6 @@
       cached-nix-shell
       omnix.packages.${pkgs.system}.default
       nix-search.packages.${system}.default
-      rui.packages.${pkgs.system}.default
+      tsutsumi.packages.${pkgs.system}.rui
     ];
 }