From 33cb02e80c2250f12dc5f2ac99a9f63695b66521 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Fri, 4 Oct 2024 10:23:53 -0700 Subject: home: move some modules to core --- home/ebisu/core/default.nix | 2 ++ home/ebisu/core/filesystem/archive.nix | 10 ++++++++++ home/ebisu/core/filesystem/core/bat.nix | 6 ++++++ home/ebisu/core/filesystem/core/default.nix | 13 +++++++++++++ home/ebisu/core/filesystem/core/eza.nix | 7 +++++++ home/ebisu/core/filesystem/default.nix | 22 ++++++++++++++++++++++ home/ebisu/core/scripting/charmbracelet.nix | 11 +++++++++++ home/ebisu/core/scripting/default.nix | 21 +++++++++++++++++++++ home/ebisu/core/scripting/ripgrep.nix | 5 +++++ home/ebisu/kansai/fortune/default.nix | 1 - home/ebisu/kansai/fortune/filesystem/archive.nix | 10 ---------- home/ebisu/kansai/fortune/filesystem/core/bat.nix | 6 ------ .../kansai/fortune/filesystem/core/default.nix | 13 ------------- home/ebisu/kansai/fortune/filesystem/core/eza.nix | 7 ------- home/ebisu/kansai/fortune/filesystem/default.nix | 22 ---------------------- home/ebisu/kansai/fortune/system/shell/default.nix | 1 - .../system/shell/scripting/charmbracelet.nix | 11 ----------- .../fortune/system/shell/scripting/default.nix | 21 --------------------- .../fortune/system/shell/scripting/ripgrep.nix | 5 ----- 19 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 home/ebisu/core/filesystem/archive.nix create mode 100644 home/ebisu/core/filesystem/core/bat.nix create mode 100644 home/ebisu/core/filesystem/core/default.nix create mode 100644 home/ebisu/core/filesystem/core/eza.nix create mode 100644 home/ebisu/core/filesystem/default.nix create mode 100644 home/ebisu/core/scripting/charmbracelet.nix create mode 100644 home/ebisu/core/scripting/default.nix create mode 100644 home/ebisu/core/scripting/ripgrep.nix delete mode 100644 home/ebisu/kansai/fortune/filesystem/archive.nix delete mode 100644 home/ebisu/kansai/fortune/filesystem/core/bat.nix delete mode 100644 home/ebisu/kansai/fortune/filesystem/core/default.nix delete mode 100644 home/ebisu/kansai/fortune/filesystem/core/eza.nix delete mode 100644 home/ebisu/kansai/fortune/filesystem/default.nix delete mode 100644 home/ebisu/kansai/fortune/system/shell/scripting/charmbracelet.nix delete mode 100644 home/ebisu/kansai/fortune/system/shell/scripting/default.nix delete mode 100644 home/ebisu/kansai/fortune/system/shell/scripting/ripgrep.nix diff --git a/home/ebisu/core/default.nix b/home/ebisu/core/default.nix index 597c4ca..2076eb6 100644 --- a/home/ebisu/core/default.nix +++ b/home/ebisu/core/default.nix @@ -8,8 +8,10 @@ imports = with inputs; [ ./editor ./education + ./filesystem ./nix ./rice + ./scripting ./system ./utility ./language.nix diff --git a/home/ebisu/core/filesystem/archive.nix b/home/ebisu/core/filesystem/archive.nix new file mode 100644 index 0000000..c87b222 --- /dev/null +++ b/home/ebisu/core/filesystem/archive.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + unrar + xar + pigz + unzip + zip + ]; +} diff --git a/home/ebisu/core/filesystem/core/bat.nix b/home/ebisu/core/filesystem/core/bat.nix new file mode 100644 index 0000000..ea3f3a0 --- /dev/null +++ b/home/ebisu/core/filesystem/core/bat.nix @@ -0,0 +1,6 @@ +{ + programs.bat = { + enable = true; + config.pager = "less -FR"; + }; +} diff --git a/home/ebisu/core/filesystem/core/default.nix b/home/ebisu/core/filesystem/core/default.nix new file mode 100644 index 0000000..9046ec3 --- /dev/null +++ b/home/ebisu/core/filesystem/core/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + imports = [ + ./bat.nix + ./eza.nix + ]; + + home.packages = with pkgs; [ + duf + fd + rm-improved + ]; +} diff --git a/home/ebisu/core/filesystem/core/eza.nix b/home/ebisu/core/filesystem/core/eza.nix new file mode 100644 index 0000000..a8d2f57 --- /dev/null +++ b/home/ebisu/core/filesystem/core/eza.nix @@ -0,0 +1,7 @@ +_: { + programs.eza = { + enable = true; + icons = true; + enableFishIntegration = true; + }; +} diff --git a/home/ebisu/core/filesystem/default.nix b/home/ebisu/core/filesystem/default.nix new file mode 100644 index 0000000..394cc04 --- /dev/null +++ b/home/ebisu/core/filesystem/default.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: +{ + imports = [ + ./core + ./archive.nix + ]; + + programs = { + nnn.enable = true; + # lf.enable = true; + }; + + home.packages = with pkgs; [ + nemo + dust + dysk + ncdu + file + yazi + broot + ]; +} diff --git a/home/ebisu/core/scripting/charmbracelet.nix b/home/ebisu/core/scripting/charmbracelet.nix new file mode 100644 index 0000000..367aa26 --- /dev/null +++ b/home/ebisu/core/scripting/charmbracelet.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + gum + mods + glow + pop + charm-freeze + wishlist + ]; +} diff --git a/home/ebisu/core/scripting/default.nix b/home/ebisu/core/scripting/default.nix new file mode 100644 index 0000000..3231f0c --- /dev/null +++ b/home/ebisu/core/scripting/default.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: +{ + imports = [ + ./charmbracelet.nix + ./ripgrep.nix + ]; + + programs.fzf.enable = true; + + home.packages = with pkgs; [ + mdcat + moreutils + pup + inxi + pv + yad + jq + yj + pkgs.tsutsumi.html2md + ]; +} diff --git a/home/ebisu/core/scripting/ripgrep.nix b/home/ebisu/core/scripting/ripgrep.nix new file mode 100644 index 0000000..5d221e3 --- /dev/null +++ b/home/ebisu/core/scripting/ripgrep.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: +{ + programs.ripgrep.enable = true; + home.packages = with pkgs; [ ripgrep-all ]; +} diff --git a/home/ebisu/kansai/fortune/default.nix b/home/ebisu/kansai/fortune/default.nix index f07c459..09d5269 100644 --- a/home/ebisu/kansai/fortune/default.nix +++ b/home/ebisu/kansai/fortune/default.nix @@ -4,7 +4,6 @@ ./communication ./desktop ./development - ./filesystem ./multimedia ./networking ./scripts diff --git a/home/ebisu/kansai/fortune/filesystem/archive.nix b/home/ebisu/kansai/fortune/filesystem/archive.nix deleted file mode 100644 index c87b222..0000000 --- a/home/ebisu/kansai/fortune/filesystem/archive.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - unrar - xar - pigz - unzip - zip - ]; -} diff --git a/home/ebisu/kansai/fortune/filesystem/core/bat.nix b/home/ebisu/kansai/fortune/filesystem/core/bat.nix deleted file mode 100644 index ea3f3a0..0000000 --- a/home/ebisu/kansai/fortune/filesystem/core/bat.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.bat = { - enable = true; - config.pager = "less -FR"; - }; -} diff --git a/home/ebisu/kansai/fortune/filesystem/core/default.nix b/home/ebisu/kansai/fortune/filesystem/core/default.nix deleted file mode 100644 index 9046ec3..0000000 --- a/home/ebisu/kansai/fortune/filesystem/core/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./bat.nix - ./eza.nix - ]; - - home.packages = with pkgs; [ - duf - fd - rm-improved - ]; -} diff --git a/home/ebisu/kansai/fortune/filesystem/core/eza.nix b/home/ebisu/kansai/fortune/filesystem/core/eza.nix deleted file mode 100644 index a8d2f57..0000000 --- a/home/ebisu/kansai/fortune/filesystem/core/eza.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - programs.eza = { - enable = true; - icons = true; - enableFishIntegration = true; - }; -} diff --git a/home/ebisu/kansai/fortune/filesystem/default.nix b/home/ebisu/kansai/fortune/filesystem/default.nix deleted file mode 100644 index 394cc04..0000000 --- a/home/ebisu/kansai/fortune/filesystem/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./core - ./archive.nix - ]; - - programs = { - nnn.enable = true; - # lf.enable = true; - }; - - home.packages = with pkgs; [ - nemo - dust - dysk - ncdu - file - yazi - broot - ]; -} diff --git a/home/ebisu/kansai/fortune/system/shell/default.nix b/home/ebisu/kansai/fortune/system/shell/default.nix index 05e84a7..82c4a71 100644 --- a/home/ebisu/kansai/fortune/system/shell/default.nix +++ b/home/ebisu/kansai/fortune/system/shell/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { imports = [ - ./scripting ./fish.nix ./starship.nix ]; diff --git a/home/ebisu/kansai/fortune/system/shell/scripting/charmbracelet.nix b/home/ebisu/kansai/fortune/system/shell/scripting/charmbracelet.nix deleted file mode 100644 index 367aa26..0000000 --- a/home/ebisu/kansai/fortune/system/shell/scripting/charmbracelet.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - gum - mods - glow - pop - charm-freeze - wishlist - ]; -} diff --git a/home/ebisu/kansai/fortune/system/shell/scripting/default.nix b/home/ebisu/kansai/fortune/system/shell/scripting/default.nix deleted file mode 100644 index 3231f0c..0000000 --- a/home/ebisu/kansai/fortune/system/shell/scripting/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./charmbracelet.nix - ./ripgrep.nix - ]; - - programs.fzf.enable = true; - - home.packages = with pkgs; [ - mdcat - moreutils - pup - inxi - pv - yad - jq - yj - pkgs.tsutsumi.html2md - ]; -} diff --git a/home/ebisu/kansai/fortune/system/shell/scripting/ripgrep.nix b/home/ebisu/kansai/fortune/system/shell/scripting/ripgrep.nix deleted file mode 100644 index 5d221e3..0000000 --- a/home/ebisu/kansai/fortune/system/shell/scripting/ripgrep.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: -{ - programs.ripgrep.enable = true; - home.packages = with pkgs; [ ripgrep-all ]; -} -- cgit v1.2.3