f

42 files changed, 711 insertions, 56 deletions

diff --git a/home/fuwn/cli/default.nix b/home/fuwn/cli/default.nix
deleted file mode 100644
index 45912f4..0000000
--- a/home/fuwn/cli/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-_: {
-  imports = [
-    ./core
-    ./meta
-    ./nethogs
-    # ./nvtop
-    ./other
-    ./sloc
-    ./tealdeer
-    ./todo
-  ];
-}
diff --git a/home/fuwn/cli/meta/default.nix b/home/fuwn/cli/meta/default.nix
deleted file mode 100644
index a7abbbb..0000000
--- a/home/fuwn/cli/meta/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-_: {
-  imports = [
-    ./ai
-    ./git
-    ./irc
-    ./scripting
-    ./shell
-  ];
-}
diff --git a/home/fuwn/cli/nethogs/default.nix b/home/fuwn/cli/nethogs/default.nix
deleted file mode 100644
index 7934eb8..0000000
--- a/home/fuwn/cli/nethogs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    nethogs
-  ];
-}
diff --git a/home/fuwn/cli/nvtop/default.nix b/home/fuwn/cli/nvtop/default.nix
deleted file mode 100644
index 929f5e5..0000000
--- a/home/fuwn/cli/nvtop/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    nvtopPackages.nvidia
-  ];
-}
diff --git a/home/fuwn/cli/sloc/default.nix b/home/fuwn/cli/sloc/default.nix
deleted file mode 100644
index 6249b05..0000000
--- a/home/fuwn/cli/sloc/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    sloc
-  ];
-}
diff --git a/home/fuwn/cli/tealdeer/default.nix b/home/fuwn/cli/tealdeer/default.nix
deleted file mode 100644
index 7ee39f1..0000000
--- a/home/fuwn/cli/tealdeer/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    tealdeer
-  ];
-}
diff --git a/home/fuwn/cli/todo/default.nix b/home/fuwn/cli/todo/default.nix
deleted file mode 100644
index f1c841d..0000000
--- a/home/fuwn/cli/todo/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    todo
-  ];
-}
diff --git a/home/fuwn/home.nix b/home/fuwn/home.nix
index 3d0ca02..205fe77 100644
--- a/home/fuwn/home.nix
+++ b/home/fuwn/home.nix
@@ -82,7 +82,6 @@
   programs.home-manager.enable = true;
 
   imports = [
-    ./cli
     ./meta
   ];
 
