diff --git a/flake.nix b/flake.nix
index 55bae4c..80dac6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,9 @@
               users = {
                 hertog = import hertog/home.nix;
               };
+	      extraSpecialArgs = {
+	        inherit inputs;
+	      };
             };
           }
         ];
diff --git a/hertog/home.nix b/hertog/home.nix
index e610881..9d15db9 100644
--- a/hertog/home.nix
+++ b/hertog/home.nix
@@ -1,7 +1,7 @@
 { pkgs, inputs, nix-colors, ... }:
 
 {
-  programs.home-manage.enable = true;
+  programs.home-manager.enable = true;
 
   imports = [
     inputs.nix-colors.homeManagerModules.default
diff --git a/programs/hyperplane/default.nix b/programs/hyperplane/default.nix
new file mode 100644
index 0000000..2c82ac9
--- /dev/null
+++ b/programs/hyperplane/default.nix
@@ -0,0 +1,53 @@
+{ blueprint-compiler
+, desktop-file-utils
+, fetchFromGitHub
+, gobject-introspection
+, lib
+, libadwaita
+, meson
+, ninja
+, python3
+, stdenv
+, wrapGAppsHook4
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hyperplane";
+  owner = "kra-mo";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "${finalAttrs.owner}";
+    repo = "${finalAttrs.pname}";
+    rev = "v${finalAttrs.version}-beta";
+    hash = "sha256-ShpB6Etew1+naLyxHGhHCcyD95QlurWQ+S9/zbMXYrw=";
+  };
+
+  buildInputs = [
+    libadwaita
+    (python3.withPackages (p: with p; [
+      pillow
+      pygobject3
+      pyyaml
+      requests
+    ]))
+  ];
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    gobject-introspection
+    meson
+    ninja
+    wrapGAppsHook4
+  ];
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "A non-hierachical file manager";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ hertog ];
+    license = licenses.gpl3;
+    changelog = "https://github.com/${finalAttrs.owner}/${finalAttrs.pname}/releases/tag/${finalAttrs.version}";
+  };
+})
diff --git a/programs/mini-text/default.nix b/programs/mini-text/default.nix
new file mode 100644
index 0000000..0e4d14d
--- /dev/null
+++ b/programs/mini-text/default.nix
@@ -0,0 +1,48 @@
+{ blueprint-compiler
+, desktop-file-utils
+, fetchFromGitHub
+, lib
+, libadwaita
+, meson
+, ninja
+, python3
+, stdenv
+, wrapGAppsHook4
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  owner = "Nokse22";
+  pname = "mini-text";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "${finalAttrs.owner}";
+    repo = "${finalAttrs.pname}";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-hcZLI4aGopE1U3a7iFp+OB4JohfaSWnpAqEgeTCKFog=";
+  };
+
+  buildInputs = [
+    libadwaita
+    (python3.withPackages (p: with p; [
+      pygobject3
+    ]))
+  ];
+
+  nativeBuildInputs = [
+   blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    wrapGAppsHook4
+  ];
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "An extremely simple Gtk4/Libadwaita app that shows a text view to copy/paste and edit text";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ hertog ];
+    license = licenses.gpl3;
+    changelog = "https://github.com/${finalAttrs.owner}/${finalAttrs.pname}/releases/tag/${finalAttrs.version}";
+  };
+})
diff --git a/programs/sway/sway.nix b/programs/sway/sway.nix
index 975c5a5..9c4af25 100644
--- a/programs/sway/sway.nix
+++ b/programs/sway/sway.nix
@@ -1,4 +1,4 @@
-{ pkgs, config }:
+{ pkgs, config, ... }:
 let
   modifierKey = config.wayland.windowManager.sway.config.modifier;
 in
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index 083dbcb..3d36b62 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -1,4 +1,4 @@
-{ config }:
+{ config, ... }:
 {
   programs.waybar = {
     enable = true;
diff --git a/programs/sway/wofi.nix b/programs/sway/wofi.nix
index 235858a..57fbe14 100644
--- a/programs/sway/wofi.nix
+++ b/programs/sway/wofi.nix
@@ -1,4 +1,4 @@
-{ config }:
+{ config, ... }:
 {
   programs.wofi = {
     enable = true;
diff --git a/programs/zsh.nix b/programs/zsh.nix
index f289c75..83e0ea8 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, ... }:
 
 {
   # Zsh config
diff --git a/system/environment.nix b/system/environment.nix
index f5d0102..1d72ffd 100644
--- a/system/environment.nix
+++ b/system/environment.nix
@@ -1,7 +1,7 @@
 { pkgs, nix-flatpak, ... }:
 let
-  mini-text = pkgs.callPackage ../../Programs/MiniText { };
-  hyperplane = pkgs.callPackage ../../Programs/Hyperplane { };
+  mini-text = pkgs.callPackage ../programs/mini-text { };
+  hyperplane = pkgs.callPackage ../programs/hyperplane { };
 in
 {
   # Set zsh (config is still per user)
diff --git a/system/services.nix b/system/services.nix
index 6daa889..de61623 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -39,5 +39,6 @@
       enable = true;
       driSupport32Bit = true;
     };
+    pulseaudio.enable = false;
   };
 }