diff options
| author | Caroline Larimore <caroline@larimo.re> | 2025-02-07 22:49:30 -0800 |
|---|---|---|
| committer | Caroline Larimore <caroline@larimo.re> | 2025-04-14 18:58:49 -0700 |
| commit | e11a0658b3c47459767ba49ccfe319a2b8c73456 (patch) | |
| tree | f7f3919b71715adee6477dd7bfcaa93b3cc8bf0c | |
| parent | bb80a276f5bc23c884fe8af922d371b216bc5b4b (diff) | |
migration: fastfetch
| -rw-r--r-- | assets/SOURCES.md | 4 | ||||
| -rw-r--r-- | roles/home/desktop/default.nix | 4 | ||||
| -rw-r--r-- | roles/home/desktop/fastfetch.nix | 72 | ||||
| -rw-r--r-- | snowfall/homes/x86_64-linux/c/default.nix | 1 | ||||
| -rw-r--r-- | snowfall/modules/home/apps/fastfetch/assets/mem.png (renamed from assets/fastfetch/mem.png) | bin | 185313 -> 185313 bytes | |||
| -rw-r--r-- | snowfall/modules/home/apps/fastfetch/assets/nonon.png (renamed from assets/fastfetch/nonon.png) | bin | 108707 -> 108707 bytes | |||
| -rw-r--r-- | snowfall/modules/home/apps/fastfetch/assets/ryo.png (renamed from assets/fastfetch/ryo.png) | bin | 128547 -> 128547 bytes | |||
| -rw-r--r-- | snowfall/modules/home/apps/fastfetch/default.nix | 81 | ||||
| -rw-r--r-- | snowfall/modules/home/suites/misc/default.nix | 17 |
9 files changed, 99 insertions, 80 deletions
diff --git a/assets/SOURCES.md b/assets/SOURCES.md index f0bea64..a061183 100644 --- a/assets/SOURCES.md +++ b/assets/SOURCES.md @@ -1,8 +1,4 @@ # Asset Sources -## Fastfetch -- `nonon.png`: Kill la Kill (Unknown) -- `ryo.png`: Bocchi the Rock! (Unknown, Edited) - ## Misc - `album_art_placeholder.png`: Me and my legendary artistic talent diff --git a/roles/home/desktop/default.nix b/roles/home/desktop/default.nix index 43f0467..8e411ba 100644 --- a/roles/home/desktop/default.nix +++ b/roles/home/desktop/default.nix @@ -59,10 +59,6 @@ let cfg = config.home.roles.desktop; in { config = mkIf cfg.enable { gtk.enable = true; - programs = { - fastfetch.enable = cfg.fetch; - }; - home = { packages = with pkgs; [ (writeShellScriptBin "switch-theme" '' diff --git a/roles/home/desktop/fastfetch.nix b/roles/home/desktop/fastfetch.nix deleted file mode 100644 index dd8b082..0000000 --- a/roles/home/desktop/fastfetch.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, pkgs, ... }: - -{ - programs.fastfetch = { - package = (pkgs.fastfetch.overrideAttrs (finalAttrs: previousAttrs: { - cmakeFlags = [(lib.cmakeBool "ENABLE_IMAGEMAGICK6" true)]; - })); - - settings = { - logo = { - type = "kitty-direct"; - source = "$(ls ${../../../assets/fastfetch}/*.png | shuf -n 1)"; - - width = 36; - height = 32; - - padding = { - left = 4; - right = 4; - }; - }; - - display = { - separator = ""; - }; - - modules = [ - { type = "custom"; format = " ハードウェア "; } - { type = "custom"; format = "┌──────────────────────────────────────────────────┐"; } - - { type = "cpu"; key = " CPU "; } - { type = "gpu"; key = " GPU "; format = "{2} [{6}]"; } - { type = "memory"; key = " MEM "; } - "break" - { - type = "disk"; - folders = "/nix:/persist"; - key = " "; - } - - { type = "custom"; format = "└──────────────────────────────────────────────────┘"; } - "break" - - { type = "custom"; format = " ソフトウェア "; } - { type = "custom"; format = "┌──────────────────────────────────────────────────┐"; } - - { type = "title"; key = " "; format = "{1}@{2}"; } - "break" - { type = "os"; key = " "; } - { type = "kernel"; key = " "; format = "{1} {2}"; } - { type = "packages"; key = " "; } - "break" - { type = "terminal"; key = " "; } - { type = "shell"; key = " "; } -# { type = "font"; key = " "; } - { type = "font"; key = " "; format = "Caskaydia Mono (8pt)"; } - "break" - { type = "wm"; key = " "; } -# { type = "theme"; key = " "; } - { type = "theme"; key = " "; format = "gruvbox"; } - "break" - { type = "media"; key = " "; } - { type = "datetime"; key = " "; } - - { type = "custom"; format = "└──────────────────────────────────────────────────┘"; } - "break" - - "colors" - ]; - }; - }; -} diff --git a/snowfall/homes/x86_64-linux/c/default.nix b/snowfall/homes/x86_64-linux/c/default.nix index 821f83a..10a961b 100644 --- a/snowfall/homes/x86_64-linux/c/default.nix +++ b/snowfall/homes/x86_64-linux/c/default.nix @@ -9,6 +9,7 @@ with lib; with lib.${namespace}; { desktop.enable = true; dev.enable = true; media.enable = true; + misc.enable = true; }; apps.discord.enable = true; diff --git a/assets/fastfetch/mem.png b/snowfall/modules/home/apps/fastfetch/assets/mem.png Binary files differindex 999c4dd..999c4dd 100644 --- a/assets/fastfetch/mem.png +++ b/snowfall/modules/home/apps/fastfetch/assets/mem.png diff --git a/assets/fastfetch/nonon.png b/snowfall/modules/home/apps/fastfetch/assets/nonon.png Binary files differindex 57056ce..57056ce 100644 --- a/assets/fastfetch/nonon.png +++ b/snowfall/modules/home/apps/fastfetch/assets/nonon.png diff --git a/assets/fastfetch/ryo.png b/snowfall/modules/home/apps/fastfetch/assets/ryo.png Binary files differindex 852df37..852df37 100644 --- a/assets/fastfetch/ryo.png +++ b/snowfall/modules/home/apps/fastfetch/assets/ryo.png diff --git a/snowfall/modules/home/apps/fastfetch/default.nix b/snowfall/modules/home/apps/fastfetch/default.nix new file mode 100644 index 0000000..aa901e6 --- /dev/null +++ b/snowfall/modules/home/apps/fastfetch/default.nix @@ -0,0 +1,81 @@ +{ options, config, lib, pkgs, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.apps.fastfetch; +in { + options.${namespace}.apps.fastfetch = with types; { + enable = mkEnableOption "fastfetch"; + }; + + config = mkIf cfg.enable { + programs.fastfetch = { + enable = true; + package = (pkgs.fastfetch.overrideAttrs (finalAttrs: previousAttrs: { + cmakeFlags = [(cmakeBool "ENABLE_IMAGEMAGICK6" true)]; + })); + + settings = { + logo = { + type = "kitty-direct"; + source = "$(ls ${./assets}/*.png | shuf -n 1)"; + + width = 36; + height = 32; + + padding = { + left = 4; + right = 4; + }; + }; + + display = { + separator = ""; + }; + + modules = [ + { type = "custom"; format = " ハードウェア "; } + { type = "custom"; format = "┌──────────────────────────────────────────────────┐"; } + + { type = "cpu"; key = " CPU "; } + { type = "gpu"; key = " GPU "; format = "{2} [{6}]"; } + { type = "memory"; key = " MEM "; } + "break" + { + type = "disk"; + folders = "/nix:/persist"; + key = " "; + } + + { type = "custom"; format = "└──────────────────────────────────────────────────┘"; } + "break" + + { type = "custom"; format = " ソフトウェア "; } + { type = "custom"; format = "┌──────────────────────────────────────────────────┐"; } + + { type = "title"; key = " "; format = "{1}@{2}"; } + "break" + { type = "os"; key = " "; } + { type = "kernel"; key = " "; format = "{1} {2}"; } + { type = "packages"; key = " "; } + "break" + { type = "terminal"; key = " "; } + { type = "shell"; key = " "; } + # { type = "font"; key = " "; } + { type = "font"; key = " "; format = "Caskaydia Mono (8pt)"; } + "break" + { type = "wm"; key = " "; } + # { type = "theme"; key = " "; } + { type = "theme"; key = " "; format = "gruvbox"; } + "break" + { type = "media"; key = " "; } + { type = "datetime"; key = " "; } + + { type = "custom"; format = "└──────────────────────────────────────────────────┘"; } + "break" + + "colors" + ]; + }; + }; + }; +} diff --git a/snowfall/modules/home/suites/misc/default.nix b/snowfall/modules/home/suites/misc/default.nix new file mode 100644 index 0000000..99d4e10 --- /dev/null +++ b/snowfall/modules/home/suites/misc/default.nix @@ -0,0 +1,17 @@ +{ options, config, lib, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.suites.misc; +in { + options.${namespace}.suites.misc = with types; { + enable = mkEnableOption "misc"; + }; + + config = mkIf cfg.enable { + cxl = { + apps = { + fastfetch.enable = true; + }; + }; + }; +} |