op

15 files changed, 130 insertions, 15 deletions

diff --git a/flake.lock b/flake.lock
index 3a0bdab..5a3895c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -150,6 +150,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -445,6 +460,27 @@
         "type": "github"
       }
     },
+    "nixGL": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1713543440,
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1719075281,
@@ -515,6 +551,7 @@
         "hycov": "hycov",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
+        "nixGL": "nixGL",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "stylix": "stylix",
diff --git a/flake.nix b/flake.nix
index 3ef3c99..3c6bc38 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixGL = {
+      url = "github:nix-community/nixGL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nur.url = "github:nix-community/NUR";
     stylix.url = "github:danth/stylix";
     systems.url = "github:nix-systems/default-linux";
diff --git a/home/fuwn/meta/default.nix b/home/fuwn/meta/default.nix
index cd07eaf..d810a18 100644
--- a/home/fuwn/meta/default.nix
+++ b/home/fuwn/meta/default.nix
@@ -3,6 +3,7 @@ _: {
     ./communication
     ./desktop
     ./development
+    ./editor
     ./education
     ./filesystem
     # ./gaming
diff --git a/home/fuwn/meta/development/languages/javascript/default.nix b/home/fuwn/meta/development/languages/javascript/default.nix
index 5aaccda..26b320d 100644
--- a/home/fuwn/meta/development/languages/javascript/default.nix
+++ b/home/fuwn/meta/development/languages/javascript/default.nix
@@ -2,8 +2,8 @@
   home.packages = with pkgs; [
     bun
     # deno
-    # nodejs
+    nodePackages_latest.nodejs
     # typescript
-    # nodePackages.npm
+    yarn-berry
   ];
 }
diff --git a/home/fuwn/meta/editor/default.nix b/home/fuwn/meta/editor/default.nix
new file mode 100644
index 0000000..7a3012f
--- /dev/null
+++ b/home/fuwn/meta/editor/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, config, ... }: {
+  home.packages = [
+    (config.lib.nixGL.wrap pkgs.neovide)
+  ];
+}
diff --git a/home/fuwn/meta/network/smolnet/bollux/default.nix b/home/fuwn/meta/network/smolnet/bollux/default.nix
index 2079052..4d26eee 100644
--- a/home/fuwn/meta/network/smolnet/bollux/default.nix
+++ b/home/fuwn/meta/network/smolnet/bollux/default.nix
@@ -27,21 +27,19 @@ let
         hash = "sha256-mo2qWCPfW+dUaYcJLsos/vR5nJ8n1eABy8Zy8OZsfVg=";
       };
 
-      runtimeDependencies = [
-        pkgs.bashInteractive
-        pkgs.iconv
-        pkgs.openssl
-        pkgs.less
-        pkgs.coreutils
-      ];
-
       patches = [
         # https://tildegit.org/acdw/bollux/issues/13#issuecomment-9786
         ./fix_lesskey_nag.patch
       ];
 
       postInstall = ''
-        wrapProgram $out/bin/bollux --prefix PATH : ${lib.makeBinPath runtimeDependencies}
+        wrapProgram $out/bin/bollux --prefix PATH : ${lib.makeBinPath [
+          pkgs.bashInteractive
+          pkgs.iconv
+          pkgs.openssl
+          pkgs.less
+          pkgs.coreutils
+        ]}
       '';
 
       meta = with lib; {
diff --git a/home/fuwn/meta/network/tools/http/default.nix b/home/fuwn/meta/network/tools/http/default.nix
index b917245..c70c2ba 100644
--- a/home/fuwn/meta/network/tools/http/default.nix
+++ b/home/fuwn/meta/network/tools/http/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
-    httpie
-    httpie-desktop
+  imports = [
+    ./httpie
+    ./yaak
   ];
 }
