From e11a0658b3c47459767ba49ccfe319a2b8c73456 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Fri, 7 Feb 2025 22:49:30 -0800 Subject: migration: fastfetch --- assets/SOURCES.md | 4 - assets/fastfetch/mem.png | Bin 185313 -> 0 bytes assets/fastfetch/nonon.png | Bin 108707 -> 0 bytes assets/fastfetch/ryo.png | Bin 128547 -> 0 bytes roles/home/desktop/default.nix | 4 - roles/home/desktop/fastfetch.nix | 72 ------------------ snowfall/homes/x86_64-linux/c/default.nix | 1 + .../modules/home/apps/fastfetch/assets/mem.png | Bin 0 -> 185313 bytes .../modules/home/apps/fastfetch/assets/nonon.png | Bin 0 -> 108707 bytes .../modules/home/apps/fastfetch/assets/ryo.png | Bin 0 -> 128547 bytes snowfall/modules/home/apps/fastfetch/default.nix | 81 +++++++++++++++++++++ snowfall/modules/home/suites/misc/default.nix | 17 +++++ 12 files changed, 99 insertions(+), 80 deletions(-) delete mode 100644 assets/fastfetch/mem.png delete mode 100644 assets/fastfetch/nonon.png delete mode 100644 assets/fastfetch/ryo.png delete mode 100644 roles/home/desktop/fastfetch.nix create mode 100644 snowfall/modules/home/apps/fastfetch/assets/mem.png create mode 100644 snowfall/modules/home/apps/fastfetch/assets/nonon.png create mode 100644 snowfall/modules/home/apps/fastfetch/assets/ryo.png create mode 100644 snowfall/modules/home/apps/fastfetch/default.nix create mode 100644 snowfall/modules/home/suites/misc/default.nix 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/assets/fastfetch/mem.png b/assets/fastfetch/mem.png deleted file mode 100644 index 999c4dd..0000000 Binary files a/assets/fastfetch/mem.png and /dev/null differ diff --git a/assets/fastfetch/nonon.png b/assets/fastfetch/nonon.png deleted file mode 100644 index 57056ce..0000000 Binary files a/assets/fastfetch/nonon.png and /dev/null differ diff --git a/assets/fastfetch/ryo.png b/assets/fastfetch/ryo.png deleted file mode 100644 index 852df37..0000000 Binary files a/assets/fastfetch/ryo.png and /dev/null differ 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/snowfall/modules/home/apps/fastfetch/assets/mem.png b/snowfall/modules/home/apps/fastfetch/assets/mem.png new file mode 100644 index 0000000..999c4dd Binary files /dev/null and b/snowfall/modules/home/apps/fastfetch/assets/mem.png differ diff --git a/snowfall/modules/home/apps/fastfetch/assets/nonon.png b/snowfall/modules/home/apps/fastfetch/assets/nonon.png new file mode 100644 index 0000000..57056ce Binary files /dev/null and b/snowfall/modules/home/apps/fastfetch/assets/nonon.png differ diff --git a/snowfall/modules/home/apps/fastfetch/assets/ryo.png b/snowfall/modules/home/apps/fastfetch/assets/ryo.png new file mode 100644 index 0000000..852df37 Binary files /dev/null and b/snowfall/modules/home/apps/fastfetch/assets/ryo.png differ 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; + }; + }; + }; +} -- cgit v1.2.3