Bump

11 files changed, 77 insertions, 32 deletions

diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix
index d20e71c..6e7a2d8 100644
--- a/home/ebisu/default.nix
+++ b/home/ebisu/default.nix
@@ -1,10 +1,16 @@
-{ config, inputs, ... }:
+{
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
 let
   username = "ebisu";
 in
 {
   imports = [ ./fortune ];
   programs.home-manager.enable = true;
+  nix.package = pkgs.nix;
 
   home = {
     inherit username;
diff --git a/home/ebisu/fortune/default.nix b/home/ebisu/fortune/default.nix
index e12e633..31754b1 100644
--- a/home/ebisu/fortune/default.nix
+++ b/home/ebisu/fortune/default.nix
@@ -9,6 +9,7 @@
     ./filesystem
     ./multimedia
     ./network
+    ./nix
     ./rice
     ./scripts
     ./system
diff --git a/home/ebisu/fortune/development/default.nix b/home/ebisu/fortune/development/default.nix
index 1fdf89f..3e1e809 100644
--- a/home/ebisu/fortune/development/default.nix
+++ b/home/ebisu/fortune/development/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./languages
-    ./nix
     ./tools
     ./database.nix
     ./infrastructure.nix
diff --git a/home/ebisu/fortune/development/nix/default.nix b/home/ebisu/fortune/development/nix/default.nix
deleted file mode 100644
index 284b28b..0000000
--- a/home/ebisu/fortune/development/nix/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  imports = [ ./direnv.nix ];
-  services.lorri.enable = true;
-
-  home.packages = with pkgs; [
-    nil
-    statix
-    alejandra
-    nurl
-    nix-init
-    nix-prefetch-git
-    nixfmt-rfc-style
-    nix-tree
-    nix-visualize
-    deadnix
-    update-nix-fetchgit
-    nix-prefetch-scripts
-    nix-output-monitor
-    cachix
-    inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
-    devenv
-    manix
-    niv
-    nix-diff
-    nix-fast-build
-    nix-melt
-  ];
-}
diff --git a/home/ebisu/fortune/multimedia/video/default.nix b/home/ebisu/fortune/multimedia/video/default.nix
index 0746cb6..db04395 100644
--- a/home/ebisu/fortune/multimedia/video/default.nix
+++ b/home/ebisu/fortune/multimedia/video/default.nix
@@ -5,7 +5,7 @@
   home.packages = with pkgs; [
     mplayer
     mpv
-    yt-dlp
+    yt-dlp_git
     ytfzf
     clapper
     streamlink-twitch-gui-bin
diff --git a/home/ebisu/fortune/nix/default.nix b/home/ebisu/fortune/nix/default.nix
new file mode 100644
index 0000000..3e4c7b7
--- /dev/null
+++ b/home/ebisu/fortune/nix/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, inputs, ... }:
+{
+  imports = [
+    ./development
+    ./direnv.nix
+  ];
+
+  home.packages =
+    with pkgs;
+    with inputs;
+    [
+      nix-tree
+      nix-visualize
+      nix-output-monitor
+      cachix
+      nix-alien.packages.${pkgs.system}.nix-alien
+      manix
+      nix-diff
+      nix-fast-build
+      nix-melt
+      nixos-shell
+      nix-du
+      nvd
+      cached-nix-shell
+      omnix.packages.${pkgs.system}.default
+    ];
+}
diff --git a/home/ebisu/fortune/nix/development/default.nix b/home/ebisu/fortune/nix/development/default.nix
new file mode 100644
index 0000000..7c92172
--- /dev/null
+++ b/home/ebisu/fortune/nix/development/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./formatting.nix
+    ./lsp.nix
+    ./tools.nix
+  ];
+
+  services.lorri.enable = true;
+}
diff --git a/home/ebisu/fortune/nix/development/formatting.nix b/home/ebisu/fortune/nix/development/formatting.nix
new file mode 100644
index 0000000..f543d06
--- /dev/null
+++ b/home/ebisu/fortune/nix/development/formatting.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    alejandra
+    nixfmt-rfc-style
+  ];
+}
diff --git a/home/ebisu/fortune/nix/development/lsp.nix b/home/ebisu/fortune/nix/development/lsp.nix
new file mode 100644
index 0000000..7f7e8fc
--- /dev/null
+++ b/home/ebisu/fortune/nix/development/lsp.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    nil
+    nixd
+  ];
+}
diff --git a/home/ebisu/fortune/nix/development/tools.nix b/home/ebisu/fortune/nix/development/tools.nix
new file mode 100644
index 0000000..16b5d6b
--- /dev/null
+++ b/home/ebisu/fortune/nix/development/tools.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    statix
+    nurl
+    nix-init
+    nix-prefetch-git
+    deadnix
+    update-nix-fetchgit
+    nix-prefetch-scripts
+    devenv
+    niv
+    nixpkgs-hammering
+    devbox
+    compose2nix
+    nix-update
+  ];
+}
diff --git a/home/ebisu/fortune/development/nix/direnv.nix b/home/ebisu/fortune/nix/direnv.nix
index 9f73981..9f73981 100644
--- a/home/ebisu/fortune/development/nix/direnv.nix
+++ b/home/ebisu/fortune/nix/direnv.nix