diff --git a/home/fuwn/meta/network/tools/http/httpie/default.nix b/home/fuwn/meta/network/tools/http/httpie/default.nix
new file mode 100644
index 0000000..b917245
--- /dev/null
+++ b/home/fuwn/meta/network/tools/http/httpie/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    httpie
+    httpie-desktop
+  ];
+}
diff --git a/home/fuwn/meta/network/tools/http/yaak/default.nix b/home/fuwn/meta/network/tools/http/yaak/default.nix
new file mode 100644
index 0000000..9a24921
--- /dev/null
+++ b/home/fuwn/meta/network/tools/http/yaak/default.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, ... }:
+let
+  yaak-archive = pkgs.fetchzip {
+    url = "https://releases.yaak.app/releases/2024.6.6/yaak_2024.6.6_amd64.AppImage.tar.gz";
+    hash = "sha256-Qnc4RlQmQWHARreQ69jAshq57bZ56Yt5a35jpTjGwNU=";
+  };
+
+  version = "2024.6.6";
+
+  # https://discourse.nixos.org/t/creating-a-nix-derivation-for-an-appimage/31927
+  yaak = pkgs.appimageTools.wrapType2 {
+    pname = "yaak";
+    version = version;
+    src = "${yaak-archive}/yaak_${version}_amd64.AppImage";
+
+    meta = with lib; {
+      description = "Play with APIs, intuitively";
+      sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+      homepage = "https://yaak.app/";
+      license = licenses.unfree;
+      platforms = platforms.linux;
+      mainProgram = "yaak";
+    };
+  };
+in
+{
+  home.packages = [
+    yaak
+  ];
+}
diff --git a/home/fuwn/meta/network/tools/tcp/default.nix b/home/fuwn/meta/network/tools/tcp/default.nix
index b29fb80..cb9ae6f 100644
--- a/home/fuwn/meta/network/tools/tcp/default.nix
+++ b/home/fuwn/meta/network/tools/tcp/default.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
+    bmon
     netcat-openbsd
     nethogs
     inetutils
diff --git a/home/fuwn/meta/scripts/scripts/neovide-lunarvim b/home/fuwn/meta/scripts/scripts/neovide-lunarvim
new file mode 100644
index 0000000..502a3f1
--- /dev/null
+++ b/home/fuwn/meta/scripts/scripts/neovide-lunarvim
@@ -0,0 +1,7 @@
+# ref: https://aur.archlinux.org/cgit/aur.git/tree/script.sh?h=neovide-lunarvim
+
+export LUNARVIM_CONFIG_DIR="${LUNARVIM_CONFIG_DIR:-$HOME/.config/lvim}"
+export LUNARVIM_RUNTIME_DIR="${LUNARVIM_RUNTIME_DIR:-$HOME/.local/share/lunarvim}"
+export LUNARVIM_CACHE_DIR="${LUNARVIM_CACHE_DIR:-$HOME/.cache/lvim}"
+
+exec neovide -- -u "$LUNARVIM_RUNTIME_DIR/lvim/init.lua" "$@"
diff --git a/home/fuwn/meta/system/default.nix b/home/fuwn/meta/system/default.nix
index 9a0fc32..e9bdd4e 100644
--- a/home/fuwn/meta/system/default.nix
+++ b/home/fuwn/meta/system/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [
     ./bitwarden
+    ./opengl
     ./peripheral
     ./shell
     ./terminal
diff --git a/home/fuwn/meta/system/opengl/default.nix b/home/fuwn/meta/system/opengl/default.nix
new file mode 100644
index 0000000..cabb8f9
--- /dev/null
+++ b/home/fuwn/meta/system/opengl/default.nix
@@ -0,0 +1,23 @@
+{ pkgs
+, config
+, inputs
+, ...
+}:
+let
+  nixGLIntel = inputs.nixGL.packages.${pkgs.system}.nixGLIntel;
+in
+{
+  imports = [
+    (builtins.fetchurl {
+      url = "https://raw.githubusercontent.com/nix-community/home-manager/5e59fe27d938a8c2d5e215f64f5d937c2f863fed/modules/misc/nixgl.nix";
+      sha256 = "74f9fb98f22581eaca2e3c518a0a3d6198249fb1490ab4a08f33ec47827e85db";
+    })
+  ];
+
+  # Ref. https://github.com/nix-community/home-manager/issues/3968
+  nixGL.prefix = "${nixGLIntel}/bin/nixGLIntel";
+
+  home.packages = [
+    nixGLIntel
+  ];
+}
diff --git a/home/fuwn/meta/system/shell/scripting/default.nix b/home/fuwn/meta/system/shell/scripting/default.nix
index fb6e062..3bc4e83 100644
--- a/home/fuwn/meta/system/shell/scripting/default.nix
+++ b/home/fuwn/meta/system/shell/scripting/default.nix
@@ -5,6 +5,7 @@
   ];
 
   home.packages = with pkgs; [
+    mdcat
     moreutils
     pup
   ];
diff --git a/home/fuwn/meta/system/virtualisation/docker/default.nix b/home/fuwn/meta/system/virtualisation/docker/default.nix
index 1ec4ec8..26854be 100644
--- a/home/fuwn/meta/system/virtualisation/docker/default.nix
+++ b/home/fuwn/meta/system/virtualisation/docker/default.nix
@@ -3,7 +3,7 @@
     act
     earthly
     dive
-    docker
+    # docker
     docker-buildx
     docker-slim
   ];