Bump: organise

20 files changed, 23 insertions, 12 deletions

diff --git a/flake.nix b/flake.nix
index c3090c1..00e1ea0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -138,6 +138,7 @@
       homeConfigurations.ebisu =
         let
           username = "ebisu";
+          flakeDirectory = ".nixos-config";
         in
         home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgsFor."${system}";
@@ -154,6 +155,7 @@
               self
               secrets
               username
+              flakeDirectory
               ;
           };
         };
diff --git a/home/ebisu/fortune/default.nix b/home/ebisu/fortune/default.nix
index 31754b1..5343565 100644
--- a/home/ebisu/fortune/default.nix
+++ b/home/ebisu/fortune/default.nix
@@ -8,7 +8,7 @@
     ./education
     ./filesystem
     ./multimedia
-    ./network
+    ./networking
     ./nix
     ./rice
     ./scripts
diff --git a/home/ebisu/fortune/filesystem/core/bat/default.nix b/home/ebisu/fortune/filesystem/core/bat.nix
index ea3f3a0..ea3f3a0 100644
--- a/home/ebisu/fortune/filesystem/core/bat/default.nix
+++ b/home/ebisu/fortune/filesystem/core/bat.nix
diff --git a/home/ebisu/fortune/filesystem/core/default.nix b/home/ebisu/fortune/filesystem/core/default.nix
index ce302c5..9046ec3 100644
--- a/home/ebisu/fortune/filesystem/core/default.nix
+++ b/home/ebisu/fortune/filesystem/core/default.nix
@@ -1,12 +1,11 @@
 { pkgs, ... }:
 {
   imports = [
-    ./bat
-    ./eza
+    ./bat.nix
+    ./eza.nix
   ];
 
   home.packages = with pkgs; [
-    dogdns
     duf
     fd
     rm-improved
diff --git a/home/ebisu/fortune/filesystem/core/eza/default.nix b/home/ebisu/fortune/filesystem/core/eza.nix
index a8d2f57..a8d2f57 100644
--- a/home/ebisu/fortune/filesystem/core/eza/default.nix
+++ b/home/ebisu/fortune/filesystem/core/eza.nix
diff --git a/home/ebisu/fortune/network/default.nix b/home/ebisu/fortune/networking/default.nix
index f892f58..f892f58 100644
--- a/home/ebisu/fortune/network/default.nix
+++ b/home/ebisu/fortune/networking/default.nix
diff --git a/home/ebisu/fortune/network/smolnet/bollux.nix b/home/ebisu/fortune/networking/smolnet/bollux.nix
index b33575d..b33575d 100644
--- a/home/ebisu/fortune/network/smolnet/bollux.nix
+++ b/home/ebisu/fortune/networking/smolnet/bollux.nix
diff --git a/home/ebisu/fortune/network/smolnet/default.nix b/home/ebisu/fortune/networking/smolnet/default.nix
index fe69274..fe69274 100644
--- a/home/ebisu/fortune/network/smolnet/default.nix
+++ b/home/ebisu/fortune/networking/smolnet/default.nix
diff --git a/home/ebisu/fortune/network/tools/default.nix b/home/ebisu/fortune/networking/tools/default.nix
index 6135a82..47b88e7 100644
--- a/home/ebisu/fortune/network/tools/default.nix
+++ b/home/ebisu/fortune/networking/tools/default.nix
@@ -2,18 +2,17 @@
 {
   imports = [
     ./http
+    ./dns.nix
     ./shark.nix
   ];
 
   home.packages = with pkgs; [
     lftp
-    dnsutils
     pwru
     bmon
     netcat-openbsd
     nethogs
     inetutils
-    whois
     speedtest-cli
     traceroute
     iptraf-ng
diff --git a/home/ebisu/fortune/networking/tools/dns.nix b/home/ebisu/fortune/networking/tools/dns.nix
new file mode 100644
index 0000000..aeef822
--- /dev/null
+++ b/home/ebisu/fortune/networking/tools/dns.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    dnsutils
+    whois
+    dogdns
+  ];
+}
diff --git a/home/ebisu/fortune/network/tools/http/default.nix b/home/ebisu/fortune/networking/tools/http/default.nix
index b47540f..b47540f 100644
--- a/home/ebisu/fortune/network/tools/http/default.nix
+++ b/home/ebisu/fortune/networking/tools/http/default.nix
diff --git a/home/ebisu/fortune/network/tools/http/httpie.nix b/home/ebisu/fortune/networking/tools/http/httpie.nix
index f27ef26..f27ef26 100644
--- a/home/ebisu/fortune/network/tools/http/httpie.nix
+++ b/home/ebisu/fortune/networking/tools/http/httpie.nix
diff --git a/home/ebisu/fortune/network/tools/http/wget.nix b/home/ebisu/fortune/networking/tools/http/wget.nix
index c5d2936..c5d2936 100644
--- a/home/ebisu/fortune/network/tools/http/wget.nix
+++ b/home/ebisu/fortune/networking/tools/http/wget.nix
diff --git a/home/ebisu/fortune/network/tools/shark.nix b/home/ebisu/fortune/networking/tools/shark.nix
index d4b8c51..d4b8c51 100644
--- a/home/ebisu/fortune/network/tools/shark.nix
+++ b/home/ebisu/fortune/networking/tools/shark.nix
diff --git a/home/ebisu/fortune/rice/default.nix b/home/ebisu/fortune/rice/default.nix
index 539b0cc..5e5b52f 100644
--- a/home/ebisu/fortune/rice/default.nix
+++ b/home/ebisu/fortune/rice/default.nix
@@ -2,8 +2,8 @@
 {
   imports = [
     ./bottom.nix
-    ./glances.nix
     ./fastfetch.nix
+    ./glances.nix
     ./gtk.nix
   ];
 
diff --git a/home/ebisu/fortune/rice/fastfetch.nix b/home/ebisu/fortune/rice/fastfetch.nix
index 2950c1d..41782ce 100644
--- a/home/ebisu/fortune/rice/fastfetch.nix
+++ b/home/ebisu/fortune/rice/fastfetch.nix
@@ -1,10 +1,11 @@
+{ config, flakeDirectory, ... }:
 {
   programs.fastfetch = {
     enable = true;
 
     settings = {
       logo = {
-        source = "~/Downloads/91363-1550240807.png";
+        source = "${config.home.homeDirectory}/${flakeDirectory}/home/${config.home.username}/logo.png";
         width = 30;
 
         padding = {
diff --git a/home/ebisu/fortune/scripts/default.nix b/home/ebisu/fortune/scripts/default.nix
index 8855d54..fe83721 100644
--- a/home/ebisu/fortune/scripts/default.nix
+++ b/home/ebisu/fortune/scripts/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 let
   scriptDir = ./scripts;
+
   generateScripts = builtins.listToAttrs (
     builtins.map (name: {
       inherit name;
diff --git a/home/ebisu/fortune/system/shell/fish.nix b/home/ebisu/fortune/system/shell/fish.nix
index 0a43859..0e3611f 100644
--- a/home/ebisu/fortune/system/shell/fish.nix
+++ b/home/ebisu/fortune/system/shell/fish.nix
@@ -150,11 +150,11 @@
       suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ${config.home.homeDirectory}/Documents/Code/Git/Fuwn/suzuri/suzuri";
       "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";
+      auto_subtitle = "source ${config.home.homeDirectory}/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True";
       steamy = "mangohud gamemoderun steam-runtime";
       koix = "koi -f";
-      seamonkey = "$HOME/.local/src/seamonkey/seamonkey-bin";
-      doom = "$HOME/.config/emacs/bin/doom";
+      seamonkey = "${config.home.homeDirectory}/.local/src/seamonkey/seamonkey-bin";
+      doom = "${config.xdg.configHome}/emacs/bin/doom";
     };
   };
 }
diff --git a/home/ebisu/fortune/system/variables.nix b/home/ebisu/fortune/system/variables.nix
index 56f9f77..97457ba 100644
--- a/home/ebisu/fortune/system/variables.nix
+++ b/home/ebisu/fortune/system/variables.nix
@@ -2,13 +2,14 @@
   pkgs,
   config,
   secrets,
+  flakeDirectory,
   ...
 }:
 {
   home.sessionVariables = {
     # https://github.com/nix-community/home-manager/issues/354#issuecomment-475803163
     LOCALES_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-    FLAKE = "${config.home.homeDirectory}/.nixos-config";
+    FLAKE = "${config.home.homeDirectory}/${flakeDirectory}";
 
     # Default programs
     EDITOR = "lvim";
diff --git a/home/ebisu/logo.png b/home/ebisu/logo.png
new file mode 100644
index 0000000..d82d93e
--- /dev/null
+++ b/home/ebisu/logo.png