home: use tsutsumi overlay

12 files changed, 50 insertions, 57 deletions

diff --git a/home/ebisu/kansai/fortune/desktop/default.nix b/home/ebisu/kansai/fortune/desktop/default.nix
index 0db5e79..02a4395 100644
--- a/home/ebisu/kansai/fortune/desktop/default.nix
+++ b/home/ebisu/kansai/fortune/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./hyprland
@@ -17,7 +17,7 @@
     swappy
     swww
     hyprpicker
-    inputs.tsutsumi.packages.${pkgs.system}.swaddle
+    tsutsumi.swaddle
     showmethekey
     brightnessctl
     bibata-cursors
diff --git a/home/ebisu/kansai/fortune/development/languages/rust.nix b/home/ebisu/kansai/fortune/development/languages/rust.nix
index 80b22ae..516c61e 100644
--- a/home/ebisu/kansai/fortune/development/languages/rust.nix
+++ b/home/ebisu/kansai/fortune/development/languages/rust.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     cargo-outdated
@@ -7,7 +7,7 @@
     cargo-cache
     rustup
     cargo-udeps
-    inputs.tsutsumi.packages.${pkgs.system}.cargo-clean-all
+    tsutsumi.cargo-clean-all
   ];
 
   home.file.".local/share/cargo/config.toml".text = with pkgs; ''
diff --git a/home/ebisu/kansai/fortune/development/tools/default.nix b/home/ebisu/kansai/fortune/development/tools/default.nix
index 885a4a0..ecde494 100644
--- a/home/ebisu/kansai/fortune/development/tools/default.nix
+++ b/home/ebisu/kansai/fortune/development/tools/default.nix
@@ -1,27 +1,24 @@
-{ pkgs, inputs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [
     ./build.nix
     ./git.nix
   ];
 
-  home.packages =
-    with pkgs;
-    with inputs;
-    [
-      clang-tools
-      gtkwave
-      highlight
-      hyperfine
-      sloc
-      wakatime-cli
-      linuxKernel.packages.linux_zen.perf
-      radare2
-      global
-      valgrind
-      mise
-      tsutsumi.packages.${pkgs.system}.wakatime-ls
-      markdownlint-cli
-      nix-prettier.packages.${pkgs.system}.default
-    ];
+  home.packages = with pkgs; [
+    clang-tools
+    gtkwave
+    highlight
+    hyperfine
+    sloc
+    wakatime-cli
+    linuxKernel.packages.linux_zen.perf
+    radare2
+    global
+    valgrind
+    mise
+    tsutsumi.wakatime-ls
+    markdownlint-cli
+    inputs.nix-prettier.packages.${pkgs.system}.default
+  ];
 }
diff --git a/home/ebisu/kansai/fortune/development/tools/git.nix b/home/ebisu/kansai/fortune/development/tools/git.nix
index 502fed9..0616c40 100644
--- a/home/ebisu/kansai/fortune/development/tools/git.nix
+++ b/home/ebisu/kansai/fortune/development/tools/git.nix
@@ -1,11 +1,11 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     delta
     gh
     onefetch
     gitoxide
-    inputs.tsutsumi.packages.${pkgs.system}.git-sumi
+    tsutsumi.git-sumi
     git-crypt
     git-lfs
     bit
diff --git a/home/ebisu/kansai/fortune/multimedia/browser/default.nix b/home/ebisu/kansai/fortune/multimedia/browser/default.nix
index cc4b626..232a732 100644
--- a/home/ebisu/kansai/fortune/multimedia/browser/default.nix
+++ b/home/ebisu/kansai/fortune/multimedia/browser/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   imports = [ ./thorium.nix ];
 
@@ -11,7 +11,7 @@
     ladybird
     web-ext
     tor-browser-bundle-bin
-    inputs.tsutsumi.packages.${pkgs.system}.zen-browser-bin
+    tsutsumi.zen-browser-bin
     epiphany
     eolie
   ];