diff --git a/home/fuwn/meta/communication/default.nix b/home/fuwn/meta/communication/default.nix
new file mode 100644
index 0000000..8252cc8
--- /dev/null
+++ b/home/fuwn/meta/communication/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  imports = [
+    ./discord
+    ./irc
+  ];
+
+  home.packages = with pkgs; [
+    zoom-us
+    revolt-desktop
+  ];
+}
diff --git a/home/fuwn/meta/communication/discord/default.nix b/home/fuwn/meta/communication/discord/default.nix
new file mode 100644
index 0000000..5e8f79d
--- /dev/null
+++ b/home/fuwn/meta/communication/discord/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  imports = [
+    ./vesktop
+  ];
+
+  home.packages = with pkgs; [
+    # discord-canary
+  ];
+}
diff --git a/home/fuwn/meta/communication/discord/vesktop/default.nix b/home/fuwn/meta/communication/discord/vesktop/default.nix
new file mode 100644
index 0000000..edae1bc
--- /dev/null
+++ b/home/fuwn/meta/communication/discord/vesktop/default.nix
@@ -0,0 +1,649 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    vesktop
+  ];
+
+  services.arrpc.enable = false;
+
+  xdg.configFile."vesktop/settings.json".text = ''
+    {
+        "discordBranch": "canary",
+        "arRPC": "on",
+        "splashColor": "rgba(255, 255, 255, 0.6)",
+        "splashBackground": "rgba(21, 14, 13, 0.52)",
+        "enableMenu": false,
+        "splashTheming": true,
+        "staticTitle": false,
+        "disableMinSize": true,
+        "minimizeToTray": false,
+        "tray": false,
+        "appBadge": false
+    }
+  '';
+
+  xdg.configFile."vesktop/settings/quickCss.css".text = ''
+    /**
+     * @name Dark Matter
+     * @author Tropical#8908, Hammock#3110
+     * @version 3.0.0
+     * @description A cold, dark & frosty theme.
+     * @source https://github.com/DiscordStyles/DarkMatter/
+    */
+
+    @import url('https://DiscordStyles.github.io/DarkMatter/src/base.css');
+
+    /* Variables */
+    :root {
+        --avatar-size: 32px;
+        --background-image: url('https://images6.alphacoders.com/109/1093313.jpg');
+        --home-image: url('https://shinobu.fuwn.workers.dev/shinobu');
+        --background-solid: #150e0d85;
+        --background-solid-dark: #0f0a0985;
+        --background-solid-darker: #0b070685;
+        --accent: 216, 161, 110;
+        --accent-alt: 196, 141, 90;
+    }
+  '';
+
+  xdg.configFile."vesktop/settings/settings.json".text = ''
+    {
+        "notifyAboutUpdates": true,
+        "autoUpdate": true,
+        "autoUpdateNotification": true,
+        "useQuickCss": true,
+        "themeLinks": [],
+        "enabledThemes": [],
+        "enableReactDevtools": true,
+        "frameless": true,
+        "transparent": false,
+        "winCtrlQ": false,
+        "macosTranslucency": false,
+        "disableMinSize": false,
+        "winNativeTitleBar": false,
+        "plugins": {
+            "BadgeAPI": {
+                "enabled": true
+            },
+            "CommandsAPI": {
+                "enabled": true
+            },
+            "ContextMenuAPI": {
+                "enabled": true
+            },
+            "MemberListDecoratorsAPI": {
+                "enabled": true
+            },
+            "MessageAccessoriesAPI": {
+                "enabled": true
+            },
+            "MessageDecorationsAPI": {
+                "enabled": true
+            },
+            "MessageEventsAPI": {
+                "enabled": true
+            },
+            "MessagePopoverAPI": {
+                "enabled": true
+            },
+            "NoticesAPI": {
+                "enabled": true
+            },
+            "ServerListAPI": {
+                "enabled": true
+            },
+            "NoTrack": {
+                "enabled": true
+            },
+            "Settings": {
+                "enabled": true,
+                "settingsLocation": "aboveActivity"
+            },
+            "SupportHelper": {
+                "enabled": true
+            },
+            "AlwaysAnimate": {
+                "enabled": true
+            },
+            "AlwaysTrust": {
+                "enabled": true
+            },
+            "AnonymiseFileNames": {
+                "enabled": true,
+                "method": 0,
+                "randomisedLength": 7,
+                "consistent": "image"
+            },
+            "WebRichPresence (arRPC)": {
+                "enabled": true
+            },
+            "BANger": {
+                "enabled": false
+            },
+            "BetterFolders": {
+                "enabled": false,
+                "sidebar": true,
+                "showFolderIcon": 1,
+                "closeAllHomeButton": false,
+                "keepIcons": false,
+                "sidebarAnim": true,
+                "closeOthers": false,
+                "closeAllFolders": false,
+                "forceOpen": false
+            },
+            "BetterGifAltText": {
+                "enabled": true
+            },
+            "BetterNotesBox": {
+                "enabled": false
+            },
+            "BetterRoleDot": {
+                "enabled": false
+            },
+            "BetterUploadButton": {
+                "enabled": true
+            },
+            "BiggerStreamPreview": {
+                "enabled": true
+            },
+            "BlurNSFW": {
+                "enabled": false
+            },
+            "CallTimer": {
+                "enabled": true,
+                "format": "human"
+            },
+            "ClearURLs": {
+                "enabled": true
+            },
+            "ColorSighted": {
+                "enabled": true
+            },
+            "ConsoleShortcuts": {
+                "enabled": false
+            },
+            "CopyUserURLs": {
+                "enabled": true
+            },
+            "CrashHandler": {
+                "enabled": true,
+                "attemptToPreventCrashes": true,
+                "attemptToNavigateToHome": true
+            },
+            "CustomRPC": {
+                "enabled": false
+            },
+            "Dearrow": {
+                "enabled": true
+            },
+            "EmoteCloner": {
+                "enabled": true
+            },
+            "Experiments": {
+                "enabled": true,
+                "enableIsStaff": false
+            },
+            "F8Break": {
+                "enabled": false
+            },
+            "FakeNitro": {
+                "enabled": false,
+                "enableEmojiBypass": true,
+                "emojiSize": 48,
+                "transformEmojis": true,
+                "enableStickerBypass": true,
+                "stickerSize": 160,
+                "transformStickers": true,
+                "transformCompoundSentence": false,
+                "enableStreamQualityBypass": true
+            },
+            "FakeProfileThemes": {
+                "enabled": false
+            },
+            "FavoriteEmojiFirst": {
+                "enabled": true
+            },
+            "FavoriteGifSearch": {
+                "enabled": true
+            },
+            "FixSpotifyEmbeds": {
+                "enabled": true,
+                "volume": 5
+            },
+            "ForceOwnerCrown": {
+                "enabled": false
+            },
+            "FriendInvites": {
+                "enabled": false
+            },
+            "GameActivityToggle": {
+                "enabled": true
+            },
+            "GifPaste": {
+                "enabled": false
+            },
+            "GreetStickerPicker": {
+                "enabled": true
+            },
+            "HideAttachments": {
+                "enabled": false
+            },
+            "iLoveSpam": {
+                "enabled": false
+            },
+            "IgnoreActivities": {
+                "enabled": false
+            },
+            "ImageZoom": {
+                "enabled": true,
+                "saveZoomValues": true,
+                "invertScroll": true,
+                "nearestNeighbour": false,
+                "square": false,
+                "zoom": 2,
+                "size": 100,
+                "zoomSpeed": 0.5
+            },
+            "InvisibleChat": {
+                "enabled": true,
+                "savedPasswords": "password, Password"
+            },
+            "KeepCurrentChannel": {
+                "enabled": false
+            },
+            "LastFMRichPresence": {
+                "enabled": false
+            },
+            "LoadingQuotes": {
+                "enabled": true,
+                "replaceEvents": true
+            },
+            "MemberCount": {
+                "enabled": true
+            },
+            "MessageClickActions": {
+                "enabled": false
+            },
+            "MessageLinkEmbeds": {
+                "enabled": true,
+                "automodEmbeds": "never",
+                "listMode": "blacklist",
+                "idList": ""
+            },
+            "MessageLogger": {
+                "enabled": true,
+                "deleteStyle": "text",
+                "ignoreBots": false,
+                "ignoreSelf": false,
+                "ignoreUsers": "",
+                "ignoreChannels": "",
+                "ignoreGuilds": ""
+            },
+            "MessageTags": {
+                "enabled": false
+            },
+            "MoreCommands": {
+                "enabled": true
+            },
+            "MoreKaomoji": {
+                "enabled": true
+            },
+            "MoreUserTags": {
+                "enabled": false
+            },
+            "Moyai": {
+                "enabled": false,
+                "volume": 0.5,
+                "quality": "Normal",
+                "triggerWhenUnfocused": true,
+                "ignoreBots": true,
+                "ignoreBlocked": true
+            },
+            "MutualGroupDMs": {
+                "enabled": true
+            },
+            "NoBlockedMessages": {
+                "enabled": false
+            },
+            "NoDevtoolsWarning": {
+                "enabled": true
+            },
+            "NoF1": {
+                "enabled": true
+            },
+            "NoMosaic": {
+                "enabled": false
+            },
+            "NoPendingCount": {
+                "enabled": false
+            },
+            "NoProfileThemes": {
+                "enabled": false
+            },
+            "NoReplyMention": {
+                "enabled": false
+            },
+            "NoScreensharePreview": {
+                "enabled": true
+            },
+            "NoTypingAnimation": {
+                "enabled": true
+            },
+            "NoUnblockToJump": {
+                "enabled": true
+            },
+            "NormalizeMessageLinks": {
+                "enabled": true
+            },
+            "NSFWGateBypass": {
+                "enabled": false
+            },
+            "OnePingPerDM": {
+                "enabled": true,
+                "channelToAffect": "both_dms",
+                "allowMentions": false,
+                "allowEveryone": false
+            },
+            "oneko": {
+                "enabled": true
+            },
+            "OpenInApp": {
+                "enabled": false
+            },
+            "PermissionFreeWill": {
+                "enabled": false
+            },
+            "PermissionsViewer": {
+                "enabled": true,
+                "permissionsSortOrder": 0,
+                "defaultPermissionsDropdownState": false
+            },
+            "petpet": {
+                "enabled": true
+            },
+            "PictureInPicture": {
+                "enabled": false
+            },
+            "PinDMs": {
+                "enabled": false
+            },
+            "PlainFolderIcon": {
+                "enabled": false
+            },
+            "PlatformIndicators": {
+                "enabled": true,
+                "list": true,
+                "badges": true,
+                "messages": true,
+                "colorMobileIndicator": true
+            },
+            "PreviewMessage": {
+                "enabled": false
+            },
+            "PronounDB": {
+                "enabled": true,
+                "pronounsFormat": "LOWERCASE",
+                "pronounSource": 0,
+                "showSelf": true,
+                "showInMessages": true,
+                "showInProfile": true
+            },
+            "QuickMention": {
+                "enabled": false
+            },
+            "QuickReply": {
+                "enabled": false
+            },
+            "ReactErrorDecoder": {
+                "enabled": true
+            },
+            "ReadAllNotificationsButton": {
+                "enabled": true
+            },
+            "RelationshipNotifier": {
+                "enabled": true,
+                "offlineRemovals": true,
+                "groups": true,
+                "servers": true,
+                "notices": false,
+                "friends": true,
+                "friendRequestCancels": true
+            },
+            "RevealAllSpoilers": {
+                "enabled": false
+            },
+            "ReverseImageSearch": {
+                "enabled": true
+            },
+            "RoleColorEverywhere": {
+                "enabled": true,
+                "chatMentions": true,
+                "memberList": true,
+                "voiceUsers": true
+            },
+            "SearchReply": {
+                "enabled": true
+            },
+            "SecretRingToneEnabler": {
+                "enabled": true
+            },
+            "SendTimestamps": {
+                "enabled": false
+            },
+            "ServerListIndicators": {
+                "enabled": true,
+                "mode": 2
+            },
+            "ShikiCodeblocks": {
+                "enabled": true,
+                "theme": "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json",
+                "tryHljs": "SECONDARY",
+                "useDevIcon": "GREYSCALE",
+                "bgOpacity": 100
+            },
+            "ShowAllMessageButtons": {
+                "enabled": false
+            },
+            "ShowConnections": {
+                "enabled": true,
+                "iconSpacing": 1,
+                "iconSize": 32
+            },
+            "ShowHiddenChannels": {
+                "enabled": true,
+                "hideUnreads": true,
+                "showMode": 0,
+                "defaultAllowedUsersAndRolesDropdownState": true
+            },
+            "ShowMeYourName": {
+                "enabled": true,
+                "mode": "nick-user",
+                "displayNames": false,
+                "inReplies": false
+            },
+            "SilentMessageToggle": {
+                "enabled": false
+            },
+            "SilentTyping": {
+                "enabled": true,
+                "showIcon": true,
+                "isEnabled": true
+            },
+            "SortFriendRequests": {
+                "enabled": true,
+                "showDates": true
+            },
+            "SpotifyControls": {
+                "enabled": true,
+                "hoverControls": true,
+                "useSpotifyUris": true
+            },
+            "SpotifyCrack": {
+                "enabled": true,
+                "noSpotifyAutoPause": true,
+                "keepSpotifyActivityOnIdle": false
+            },
+            "SpotifyShareCommands": {
+                "enabled": true
+            },
+            "StartupTimings": {
+                "enabled": true
+            },
+            "TextReplace": {
+                "enabled": false
+            },
+            "ThemeAttributes": {
+                "enabled": false
+            },
+            "TimeBarAllActivities": {
+                "enabled": false
+            },
+            "Translate": {
+                "enabled": true,
+                "autoTranslate": false
+            },
+            "TypingIndicator": {
+                "enabled": false
+            },
+            "TypingTweaks": {
+                "enabled": false
+            },
+            "Unindent": {
+                "enabled": false
+            },
+            "UnsuppressEmbeds": {
+                "enabled": false
+            },
+            "UrbanDictionary": {
+                "enabled": false
+            },
+            "UserVoiceShow": {
+                "enabled": true
+            },
+            "USRBG": {
+                "enabled": false,
+                "nitroFirst": true,
+                "voiceBackground": true
+            },
+            "ValidUser": {
+                "enabled": false
+            },
+            "VoiceChatDoubleClick": {
+                "enabled": true
+            },
+            "VcNarrator": {
+                "enabled": false
+            },
+            "VencordToolbox": {
+                "enabled": false
+            },
+            "ViewIcons": {
+                "enabled": false
+            },
+            "ViewRaw": {
+                "enabled": false
+            },
+            "VoiceMessages": {
+                "enabled": false
+            },
+            "WebContextMenus": {
+                "enabled": true,
+                "addBack": true
+            },
+            "WebKeybinds": {
+                "enabled": true
+            },
+            "WhoReacted": {
+                "enabled": false
+            },
+            "Wikisearch": {
+                "enabled": false
+            },
+            "SuperReactionTweaks": {
+                "enabled": false
+            },
+            "ChatInputButtonAPI": {
+                "enabled": true
+            },
+            "BetterGifPicker": {
+                "enabled": false
+            },
+            "ClientTheme": {
+                "enabled": false
+            },
+            "Decor": {
+                "enabled": false
+            },
+            "FixCodeblockGap": {
+                "enabled": false
+            },
+            "FixYoutubeEmbeds": {
+                "enabled": false
+            },
+            "DisableCallIdle": {
+                "enabled": true
+            },
+            "NewGuildSettings": {
+                "enabled": true,
+                "guild": true,
+                "everyone": true,
+                "role": true
+            },
+            "ShowHiddenThings": {
+                "enabled": false
+            },
+            "PartyMode": {
+                "enabled": false,
+                "superIntensePartyMode": 0
+            },
+            "MessageUpdaterAPI": {
+                "enabled": true
+            },
+            "AutomodContext": {
+                "enabled": false
+            },
+            "BetterRoleContext": {
+                "enabled": false
+            },
+            "BetterSessions": {
+                "enabled": false
+            },
+            "BetterSettings": {
+                "enabled": false
+            },
+            "CtrlEnterSend": {
+                "enabled": false
+            },
+            "CustomIdle": {
+                "enabled": false
+            },
+            "DontRoundMyTimestamps": {
+                "enabled": false
+            },
+            "FriendsSince": {
+                "enabled": false
+            },
+            "ImageLink": {
+                "enabled": false
+            },
+            "ImplicitRelationships": {
+                "enabled": false
+            },
+            "ServerInfo": {
+                "enabled": true
+            }
+        },
+        "notifications": {
+            "timeout": 5000,
+            "position": "bottom-right",
+            "useNative": "not-focused",
+            "logLimit": 50
+        },
+        "cloud": {
+            "authenticated": false,
+            "url": "https://api.vencord.dev/",
+            "settingsSync": false,
+            "settingsSyncVersion": 1717817629006
+        }
+    }
+  '';
+}
diff --git a/home/fuwn/cli/meta/irc/default.nix b/home/fuwn/meta/communication/irc/default.nix
index adde57d..61a2ebf 100644
--- a/home/fuwn/cli/meta/irc/default.nix
+++ b/home/fuwn/meta/communication/irc/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     catgirl
+    litterbox
     pounce
   ];
 }
