From 839b40baca6d057e1c78a96319b168b047ca12f4 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Mon, 9 Sep 2024 04:43:38 -0700 Subject: Bump: organise --- flake.nix | 2 ++ home/ebisu/fortune/default.nix | 2 +- home/ebisu/fortune/filesystem/core/bat.nix | 6 +++++ home/ebisu/fortune/filesystem/core/bat/default.nix | 6 ----- home/ebisu/fortune/filesystem/core/default.nix | 5 ++-- home/ebisu/fortune/filesystem/core/eza.nix | 7 ++++++ home/ebisu/fortune/filesystem/core/eza/default.nix | 7 ------ home/ebisu/fortune/network/default.nix | 9 ------- home/ebisu/fortune/network/smolnet/bollux.nix | 5 ---- home/ebisu/fortune/network/smolnet/default.nix | 12 ---------- home/ebisu/fortune/network/tools/default.nix | 26 --------------------- home/ebisu/fortune/network/tools/http/default.nix | 9 ------- home/ebisu/fortune/network/tools/http/httpie.nix | 7 ------ home/ebisu/fortune/network/tools/http/wget.nix | 8 ------- home/ebisu/fortune/network/tools/shark.nix | 7 ------ home/ebisu/fortune/networking/default.nix | 9 +++++++ home/ebisu/fortune/networking/smolnet/bollux.nix | 5 ++++ home/ebisu/fortune/networking/smolnet/default.nix | 12 ++++++++++ home/ebisu/fortune/networking/tools/default.nix | 25 ++++++++++++++++++++ home/ebisu/fortune/networking/tools/dns.nix | 8 +++++++ .../fortune/networking/tools/http/default.nix | 9 +++++++ .../ebisu/fortune/networking/tools/http/httpie.nix | 7 ++++++ home/ebisu/fortune/networking/tools/http/wget.nix | 8 +++++++ home/ebisu/fortune/networking/tools/shark.nix | 7 ++++++ home/ebisu/fortune/rice/default.nix | 2 +- home/ebisu/fortune/rice/fastfetch.nix | 3 ++- home/ebisu/fortune/scripts/default.nix | 1 + home/ebisu/fortune/system/shell/fish.nix | 6 ++--- home/ebisu/fortune/system/variables.nix | 3 ++- home/ebisu/logo.png | Bin 0 -> 887397 bytes 30 files changed, 117 insertions(+), 106 deletions(-) create mode 100644 home/ebisu/fortune/filesystem/core/bat.nix delete mode 100644 home/ebisu/fortune/filesystem/core/bat/default.nix create mode 100644 home/ebisu/fortune/filesystem/core/eza.nix delete mode 100644 home/ebisu/fortune/filesystem/core/eza/default.nix delete mode 100644 home/ebisu/fortune/network/default.nix delete mode 100644 home/ebisu/fortune/network/smolnet/bollux.nix delete mode 100644 home/ebisu/fortune/network/smolnet/default.nix delete mode 100644 home/ebisu/fortune/network/tools/default.nix delete mode 100644 home/ebisu/fortune/network/tools/http/default.nix delete mode 100644 home/ebisu/fortune/network/tools/http/httpie.nix delete mode 100644 home/ebisu/fortune/network/tools/http/wget.nix delete mode 100644 home/ebisu/fortune/network/tools/shark.nix create mode 100644 home/ebisu/fortune/networking/default.nix create mode 100644 home/ebisu/fortune/networking/smolnet/bollux.nix create mode 100644 home/ebisu/fortune/networking/smolnet/default.nix create mode 100644 home/ebisu/fortune/networking/tools/default.nix create mode 100644 home/ebisu/fortune/networking/tools/dns.nix create mode 100644 home/ebisu/fortune/networking/tools/http/default.nix create mode 100644 home/ebisu/fortune/networking/tools/http/httpie.nix create mode 100644 home/ebisu/fortune/networking/tools/http/wget.nix create mode 100644 home/ebisu/fortune/networking/tools/shark.nix create mode 100644 home/ebisu/logo.png 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.nix b/home/ebisu/fortune/filesystem/core/bat.nix new file mode 100644 index 0000000..ea3f3a0 --- /dev/null +++ b/home/ebisu/fortune/filesystem/core/bat.nix @@ -0,0 +1,6 @@ +{ + programs.bat = { + enable = true; + config.pager = "less -FR"; + }; +} diff --git a/home/ebisu/fortune/filesystem/core/bat/default.nix b/home/ebisu/fortune/filesystem/core/bat/default.nix deleted file mode 100644 index ea3f3a0..0000000 --- a/home/ebisu/fortune/filesystem/core/bat/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.bat = { - enable = true; - config.pager = "less -FR"; - }; -} 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.nix b/home/ebisu/fortune/filesystem/core/eza.nix new file mode 100644 index 0000000..a8d2f57 --- /dev/null +++ b/home/ebisu/fortune/filesystem/core/eza.nix @@ -0,0 +1,7 @@ +_: { + programs.eza = { + enable = true; + icons = true; + enableFishIntegration = true; + }; +} diff --git a/home/ebisu/fortune/filesystem/core/eza/default.nix b/home/ebisu/fortune/filesystem/core/eza/default.nix deleted file mode 100644 index a8d2f57..0000000 --- a/home/ebisu/fortune/filesystem/core/eza/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - programs.eza = { - enable = true; - icons = true; - enableFishIntegration = true; - }; -} diff --git a/home/ebisu/fortune/network/default.nix b/home/ebisu/fortune/network/default.nix deleted file mode 100644 index f892f58..0000000 --- a/home/ebisu/fortune/network/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./smolnet - ./tools - ]; - - home.packages = [ pkgs.i2p ]; -} diff --git a/home/ebisu/fortune/network/smolnet/bollux.nix b/home/ebisu/fortune/network/smolnet/bollux.nix deleted file mode 100644 index b33575d..0000000 --- a/home/ebisu/fortune/network/smolnet/bollux.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ (pkgs.callPackage ../../../../../pkgs/bollux { }) ]; - xdg.configFile."bollux/bollux.conf".text = ''''; -} diff --git a/home/ebisu/fortune/network/smolnet/default.nix b/home/ebisu/fortune/network/smolnet/default.nix deleted file mode 100644 index fe69274..0000000 --- a/home/ebisu/fortune/network/smolnet/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ ./bollux.nix ]; - - home.packages = with pkgs; [ - amfora - geopard - gmni - phetch - lagrange - ]; -} diff --git a/home/ebisu/fortune/network/tools/default.nix b/home/ebisu/fortune/network/tools/default.nix deleted file mode 100644 index 6135a82..0000000 --- a/home/ebisu/fortune/network/tools/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./http - ./shark.nix - ]; - - home.packages = with pkgs; [ - lftp - dnsutils - pwru - bmon - netcat-openbsd - nethogs - inetutils - whois - speedtest-cli - traceroute - iptraf-ng - tcpdump - (pkgs.callPackage ../../../../../pkgs/bindtointerface.nix { }) - trayscale - nmap - bandwhich - ]; -} diff --git a/home/ebisu/fortune/network/tools/http/default.nix b/home/ebisu/fortune/network/tools/http/default.nix deleted file mode 100644 index b47540f..0000000 --- a/home/ebisu/fortune/network/tools/http/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./httpie.nix - ./wget.nix - ]; - - home.packages = [ (pkgs.callPackage ../../../../../../pkgs/yaak.nix { }) ]; -} diff --git a/home/ebisu/fortune/network/tools/http/httpie.nix b/home/ebisu/fortune/network/tools/http/httpie.nix deleted file mode 100644 index f27ef26..0000000 --- a/home/ebisu/fortune/network/tools/http/httpie.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - httpie - httpie-desktop - ]; -} diff --git a/home/ebisu/fortune/network/tools/http/wget.nix b/home/ebisu/fortune/network/tools/http/wget.nix deleted file mode 100644 index c5d2936..0000000 --- a/home/ebisu/fortune/network/tools/http/wget.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.wget ]; - - xdg.configFile."wget/wgetrc".text = '' - hsts-file=~/.cache/wget-hsts - ''; -} diff --git a/home/ebisu/fortune/network/tools/shark.nix b/home/ebisu/fortune/network/tools/shark.nix deleted file mode 100644 index d4b8c51..0000000 --- a/home/ebisu/fortune/network/tools/shark.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - termshark - wireshark - ]; -} diff --git a/home/ebisu/fortune/networking/default.nix b/home/ebisu/fortune/networking/default.nix new file mode 100644 index 0000000..f892f58 --- /dev/null +++ b/home/ebisu/fortune/networking/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + imports = [ + ./smolnet + ./tools + ]; + + home.packages = [ pkgs.i2p ]; +} diff --git a/home/ebisu/fortune/networking/smolnet/bollux.nix b/home/ebisu/fortune/networking/smolnet/bollux.nix new file mode 100644 index 0000000..b33575d --- /dev/null +++ b/home/ebisu/fortune/networking/smolnet/bollux.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ (pkgs.callPackage ../../../../../pkgs/bollux { }) ]; + xdg.configFile."bollux/bollux.conf".text = ''''; +} diff --git a/home/ebisu/fortune/networking/smolnet/default.nix b/home/ebisu/fortune/networking/smolnet/default.nix new file mode 100644 index 0000000..fe69274 --- /dev/null +++ b/home/ebisu/fortune/networking/smolnet/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + imports = [ ./bollux.nix ]; + + home.packages = with pkgs; [ + amfora + geopard + gmni + phetch + lagrange + ]; +} diff --git a/home/ebisu/fortune/networking/tools/default.nix b/home/ebisu/fortune/networking/tools/default.nix new file mode 100644 index 0000000..47b88e7 --- /dev/null +++ b/home/ebisu/fortune/networking/tools/default.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: +{ + imports = [ + ./http + ./dns.nix + ./shark.nix + ]; + + home.packages = with pkgs; [ + lftp + pwru + bmon + netcat-openbsd + nethogs + inetutils + speedtest-cli + traceroute + iptraf-ng + tcpdump + (pkgs.callPackage ../../../../../pkgs/bindtointerface.nix { }) + trayscale + nmap + bandwhich + ]; +} 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/networking/tools/http/default.nix b/home/ebisu/fortune/networking/tools/http/default.nix new file mode 100644 index 0000000..b47540f --- /dev/null +++ b/home/ebisu/fortune/networking/tools/http/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + imports = [ + ./httpie.nix + ./wget.nix + ]; + + home.packages = [ (pkgs.callPackage ../../../../../../pkgs/yaak.nix { }) ]; +} diff --git a/home/ebisu/fortune/networking/tools/http/httpie.nix b/home/ebisu/fortune/networking/tools/http/httpie.nix new file mode 100644 index 0000000..f27ef26 --- /dev/null +++ b/home/ebisu/fortune/networking/tools/http/httpie.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + httpie + httpie-desktop + ]; +} diff --git a/home/ebisu/fortune/networking/tools/http/wget.nix b/home/ebisu/fortune/networking/tools/http/wget.nix new file mode 100644 index 0000000..c5d2936 --- /dev/null +++ b/home/ebisu/fortune/networking/tools/http/wget.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.wget ]; + + xdg.configFile."wget/wgetrc".text = '' + hsts-file=~/.cache/wget-hsts + ''; +} diff --git a/home/ebisu/fortune/networking/tools/shark.nix b/home/ebisu/fortune/networking/tools/shark.nix new file mode 100644 index 0000000..d4b8c51 --- /dev/null +++ b/home/ebisu/fortune/networking/tools/shark.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + termshark + wireshark + ]; +} 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 Binary files /dev/null and b/home/ebisu/logo.png differ -- cgit v1.2.3