diff --git a/home/ebisu/kansai/fortune/multimedia/browser/thorium.nix b/home/ebisu/kansai/fortune/multimedia/browser/thorium.nix
index 9487271..46688b2 100644
--- a/home/ebisu/kansai/fortune/multimedia/browser/thorium.nix
+++ b/home/ebisu/kansai/fortune/multimedia/browser/thorium.nix
@@ -1,6 +1,6 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-  home.packages = [ inputs.tsutsumi.packages.${pkgs.system}.thorium ];
+  home.packages = [ pkgs.tsutsumi.thorium ];
 
   xdg.configFile."thorium-flags.conf".text = ''
     --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer,TouchpadOverscrollHistoryNavigation
diff --git a/home/ebisu/kansai/fortune/multimedia/document.nix b/home/ebisu/kansai/fortune/multimedia/document.nix
index dec0460..bc6e46d 100644
--- a/home/ebisu/kansai/fortune/multimedia/document.nix
+++ b/home/ebisu/kansai/fortune/multimedia/document.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     libreoffice-fresh
@@ -7,6 +7,6 @@
     thunderbird
     rfc
     tdf
-    inputs.tsutsumi.packages.${pkgs.system}.t
+    tsutsumi.t
   ];
 }
diff --git a/home/ebisu/kansai/fortune/multimedia/image.nix b/home/ebisu/kansai/fortune/multimedia/image.nix
index 0983d3a..6e788cb 100644
--- a/home/ebisu/kansai/fortune/multimedia/image.nix
+++ b/home/ebisu/kansai/fortune/multimedia/image.nix
@@ -1,18 +1,15 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-  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
-    ];
+  home.packages = with pkgs; [
+    tsutsumi.ahoviewer
+    emulsion
+    feh
+    imv
+    gallery-dl
+    gthumb
+    pngcrush
+    viu
+    optipng
+    tsutsumi.chan-downloader
+  ];
 }
diff --git a/home/ebisu/kansai/fortune/multimedia/video/default.nix b/home/ebisu/kansai/fortune/multimedia/video/default.nix
index c3c4405..da366ab 100644
--- a/home/ebisu/kansai/fortune/multimedia/video/default.nix
+++ b/home/ebisu/kansai/fortune/multimedia/video/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
   imports = [ ./anime.nix ];
 
@@ -14,6 +14,6 @@
     streamlink
     streamlink-twitch-gui-bin
     obs-studio
-    inputs.tsutsumi.packages.${pkgs.system}.peerflix
+    pkgs.tsutsumi.peerflix
   ];
 }
diff --git a/home/ebisu/kansai/fortune/networking/smolnet/bollux.nix b/home/ebisu/kansai/fortune/networking/smolnet/bollux.nix
index 0c8d110..f0f05f9 100644
--- a/home/ebisu/kansai/fortune/networking/smolnet/bollux.nix
+++ b/home/ebisu/kansai/fortune/networking/smolnet/bollux.nix
@@ -1,6 +1,5 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-  home.packages = with pkgs; [ inputs.tsutsumi.packages.${pkgs.system}.bollux ];
-
+  home.packages = [ pkgs.tsutsumi.bollux ];
   xdg.configFile."bollux/bollux.conf".text = '''';
 }
diff --git a/home/ebisu/kansai/fortune/networking/tools/default.nix b/home/ebisu/kansai/fortune/networking/tools/default.nix
index b694fef..7081ac3 100644
--- a/home/ebisu/kansai/fortune/networking/tools/default.nix
+++ b/home/ebisu/kansai/fortune/networking/tools/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./http
@@ -18,7 +18,7 @@
     traceroute
     iptraf-ng
     tcpdump
-    inputs.tsutsumi.packages.${pkgs.system}.bindtointerface
+    tsutsumi.bindtointerface
     trayscale
     bandwhich
     bore-cli
diff --git a/home/ebisu/kansai/fortune/networking/tools/http/default.nix b/home/ebisu/kansai/fortune/networking/tools/http/default.nix
index 972b187..b763a1f 100644
--- a/home/ebisu/kansai/fortune/networking/tools/http/default.nix
+++ b/home/ebisu/kansai/fortune/networking/tools/http/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./httpie.nix
@@ -6,7 +6,7 @@
   ];
 
   home.packages = with pkgs; [
-    inputs.tsutsumi.packages.${pkgs.system}.yaak
+    tsutsumi.yaak
     curlie
     xh
   ];