f

19 files changed, 55 insertions, 8 deletions

diff --git a/home/fuwn/meta/communication/default.nix b/home/fuwn/meta/communication/default.nix
index f392873..323f21c 100644
--- a/home/fuwn/meta/communication/default.nix
+++ b/home/fuwn/meta/communication/default.nix
@@ -5,7 +5,6 @@
   ];
 
   home.packages = with pkgs; [
-    zoom-us
     revolt-desktop
     newsboat
   ];
diff --git a/home/fuwn/meta/desktop/agnostic/default.nix b/home/fuwn/meta/desktop/agnostic/default.nix
index 997d62a..f209359 100644
--- a/home/fuwn/meta/desktop/agnostic/default.nix
+++ b/home/fuwn/meta/desktop/agnostic/default.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     showmethekey
+    brightnessctl
   ];
 }
diff --git a/home/fuwn/meta/desktop/wayland/default.nix b/home/fuwn/meta/desktop/wayland/default.nix
index 342a182..cc5bb44 100644
--- a/home/fuwn/meta/desktop/wayland/default.nix
+++ b/home/fuwn/meta/desktop/wayland/default.nix
@@ -1,4 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs
+, ...
+}: {
   imports = [
     ./hyprland
     ./meta
@@ -6,6 +8,9 @@
   ];
 
   home.packages = with pkgs; [
+    wlogout
+    wl-clipboard
+    wlr-randr
     ydotool
   ];
 }
diff --git a/home/fuwn/meta/development/languages/crystal/default.nix b/home/fuwn/meta/development/languages/crystal/default.nix
new file mode 100644
index 0000000..51a0846
--- /dev/null
+++ b/home/fuwn/meta/development/languages/crystal/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    crystal
+    shards
+  ];
+}
diff --git a/home/fuwn/meta/development/languages/default.nix b/home/fuwn/meta/development/languages/default.nix
index da84269..3849fcc 100644
--- a/home/fuwn/meta/development/languages/default.nix
+++ b/home/fuwn/meta/development/languages/default.nix
@@ -3,6 +3,7 @@ _: {
     ./agnostic
     # ./assembly
     ./cobol
+    ./crystal
     # ./csharp
     ./gleam
     ./go
@@ -14,7 +15,7 @@ _: {
     ./protobuf
     ./python
     ./rust
-    ./shell
+    # ./shell
     ./tex
     # ./vlang
     ./yaml
diff --git a/home/fuwn/meta/development/languages/go/default.nix b/home/fuwn/meta/development/languages/go/default.nix
index 3c4a809..a248efd 100644
--- a/home/fuwn/meta/development/languages/go/default.nix
+++ b/home/fuwn/meta/development/languages/go/default.nix
@@ -1,3 +1,7 @@
 { pkgs, ... }: {
   programs.go.enable = true;
+
+  home.packages = with pkgs; [
+    gopls
+  ];
 }
diff --git a/home/fuwn/meta/development/languages/haskell/default.nix b/home/fuwn/meta/development/languages/haskell/default.nix
index 4c486c6..4350daa 100644
--- a/home/fuwn/meta/development/languages/haskell/default.nix
+++ b/home/fuwn/meta/development/languages/haskell/default.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     haskellPackages.cabal-fmt
+    stack
   ];
 }
diff --git a/home/fuwn/meta/development/languages/shell/default.nix b/home/fuwn/meta/development/languages/shell/default.nix
index 1953aac..6476dca 100644
--- a/home/fuwn/meta/development/languages/shell/default.nix
+++ b/home/fuwn/meta/development/languages/shell/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    shfmt
+    amber-lang
   ];
 }
diff --git a/home/fuwn/meta/development/tools/default.nix b/home/fuwn/meta/development/tools/default.nix
index 2bf3d76..cd1372c 100644
--- a/home/fuwn/meta/development/tools/default.nix
+++ b/home/fuwn/meta/development/tools/default.nix
@@ -9,5 +9,6 @@
     highlight
     hyperfine
     sloc
+    shfmt
   ];
 }
diff --git a/home/fuwn/meta/filesystem/archive/default.nix b/home/fuwn/meta/filesystem/archive/default.nix
index 87f3ca9..d00faa5 100644
--- a/home/fuwn/meta/filesystem/archive/default.nix
+++ b/home/fuwn/meta/filesystem/archive/default.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     unrar
+    xar
   ];
 }