diff --git a/home/fuwn/meta/default.nix b/home/fuwn/meta/default.nix
index fca7414..cd07eaf 100644
--- a/home/fuwn/meta/default.nix
+++ b/home/fuwn/meta/default.nix
@@ -1,15 +1,17 @@
 _: {
   imports = [
+    ./communication
     ./desktop
     ./development
     ./education
     ./filesystem
     # ./gaming
     ./multimedia
+    ./network
     ./rice
     ./scripts
-    ./smolnet
     ./steam
     ./system
+    ./utility
   ];
 }
diff --git a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix
index 5e413dd..92d7c67 100644
--- a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix
+++ b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/general.nix
@@ -1,4 +1,4 @@
-_: {
+{ config, ... }: {
   wayland.windowManager.hyprland = {
     settings = {
       monitor = [
@@ -7,7 +7,7 @@ _: {
         "DP-1,     [email protected], 3840x0, 1"
       ];
 
-      source = "/home/fuwn/.cache/wal/colors-hyprland";
+      source = "${config.home.homeDirectory}/.cache/wal/colors-hyprland";
 
       general = {
         gaps_in = 5;
diff --git a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix
index f5ac557..d77a24b 100644
--- a/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix
+++ b/home/fuwn/meta/desktop/wayland/hyprland/hyprland/workspaces.nix
@@ -1,4 +1,4 @@
-_: {
+{ config, ... }: {
   wayland.windowManager.hyprland.settings.workspace = (
     let
       generateWorkspaces = monitor: workspaces: offset:
@@ -31,7 +31,7 @@ _: {
   ) ++ [
     "special:simple_terminal, on-created-empty:[float;center;size 50% 65%] kitty --class simple_terminal"
     "special:simple_calculator, on-created-empty:[float;center;size 50% 50%] kitty --class simple_calculator -e bc -lq"
-    "special:chatgpt, on-created-empty:[float;center;size 65% 75%] thorium-browser --user-data-dir=~/.local/share/thorium-browser-chatgpt --app='https://chatgpt.com/'"
+    "special:chatgpt, on-created-empty:[float;center;size 65% 75%] thorium-browser --user-data-dir=${config.home.homeDirectory}/.local/share/thorium-browser-chatgpt --app='https://chatgpt.com/'"
     "special:spotify, on-created-empty:[float;center;size 65% 90%] spotify"
     "special:calculator, on-created-empty:[float;center;size 50% 50%] qalculate-gtk"
   ];
diff --git a/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix b/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix
index 03ccb3d..727ced0 100644
--- a/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix
+++ b/home/fuwn/meta/desktop/wayland/hyprland/hyprlock/default.nix
@@ -12,7 +12,7 @@
 
       background = [
         {
-          path = "/home/fuwn/.local/share/bg";
+          path = "${config.home.homeDirectory}/.local/share/bg";
         }
       ];
 
diff --git a/home/fuwn/meta/development/default.nix b/home/fuwn/meta/development/default.nix
index e08677f..7666be8 100644
--- a/home/fuwn/meta/development/default.nix
+++ b/home/fuwn/meta/development/default.nix
@@ -1,10 +1,9 @@
 _: {
   imports = [
-    ./http
+    ./git
     ./infrastructure
     ./languages
     ./nix
-    ./tcp
     ./tools
   ];
 }
diff --git a/home/fuwn/cli/meta/git/default.nix b/home/fuwn/meta/development/git/default.nix
index 630285c..260b0f6 100644
--- a/home/fuwn/cli/meta/git/default.nix
+++ b/home/fuwn/meta/development/git/default.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
+    delta
     gh
     onefetch
     gitoxide
diff --git a/home/fuwn/meta/development/languages/default.nix b/home/fuwn/meta/development/languages/default.nix
index 1ec2f16..fe5d437 100644
--- a/home/fuwn/meta/development/languages/default.nix
+++ b/home/fuwn/meta/development/languages/default.nix
@@ -6,7 +6,7 @@ _: {
     ./cobol
     ./gleam
     ./go
-    ./hare
+    # ./hare
     ./javascript
     # ./jvm
     ./protobuf
diff --git a/home/fuwn/meta/development/tools/default.nix b/home/fuwn/meta/development/tools/default.nix
index e52d2ec..b78b25f 100644
--- a/home/fuwn/meta/development/tools/default.nix
+++ b/home/fuwn/meta/development/tools/default.nix
@@ -2,5 +2,6 @@
   home.packages = with pkgs; [
     clang-tools
     highlight
+    sloc
   ];
 }
diff --git a/home/fuwn/cli/core/bat/default.nix b/home/fuwn/meta/filesystem/core/bat/default.nix
index c1dad3f..c1dad3f 100644
--- a/home/fuwn/cli/core/bat/default.nix
+++ b/home/fuwn/meta/filesystem/core/bat/default.nix
diff --git a/home/fuwn/cli/core/default.nix b/home/fuwn/meta/filesystem/core/default.nix
index 5585e65..5585e65 100644
--- a/home/fuwn/cli/core/default.nix
+++ b/home/fuwn/meta/filesystem/core/default.nix
diff --git a/home/fuwn/cli/core/eza/default.nix b/home/fuwn/meta/filesystem/core/eza/default.nix
index a8d2f57..a8d2f57 100644
--- a/home/fuwn/cli/core/eza/default.nix
+++ b/home/fuwn/meta/filesystem/core/eza/default.nix
diff --git a/home/fuwn/meta/filesystem/default.nix b/home/fuwn/meta/filesystem/default.nix
index 42dccca..81f0ed7 100644
--- a/home/fuwn/meta/filesystem/default.nix
+++ b/home/fuwn/meta/filesystem/default.nix
@@ -1,4 +1,8 @@
 { pkgs, ... }: {
+  imports = [
+    ./core
+  ];
+
   programs.nnn.enable = true;
 
   home.packages = with pkgs; [
diff --git a/home/fuwn/meta/multimedia/image/default.nix b/home/fuwn/meta/multimedia/image/default.nix
index 83242d2..58961ac 100644
--- a/home/fuwn/meta/multimedia/image/default.nix
+++ b/home/fuwn/meta/multimedia/image/default.nix
@@ -2,8 +2,10 @@
   home.packages = with pkgs; [
     ahoviewer
     feh
+    gallery-dl
     gthumb
     nsxiv
+    pngcrush
     viewnior
     viu
   ];
diff --git a/home/fuwn/meta/network/default.nix b/home/fuwn/meta/network/default.nix
new file mode 100644
index 0000000..a7ea06e
--- /dev/null
+++ b/home/fuwn/meta/network/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./smolnet
+    ./tools
+  ];
+}
diff --git a/home/fuwn/meta/smolnet/bollux/default.nix b/home/fuwn/meta/network/smolnet/bollux/default.nix
index 2079052..2079052 100644
--- a/home/fuwn/meta/smolnet/bollux/default.nix
+++ b/home/fuwn/meta/network/smolnet/bollux/default.nix
diff --git a/home/fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch b/home/fuwn/meta/network/smolnet/bollux/fix_lesskey_nag.patch
index 329b886..329b886 100644
--- a/home/fuwn/meta/smolnet/bollux/fix_lesskey_nag.patch
+++ b/home/fuwn/meta/network/smolnet/bollux/fix_lesskey_nag.patch
diff --git a/home/fuwn/meta/smolnet/default.nix b/home/fuwn/meta/network/smolnet/default.nix
index 0843979..0843979 100644
--- a/home/fuwn/meta/smolnet/default.nix
+++ b/home/fuwn/meta/network/smolnet/default.nix
diff --git a/home/fuwn/meta/network/tools/default.nix b/home/fuwn/meta/network/tools/default.nix
new file mode 100644
index 0000000..4e369ac
--- /dev/null
+++ b/home/fuwn/meta/network/tools/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./http
+    ./tcp
+  ];
+}
diff --git a/home/fuwn/meta/development/http/default.nix b/home/fuwn/meta/network/tools/http/default.nix
index b917245..b917245 100644
--- a/home/fuwn/meta/development/http/default.nix
+++ b/home/fuwn/meta/network/tools/http/default.nix
diff --git a/home/fuwn/meta/development/tcp/default.nix b/home/fuwn/meta/network/tools/tcp/default.nix
index ad648f1..a468382 100644
--- a/home/fuwn/meta/development/tcp/default.nix
+++ b/home/fuwn/meta/network/tools/tcp/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
     netcat-openbsd
+    nethogs
     inetutils
     whois
   ];
diff --git a/home/fuwn/meta/rice/default.nix b/home/fuwn/meta/rice/default.nix
index 25ae26c..d89dfe5 100644
--- a/home/fuwn/meta/rice/default.nix
+++ b/home/fuwn/meta/rice/default.nix
@@ -11,5 +11,6 @@
   home.packages = with pkgs; [
     cpufetch
     iotop
+    # nvtopPackages.nvidia
   ];
 }
diff --git a/home/fuwn/meta/system/default.nix b/home/fuwn/meta/system/default.nix
index 6698785..8fee2ce 100644
--- a/home/fuwn/meta/system/default.nix
+++ b/home/fuwn/meta/system/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [
     ./bitwarden
+    ./shell
     ./terminal
   ];
 
diff --git a/home/fuwn/cli/meta/shell/default.nix b/home/fuwn/meta/system/shell/default.nix
index e304479..95345e6 100644
--- a/home/fuwn/cli/meta/shell/default.nix
+++ b/home/fuwn/meta/system/shell/default.nix
@@ -2,12 +2,14 @@
   imports = [
     ./fish
     ./starship
+    ./scripting
   ];
 
   home.packages = with pkgs; [
     asciinema
     navi
     shellclear
+    watchexec
     zoxide
   ];
 }
diff --git a/home/fuwn/cli/meta/shell/fish/default.nix b/home/fuwn/meta/system/shell/fish/default.nix
index 291e5a4..291e5a4 100644
--- a/home/fuwn/cli/meta/shell/fish/default.nix
+++ b/home/fuwn/meta/system/shell/fish/default.nix
diff --git a/home/fuwn/cli/meta/scripting/charmbracelet/default.nix b/home/fuwn/meta/system/shell/scripting/charmbracelet/default.nix
index e3b78df..e3b78df 100644
--- a/home/fuwn/cli/meta/scripting/charmbracelet/default.nix
+++ b/home/fuwn/meta/system/shell/scripting/charmbracelet/default.nix
diff --git a/home/fuwn/cli/meta/scripting/default.nix b/home/fuwn/meta/system/shell/scripting/default.nix
index fb6e062..fb6e062 100644
--- a/home/fuwn/cli/meta/scripting/default.nix
+++ b/home/fuwn/meta/system/shell/scripting/default.nix
diff --git a/home/fuwn/cli/meta/scripting/ripgrep/default.nix b/home/fuwn/meta/system/shell/scripting/ripgrep/default.nix
index 00de07f..00de07f 100644
--- a/home/fuwn/cli/meta/scripting/ripgrep/default.nix
+++ b/home/fuwn/meta/system/shell/scripting/ripgrep/default.nix
diff --git a/home/fuwn/cli/meta/shell/starship/default.nix b/home/fuwn/meta/system/shell/starship/default.nix
index 0088038..0088038 100644
--- a/home/fuwn/cli/meta/shell/starship/default.nix
+++ b/home/fuwn/meta/system/shell/starship/default.nix
diff --git a/home/fuwn/cli/meta/ai/default.nix b/home/fuwn/meta/utility/ai/default.nix
index 7513348..7513348 100644
--- a/home/fuwn/cli/meta/ai/default.nix
+++ b/home/fuwn/meta/utility/ai/default.nix
diff --git a/home/fuwn/cli/other/default.nix b/home/fuwn/meta/utility/default.nix
index f23f7f4..4c5da73 100644
--- a/home/fuwn/cli/other/default.nix
+++ b/home/fuwn/meta/utility/default.nix
@@ -1,6 +1,12 @@
 { pkgs, ... }: {
+  imports = [
+    ./ai
+  ];
+
   home.packages = with pkgs; [
     fontpreview
+    tealdeer
+    todo
     ripunzip
   ];
 }