diff --git a/home/fuwn/meta/multimedia/browser/default.nix b/home/fuwn/meta/multimedia/browser/default.nix
index 714367c..3ba6037 100644
--- a/home/fuwn/meta/multimedia/browser/default.nix
+++ b/home/fuwn/meta/multimedia/browser/default.nix
@@ -4,5 +4,6 @@
     geckodriver
     # lynx
     # vieb
+    ladybird
   ];
 }
diff --git a/home/fuwn/meta/multimedia/default.nix b/home/fuwn/meta/multimedia/default.nix
index 4525fdc..86da8c4 100644
--- a/home/fuwn/meta/multimedia/default.nix
+++ b/home/fuwn/meta/multimedia/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./audio
     ./browser
+    ./document
     ./image
     ./video
   ];
@@ -9,5 +10,7 @@
   home.packages = with pkgs; [
     blender
     epr
+    nicotine-plus
+    qbittorrent
   ];
 }
diff --git a/home/fuwn/meta/multimedia/document/default.nix b/home/fuwn/meta/multimedia/document/default.nix
new file mode 100644
index 0000000..ab49afc
--- /dev/null
+++ b/home/fuwn/meta/multimedia/document/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    manga-cli
+    zathura
+  ];
+}
diff --git a/home/fuwn/meta/multimedia/video/default.nix b/home/fuwn/meta/multimedia/video/default.nix
index 2b6a706..d7e0551 100644
--- a/home/fuwn/meta/multimedia/video/default.nix
+++ b/home/fuwn/meta/multimedia/video/default.nix
@@ -5,6 +5,7 @@
 
   home.packages = with pkgs; [
     yt-dlp
+    ytfzf
     clapper
     streamlink-twitch-gui-bin
   ];
diff --git a/home/fuwn/meta/network/smolnet/default.nix b/home/fuwn/meta/network/smolnet/default.nix
index 0843979..03dc57b 100644
--- a/home/fuwn/meta/network/smolnet/default.nix
+++ b/home/fuwn/meta/network/smolnet/default.nix
@@ -1,4 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs
+, config
+, ...
+}: {
   imports = [
     ./bollux
   ];
@@ -8,5 +11,7 @@
     geopard
     gmni
     phetch
+  ] ++ [
+    (config.lib.nixGL.wrap pkgs.lagrange)
   ];
 }
diff --git a/home/fuwn/meta/network/tools/default.nix b/home/fuwn/meta/network/tools/default.nix
index 4e369ac..3b6d59f 100644
--- a/home/fuwn/meta/network/tools/default.nix
+++ b/home/fuwn/meta/network/tools/default.nix
@@ -1,6 +1,11 @@
-{
+{ pkgs, ... }: {
   imports = [
     ./http
+    ./shark
     ./tcp
   ];
+
+  home.packages = with pkgs; [
+    lftp
+  ];
 }
diff --git a/home/fuwn/meta/network/tools/shark/default.nix b/home/fuwn/meta/network/tools/shark/default.nix
new file mode 100644
index 0000000..5305bdf
--- /dev/null
+++ b/home/fuwn/meta/network/tools/shark/default.nix
@@ -0,0 +1,8 @@
+{ pkgs
+, ...
+}: {
+  home.packages = with pkgs; [
+    termshark
+    wireshark
+  ];
+}
diff --git a/home/fuwn/meta/system/shell/default.nix b/home/fuwn/meta/system/shell/default.nix
index bc7a15d..05825e6 100644
--- a/home/fuwn/meta/system/shell/default.nix
+++ b/home/fuwn/meta/system/shell/default.nix
@@ -12,5 +12,6 @@
     watchexec
     zoxide
     shellcheck
+    termius
   ];
 }
diff --git a/home/fuwn/meta/system/shell/fish/default.nix b/home/fuwn/meta/system/shell/fish/default.nix
index 291e5a4..fa975cc 100644
--- a/home/fuwn/meta/system/shell/fish/default.nix
+++ b/home/fuwn/meta/system/shell/fish/default.nix
@@ -137,7 +137,6 @@
       ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'";
       def = "myougiden";
       suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ~/Documents/Code/Git/Fuwn/suzuri/suzuri";
-      manga-cli = "bash <(curl -s 'https://raw.githubusercontent.com/justchokingaround/manga-cli/master/manga-cli')";
       "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow";
       shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && nsxiv /tmp/shinobu";
       auto_subtitle = "source $HOME/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True";
@@ -145,7 +144,6 @@
       koix = "koi -f";
       seamonkey = "$HOME/.local/src/seamonkey/seamonkey-bin";
       doom = "$HOME/.config/emacs/bin/doom";
-      lagrange = "SDL_VIDEODRIVER=x11 /usr/bin/lagrange";
     };
   };
 }