switch to i3blocks

11 files changed, 1045 insertions, 62 deletions

diff --git a/modules/user/desktop/components/fuzzel.nix b/modules/user/desktop/components/fuzzel.nix
index 67bf047..e4b6ef8 100644
--- a/modules/user/desktop/components/fuzzel.nix
+++ b/modules/user/desktop/components/fuzzel.nix
@@ -6,22 +6,18 @@
       width = 2;
     };
 
-    colors =
-      let
-        accent = if config.desktop.accent == "blue" then "89b4faff" else "f5c2e7ff";
-      in
-      {
-        background = "1e1e2eff";
-        border = accent;
-        input = "cdd6f4ff";
-        match = accent;
-        placeholder = "7f849cff";
-        prompt = "bac2deff";
-        selection = "585b70ff";
-        selection-match = accent;
-        selection-text = "cdd6f4ff";
-        text = "cdd6f4ff";
-      };
+    colors = {
+      background = "1e1e2eff";
+      border = "89b4faff";
+      input = "cdd6f4ff";
+      match = "89b4faff";
+      placeholder = "7f849cff";
+      prompt = "bac2deff";
+      selection = "585b70ff";
+      selection-match = "89b4faff";
+      selection-text = "cdd6f4ff";
+      text = "cdd6f4ff";
+    };
 
     main = {
       dpi-aware = true;
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index 8571621..7cd19ce 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -11,23 +11,10 @@
     ./window-managers
   ];
 
-  options.desktop = {
-    accent = lib.mkOption {
-      description = "The accent colour to use from catppuccin";
-      default = "blue";
-      type =
-        with lib.types;
-        enum [
-          "blue"
-          "pink"
-        ];
-    };
-
-    windowManager = lib.mkOption {
-      description = "Which window manager to use";
-      default = null;
-      type = with lib.types; nullOr (enum [ ]);
-    };
+  options.desktop.windowManager = lib.mkOption {
+    description = "Which window manager to use";
+    default = null;
+    type = with lib.types; nullOr (enum [ ]);
   };
 
   config = {
@@ -44,23 +31,18 @@
       theme = {
         package = (
           pkgs.catppuccin-gtk.override {
-            accents = [
-              "blue"
-              "pink"
-            ];
-
             variant = "mocha";
           }
         );
 
-        name = "catppuccin-mocha-${config.desktop.accent}-standard";
+        name = "catppuccin-mocha-blue-standard";
       };
     };
 
     home = {
-      file."Pictures/wallpaper.jpg" = {
+      file."Pictures/wallpaper.png" = {
         enable = (config.desktop.windowManager != null);
-        source = ./wallpaper-${config.desktop.accent}.jpg;
+        source = ./wallpaper.png;
       };
 
       packages = with pkgs; [
diff --git a/modules/user/desktop/wallpaper-blue.jpg b/modules/user/desktop/wallpaper-blue.jpg
deleted file mode 100644
index e75494a..0000000
--- a/modules/user/desktop/wallpaper-blue.jpg
+++ /dev/null
diff --git a/modules/user/desktop/wallpaper-pink.jpg b/modules/user/desktop/wallpaper-pink.jpg
deleted file mode 100644
index 420ab56..0000000
--- a/modules/user/desktop/wallpaper-pink.jpg
+++ /dev/null
diff --git a/modules/user/desktop/wallpaper.png b/modules/user/desktop/wallpaper.png
new file mode 100644
index 0000000..9b5f637
--- /dev/null
+++ b/modules/user/desktop/wallpaper.png
diff --git a/modules/user/desktop/window-managers/sway.nix b/modules/user/desktop/window-managers/sway.nix
index 14ae618..c52b1cf 100644
--- a/modules/user/desktop/window-managers/sway.nix
+++ b/modules/user/desktop/window-managers/sway.nix
@@ -8,7 +8,6 @@
 {
   options.desktop.windowManager = lib.mkOption { type = with lib.types; nullOr (enum [ "sway" ]); };
   config = {
-    desktop.components.waybar.enable = lib.mkDefault (config.desktop.windowManager == "sway");
     home.packages = with pkgs; [
       grim
       slurp
@@ -16,6 +15,16 @@
 
     programs = {
       fuzzel.enable = lib.mkDefault (config.desktop.windowManager == "sway");
+      i3blocks = {
+        enable = lib.mkDefault (config.desktop.windowManager == "sway");
+        bars.bottom = {
+          time = {
+            command = "date +'%F %R'";
+            interval = 60;
+          };
+        };
+      };
+
       swaylock = {
         enable = lib.mkDefault (config.desktop.windowManager == "sway");
         settings = {
@@ -31,7 +40,49 @@
           enable = lib.mkForce true;
           package = null; # use the nixos module
           config = {
-            bars = [ ];
+            bars = [
+              {
+                colors = {
+                  activeWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#cdd6f4";
+                  };
+
+                  background = "#11111b";
+                  focusedBackground = "#11111b";
+                  focusedSeparator = "#313244";
+                  focusedStatusline = "#cdd6f4";
+                  focusedWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#89b4fa";
+                  };
+
+                  inactiveWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#313244";
+                  };
+
+                  separator = "#313244";
+                  statusline = "#cdd6f4";
+                  urgentWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#f38ba8";
+                  };
+                };
+
+                fonts = {
+                  names = [ "Fira Code" ];
+                  size = 8.0;
+                };
+
+                statusCommand = "${pkgs.i3blocks}/bin/i3blocks -c ~/.config/i3blocks/bottom";
+              }
+            ];
+
             bindswitches = {
               "lid:off" = {
                 action = "output eDP-1 power on";
@@ -46,12 +97,8 @@
 
             colors = # catppuccin mocha
               let
-                accent = if (config.desktop.accent == "pink") then pink else blue;
                 base = "#1e1e2e";
                 blue = "#89b4fa";
-                flamingo = "#f2cdcd";
-                indicator = if (config.desktop.accent == "pink") then flamingo else teal;
-                pink = "#f5c2e7";
                 red = "#f38ba8";
                 surface1 = "#45475a";
                 teal = "#94e2d5";
@@ -59,10 +106,10 @@
               in
               {
                 focused = {
-                  background = "${accent}";
-                  border = "${accent}";
-                  childBorder = "${accent}";
-                  indicator = "${indicator}";
+                  background = "${blue}";
+                  border = "${blue}";
+                  childBorder = "${blue}";
+                  indicator = "${teal}";
                   text = "${base}";
                 };
 
@@ -174,20 +221,20 @@
             modifier = "Mod4";
             output = {
               "eDP-1" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "2256x1504@60Hz";
                 position = "0 0";
                 scale = "1.5";
               };
 
               "DP-1" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "1920x1080@165Hz";
                 position = "0 0";
               };
 
               "DP-2" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "1920x1080@75Hz";
                 position = "1920 0";
               };
diff --git a/user/home/default.nix b/user/home/default.nix
index 35e38dc..7526d83 100644
--- a/user/home/default.nix
+++ b/user/home/default.nix
@@ -5,7 +5,7 @@
     users.rosa = {
       imports = [
         ./git.nix
-        ./hyfetch.nix
+        ./hyfetch
         ./iamb.nix
         ./kakoune
         ./ssh.nix
diff --git a/user/home/hyfetch/config.conf b/user/home/hyfetch/config.conf
new file mode 100644
index 0000000..a670fb1
--- /dev/null
+++ b/user/home/hyfetch/config.conf
@@ -0,0 +1,959 @@
+# See this wiki page for more info:
+# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
+print_info() {
+    info title
+    #info underline
+
+    info "CPU" cpu
+    info "GPU" gpu
+    info "Memory" memory
+    info "Shell" shell
+    info "Kernel" kernel
+    info "Uptime" uptime
+    #info "OS" distro
+    #info "Host" model
+    #info "Packages" packages
+    #info "Editor" editor
+    #info "Resolution" resolution
+    #info "DE" de
+    #info "WM" wm
+    #info "WM Theme" wm_theme
+    #info "Theme" theme
+    #info "Icons" icons
+    #info "Cursor" cursor
+    #info "Terminal" term
+    #info "Terminal Font" term_font
+    #info "Network" network
+    #info "Bluetooth" bluetooth
+    #info "BIOS" bios
+
+    # info "GPU Driver" gpu_driver  # Linux/macOS only
+    # info "Disk" disk
+    # info "Battery" battery
+    # info "Power Adapter" power_adapter # macOS only
+    # info "Font" font
+    # info "Song" song
+    # [[ "$player" ]] && prin "Music Player" "$player"
+    # info "Local IP" local_ip
+    # info "Public IP" public_ip
+    # info "Users" users
+    # info "Locale" locale  # This only works on glibc systems.
+
+    # info "Java" java_ver
+    # info "Python" python_ver
+    # info "Node" node_ver
+
+    info cols
+}
+
+# Title
+
+
+# Hide/Show Fully qualified domain name.
+#
+# Default:  'off'
+# Values:   'on', 'off'
+# Flag:     --title_fqdn
+title_fqdn="off"
+
+
+# Kernel
+
+
+# Shorten the output of the kernel function.
+#
+# Default:  'on'
+# Values:   'on', 'off'
+# Flag:     --kernel_shorthand
+# Supports: Everything except *BSDs (except PacBSD and PC-BSD)
+#
+# Example:
+# on:  '4.8.9-1-ARCH'
+# off: 'Linux 4.8.9-1-ARCH'
+kernel_shorthand="off"
+
+
+# Distro
+
+
+# Shorten the output of the distro function
+#
+# Default:  'off'
+# Values:   'on', 'tiny', 'off'
+# Flag:     --distro_shorthand
+# Supports: Everything except Windows and Haiku
+distro_shorthand="off"
+
+# Show/Hide OS Architecture.
+# Show 'x86_64', 'x86' and etc in 'Distro:' output.
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --os_arch
+#
+# Example:
+# on:  'Arch Linux x86_64'
+# off: 'Arch Linux'
+os_arch="on"
+
+
+# Uptime
+
+
+# Shorten the output of the uptime function
+#
+# Default: 'on'
+# Values:  'on', 'tiny', 'off'
+# Flag:    --uptime_shorthand
+#
+# Example:
+# on:   '2 days, 10 hours, 3 mins'
+# tiny: '2d 10h 3m'
+# off:  '2 days, 10 hours, 3 minutes'
+uptime_shorthand="on"
+
+
+# Memory
+
+
+# Show memory percentage in output.
+#
+# Default: 'off'
+# Values:  'on', 'off'
+# Flag:    --memory_percent
+#
+# Example:
+# on:   '1801MiB / 7881MiB (22%)'
+# off:  '1801MiB / 7881MiB'
+memory_percent="on"
+
+# Change memory output unit.
+#
+# Default: 'mib'
+# Values:  'kib', 'mib', 'gib', 'tib'
+# Flag:    --memory_unit
+#
+# Example:
+# kib  '1020928KiB / 7117824KiB'
+# mib  '1042MiB / 6951MiB'
+# gib: ' 0.98GiB / 6.79GiB'
+memory_unit="gib"
+
+# Change memory output precision.
+#
+# Default: '2'
+# Values: integer ≥ 0
+# Flag:    --memory_precision
+mem_precision=2
+
+# Packages
+
+
+# Show/Hide Package Manager names.
+#
+# Default: 'tiny'
+# Values:  'on', 'tiny' 'off'
+# Flag:    --package_managers
+#
+# Example:
+# on:   '998 (pacman), 8 (flatpak), 4 (snap)'
+# tiny: '908 (pacman, flatpak, snap)'
+# off:  '908'
+package_managers="on"
+
+
+# Show separate user and system packages for supported package managers
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --package_separate
+#
+# Example:
+# on:  '8 packages (flatpak-system), 9 packages (flatpak-user)'
+# off: '17 packages (flatpak)'
+package_separate="on"
+
+# Reduce output of packages list by not showing programming language package managers or Steam games
+#
+# Flag:    --package_minimal
+#
+# Example:
+# default:  'Packages: 1 (npm), 991 (emerge), 3 (steam), 23 (flatpak-system)'
+# minimal: 'Packages: 991 (emerge), 23 (flatpak-system)'
+package_minimal=""
+
+
+# Shell
+
+
+# Show the path to $SHELL
+#
+# Default: 'off'
+# Values:  'on', 'off'
+# Flag:    --shell_path
+#
+# Example:
+# on:  '/bin/bash'
+# off: 'bash'
+shell_path="off"
+
+# Show $SHELL version
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --shell_version
+#
+# Example:
+# on:  'bash 4.4.5'
+# off: 'bash'
+shell_version="on"
+
+
+# Editor
+
+
+# Show path to $EDITOR
+#
+# Default: 'off'
+# Values:  'on', 'off'
+# Flag:    --editor_path
+#
+# Example:
+# on:  '/opt/bin/vim'
+# off: 'vim'
+editor_path="off"
+
+# Show $EDITOR version
+#
+# Default:  'on'
+# Values:   'on', 'off'
+# Flag:     '--editor_version'
+#
+# Example:
+# on:  'vim 9.0'
+# off: 'vim'
+editor_version="on"
+
+
+# CPU
+
+
+# CPU speed type
+#
+# Default: 'bios_limit'
+# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'.
+# Flag:    --speed_type
+# Supports: Linux with 'cpufreq'
+# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value.
+speed_type="bios_limit"
+
+# CPU speed shorthand
+#
+# Default: 'off'
+# Values: 'on', 'off'.
+# Flag:    --speed_shorthand
+# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz
+#
+# Example:
+# on:    'i7-6500U (4) @ 3.1GHz'
+# off:   'i7-6500U (4) @ 3.100GHz'
+speed_shorthand="on"
+
+# Enable/Disable CPU brand in output.
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --cpu_brand
+#
+# Example:
+# on:   'Intel i7-6500U'
+# off:  'i7-6500U (4)'
+cpu_brand="on"
+
+# CPU Speed
+# Hide/Show CPU speed.
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --cpu_speed
+#
+# Example:
+# on:  'Intel i7-6500U (4) @ 3.1GHz'
+# off: 'Intel i7-6500U (4)'
+cpu_speed="on"
+
+# CPU Cores
+# Display CPU cores in output
+#
+# Default: 'logical'
+# Values:  'logical', 'physical', 'off'
+# Flag:    --cpu_cores
+# Support: 'physical' doesn't work on BSD.
+#
+# Example:
+# logical:  'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores)
+# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores)
+# off:      'Intel i7-6500U @ 3.1GHz'
+cpu_cores="logical"
+
+# CPU Temperature
+# Hide/Show CPU temperature.
+# Note the temperature is added to the regular CPU function.
+#
+# Default: 'off'
+# Values:  'C', 'F', 'off'
+# Flag:    --cpu_temp
+# Supports: Linux, BSD
+# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable
+#       coretemp kernel module. This only supports newer Intel processors.
+#
+# Example:
+# C:   'Intel i7-6500U (4) @ 3.1GHz [27.2°C]'
+# F:   'Intel i7-6500U (4) @ 3.1GHz [82.0°F]'
+# off: 'Intel i7-6500U (4) @ 3.1GHz'
+cpu_temp="off"
+
+
+# GPU
+
+
+# Enable/Disable GPU Brand
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --gpu_brand
+#
+# Example:
+# on:  'AMD HD 7950'
+# off: 'HD 7950'
+gpu_brand="on"
+
+# Which GPU to display
+#
+# Default: 'all'
+# Values:  'all', 'dedicated', 'integrated'
+# Flag:    --gpu_type
+# Supports: Linux
+#
+# Example:
+# all:
+#   GPU1: AMD HD 7950
+#   GPU2: Intel Integrated Graphics
+#
+# dedicated:
+#   GPU1: AMD HD 7950
+#
+# integrated:
+#   GPU1: Intel Integrated Graphics
+gpu_type="all"
+
+
+# Resolution
+
+
+# Display refresh rate next to each monitor
+# Default: 'off'
+# Values:  'on', 'off'
+# Flag:    --refresh_rate
+# Supports: Doesn't work on Windows.
+#
+# Example:
+# on:  '1920x1080 @ 60Hz'
+# off: '1920x1080'
+refresh_rate="on"
+
+
+# Gtk Theme / Icons / Font
+
+
+# Shorten output of GTK Theme / Icons / Font
+#
+# Default: 'off'
+# Values:  'on', 'off'
+# Flag:    --gtk_shorthand
+#
+# Example:
+# on:  'Numix, Adwaita'
+# off: 'Numix [GTK2], Adwaita [GTK3]'
+gtk_shorthand="off"
+
+
+# Enable/Disable gtk2 Theme / Icons / Font
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --gtk2
+#
+# Example:
+# on:  'Numix [GTK2], Adwaita [GTK3]'
+# off: 'Adwaita [GTK3]'
+gtk2="on"
+
+# Enable/Disable gtk3 Theme / Icons / Font
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --gtk3
+#
+# Example:
+# on:  'Numix [GTK2], Adwaita [GTK3]'
+# off: 'Numix [GTK2]'
+gtk3="on"
+
+# Enable/Disable Qt Theme / Icons / Font
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --qt
+#
+# Example:
+# on:  'Breeze [Qt], Arc [GTK3]'
+# off: 'Arc [GTK3]'
+qt="on"
+
+# IP Address
+
+
+# Website to ping for the public IP
+#
+# Default: 'http://ident.me'
+# Values:  'url'
+# Flag:    --ip_host
+public_ip_host="http://ident.me"
+
+# Public IP timeout.
+#
+# Default: '2'
+# Values:  'int'
+# Flag:    --ip_timeout
+public_ip_timeout=2
+
+# Local IP interface
+#
+# Default: 'auto' (interface of default route)
+# Values:  'auto', 'en0', 'en1'
+# Flag:    --ip_interface
+local_ip_interface=('auto')
+
+
+# Desktop Environment
+
+
+# Show Desktop Environment version
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --de_version
+de_version="on"
+
+
+# Disk
+
+
+# Which disks to display.
+# The values can be any /dev/sdXX, mount point or directory.
+# NOTE: By default we only show the disk info for '/'.
+#
+# Default: '/'
+# Values:  '/', '/dev/sdXX', '/path/to/drive'.
+# Flag:    --disk_show
+#
+# Example:
+# disk_show=('/' '/dev/sdb1'):
+#      'Disk (/): 74G / 118G (66%)'
+#      'Disk (/mnt/Videos): 823G / 893G (93%)'
+#
+# disk_show=('/'):
+#      'Disk (/): 74G / 118G (66%)'
+#
+disk_show=('/')
+
+# Disk subtitle.
+# What to append to the Disk subtitle.
+#
+# Default: 'mount'
+# Values:  'mount', 'name', 'dir', 'none'
+# Flag:    --disk_subtitle
+#
+# Example:
+# name:   'Disk (/dev/sda1): 74G / 118G (66%)'
+#         'Disk (/dev/sdb2): 74G / 118G (66%)'
+#
+# mount:  'Disk (/): 74G / 118G (66%)'
+#         'Disk (/mnt/Local Disk): 74G / 118G (66%)'
+#         'Disk (/mnt/Videos): 74G / 118G (66%)'
+#
+# dir:    'Disk (/): 74G / 118G (66%)'
+#         'Disk (Local Disk): 74G / 118G (66%)'
+#         'Disk (Videos): 74G / 118G (66%)'
+#
+# none:   'Disk: 74G / 118G (66%)'
+#         'Disk: 74G / 118G (66%)'
+#         'Disk: 74G / 118G (66%)'
+disk_subtitle="mount"
+
+# Disk percent.
+# Show/Hide disk percent.
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --disk_percent
+#
+# Example:
+# on:  'Disk (/): 74G / 118G (66%)'
+# off: 'Disk (/): 74G / 118G'
+disk_percent="on"
+
+
+# Song
+
+
+# Manually specify a music player.
+#
+# Default: 'auto'
+# Values:  'auto', 'player-name'
+# Flag:    --music_player
+#
+# Available values for 'player-name':
+#
+# amarok
+# audacious
+# banshee
+# bluemindo
+# cider
+# clementine
+# cmus
+# deadbeef
+# deepin-music
+# dragon
+# elisa
+# exaile
+# gnome-music
+# gmusicbrowser
+# gogglesmm
+# guayadeque
+# io.elementary.music
+# iTunes
+# Music
+# juk
+# lollypop
+# MellowPlayer
+# mocp
+# mopidy
+# mpd
+# muine
+# netease-cloud-music
+# olivia
+# playerctl
+# pogo
+# pragha
+# qmmp
+# quodlibet
+# rhythmbox
+# sayonara
+# smplayer
+# spotify
+# strawberry
+# tauonmb
+# tomahawk
+# vlc
+# xmms2d
+# xnoise
+# yarock
+music_player="auto"
+
+# Format to display song information.
+#
+# Default: '%artist% - %album% - %title%'
+# Values:  '%artist%', '%album%', '%title%'
+# Flag:    --song_format
+#
+# Example:
+# default: 'Song: Jet - Get Born - Sgt Major'
+song_format="%artist% - %album% - %title%"
+
+# Print the Artist, Album and Title on separate lines
+#
+# Default: 'off'
+# Values:  'on', 'off'
+# Flag:    --song_shorthand
+#
+# Example:
+# on:  'Artist: The Fratellis'
+#      'Album: Costello Music'
+#      'Song: Chelsea Dagger'
+#
+# off: 'Song: The Fratellis - Costello Music - Chelsea Dagger'
+song_shorthand="off"
+
+# 'mpc' arguments (specify a host, password etc).
+#
+# Default:  ''
+# Example: mpc_args=(-h HOST -P PASSWORD)
+mpc_args=()
+
+
+# Text Colors
+
+
+# Text Colors
+#
+# Default:  'distro'
+# Values:   'distro', 'num' 'num' 'num' 'num' 'num' 'num'
+# Flag:     --colors
+#
+# Each number represents a different part of the text in
+# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info'
+#
+# Example:
+# colors=(distro)      - Text is colored based on Distro colors.
+# colors=(4 6 1 8 8 6) - Text is colored in the order above.
+colors=(distro)
+
+
+# Text Options
+
+
+# Toggle bold text
+#
+# Default:  'on'
+# Values:   'on', 'off'
+# Flag:     --bold
+bold="on"
+
+# Enable/Disable Underline
+#
+# Default:  'on'
+# Values:   'on', 'off'
+# Flag:     --underline
+underline_enabled="on"
+
+# Underline character
+#
+# Default:  '-'
+# Values:   'string'
+# Flag:     --underline_char
+underline_char="-"
+
+
+# Info Separator
+# Replace the default separator with the specified string.
+#
+# Default:  ':'
+# Flag:     --separator
+#
+# Example:
+# separator="->":   'Shell-> bash'
+# separator=" =":   'WM = dwm'
+separator=":"
+
+
+# Color Blocks
+
+
+# Color block range
+# The range of colors to print.
+#
+# Default:  '0', '15'
+# Values:   'num'
+# Flag:     --block_range
+#
+# Example:
+#
+# Display colors 0-7 in the blocks.  (8 colors)
+# neofetch --block_range 0 7
+#
+# Display colors 0-15 in the blocks. (16 colors)
+# neofetch --block_range 0 15
+block_range=(0 7)
+
+# Toggle color blocks
+#
+# Default:  'on'
+# Values:   'on', 'off'
+# Flag:     --color_blocks
+color_blocks="on"
+
+# Color block width in spaces
+#
+# Default:  '3'
+# Values:   'num'
+# Flag:     --block_width
+block_width=2
+
+# Color block height in lines
+#
+# Default:  '1'
+# Values:   'num'
+# Flag:     --block_height
+block_height=1
+
+# Color Alignment
+#
+# Default: 'auto'
+# Values: 'auto', 'num'
+# Flag: --col_offset
+#
+# Number specifies how far from the left side of the terminal (in spaces) to
+# begin printing the columns, in case you want to e.g. center them under your
+# text.
+# Example:
+# col_offset="auto" - Default behavior of neofetch
+# col_offset=7      - Leave 7 spaces then print the colors
+col_offset="auto"
+
+# Progress Bars
+
+
+# Bar characters
+#
+# Default:  '-', '='
+# Values:   'string', 'string'
+# Flag:     --bar_char
+#
+# Example:
+# neofetch --bar_char 'elapsed' 'total'
+# neofetch --bar_char '-' '='
+bar_char_elapsed="-"
+bar_char_total="="
+
+# Toggle Bar border
+#
+# Default:  'on'
+# Values:   'on', 'off'
+# Flag:     --bar_border
+bar_border="on"
+
+# Progress bar length in spaces
+# Number of chars long to make the progress bars.
+#
+# Default:  '15'
+# Values:   'num'
+# Flag:     --bar_length
+bar_length=15
+
+# Progress bar colors
+# When set to distro, uses your distro's logo colors.
+#
+# Default:  'distro', 'distro'
+# Values:   'distro', 'num'
+# Flag:     --bar_colors
+#
+# Example:
+# neofetch --bar_colors 3 4
+# neofetch --bar_colors distro 5
+bar_color_elapsed="distro"
+bar_color_total="distro"
+
+
+# Info display
+# Display a bar with the info.
+#
+# Default: 'off'
+# Values:  'bar', 'infobar', 'barinfo', 'off'
+# Flags:   --memory_display
+#          --battery_display
+#          --disk_display
+#
+# Example:
+# bar:     '[---=======]'
+# infobar: 'info [---=======]'
+# barinfo: '[---=======] info'
+# off:     'info'
+memory_display="off"
+battery_display="off"
+disk_display="off"
+
+
+# Backend Settings
+
+
+# Image backend.
+#
+# Default:  'ascii'
+# Values:   'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off',
+#           'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug',
+#           'viu'
+
+# Flag:     --backend
+image_backend="ascii"
+
+# Image Source
+#
+# Which image or ascii file to display.
+#
+# Default:  'auto'
+# Values:   'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
+#           'command output (neofetch --ascii "$(fortune | cowsay -W 30)")'
+# Flag:     --source
+#
+# NOTE: 'auto' will pick the best image source for whatever image backend is used.
+#       In ascii mode, distro ascii art will be used and in an image mode, your
+#       wallpaper will be used.
+image_source="auto"
+
+
+# Ascii Options
+
+
+# Ascii distro
+# Which distro's ascii art to display.
+#
+# Default: 'auto'
+# Values:  'auto', 'distro_name'
+# Flag:    --ascii_distro
+#
+# NOTE: Adélie, aerOS, Afterglow, AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android,
+# Antergos, antiX, AOSC OS, Aperio GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft,
+# archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, Arkane, ArseLinux,
+# Artix, Arya, Asahi, AsteroidOS, astOS, Astra Linux, Athena, azos, Bazzite, Bedrock, BigLinux,
+# BigLinux_large, Bitrig, BlackArch, BlackMesa, blackPanther, BLAG, BlankOn, BlueLight, Bodhi,
+# bonsai, BSD, BunsenLabs, CachyOS, Calculate, CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS,
+# Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS, Chrom, Cleanjaro, Clear Linux OS, ClearOS,
+# Clover, Cobalt, Condres, Container Linux by CoreOS, CRUX, Crystal Linux, Cucumber, CutefishOS,
+# CuteOS, CyberOS, dahlia, DarkOs, Darwin, Debian, Deepin, DesaOS, Devuan, DietPi, digital UNIX,
+# DracOS, DragonFly, Drauger, Droidian, Elementary, Elive, EncryptOS, EndeavourOS, Endless, Enso,
+# EuroLinux, EvolutionOS, eweOS, Exherbo, Exodia Predator OS, Fedora, Fedora Kinoite, Fedora
+# Sericea, Fedora Silverblue, Fedora_unicode, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeMiNT,
+# Frugalware, Funtoo, Furreto, GalliumOS, Garuda, Gentoo, GhostBSD, glaucus, Gloire, gNewSense,
+# GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, HamoniKR, HarDClanZ, Hash, Huayra,
+# Hybrid, HydroOS, Hyperbola, iglunix, instantOS, Interix, IRIX, Itc, januslinux, Kaisen, Kali,
+# KaOS, KDE, Kibojoe, Kogaion, Korora, KrassOS, KSLinux, Kubuntu, LainOS, LangitKetujuh, LaxerOS,
+# LEDE, LibreELEC, Linspire, Linux, Linux Lite, Linux Mint, Linux Mint Old, LinuxFromScratch, Live
+# Raizo, LMDE, Lubuntu, Lunar, mac, MacaroniOS, Mageia, Magix, MagpieOS, MainsailOS, Mandriva,
+# Manjaro, MassOS, MatuusOS, Maui, Mauna, Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS,
+# Neptune, NetBSD, Netrunner, Nitrux, NixOS, nixos_colorful, Nobara, NomadBSD, Nurunner, NuTyX,
+# Obarun, OBRevenge, OmniOS, Open Source Media Center, OpenBSD, openEuler, OpenIndiana, openKylin,
+# openmamba, OpenMandriva, OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, openSUSE
+# Tumbleweed-Slowroll, OPNsense, Oracle, orchid, OS Elbrus, PacBSD, Panwah, Parabola, parch, Pardus,
+# Parrot, Parsix, PCBSD, PCLinuxOS, pearOS, Pengwin, Pentoo, Peppermint, Peropesis, phyOS, PikaOS,
+# Pisi, PNM Linux, Pop!_OS, Porteus, PostMarketOS, Profelis SambaBOX, Proxmox, PuffOS, Puppy,
+# PureOS, Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, ravynOS, Reborn OS, Red Star, Redcore,
+# Redhat, Refracted Devuan, Regata, Regolith, RhaymOS, Rhino Linux, rocky, Rosa, Sabayon, sabotage,
+# Sailfish, SalentOS, Salient OS, Salix, Sasanqua, Scientific, secureblue, semc, Septor, Serene,
+# SharkLinux, ShastraOS, Siduction, SkiffOS, Slackel, Slackware, SliTaz, SmartOS, Soda, Solus,
+# Source Mage, Sparky, Star, SteamOS, Stock Linux, Sulin, SunOS, SwagArch, t2, Tails, Tatra, TeArch,
+# TorizonCore, Trisquel, Twister, Ubuntu, Ubuntu Budgie, Ubuntu Cinnamon, Ubuntu Kylin, Ubuntu MATE,
+# Ubuntu Studio, Ubuntu Sway, Ubuntu Touch, Ubuntu-GNOME, ubuntu_old02, Ultramarine Linux,
+# unicodearch, Univalent, Univention, Uos, UrukOS, uwuntu, Vanilla, Venom, VNux, Void, VzLinux, wii-
+# linux-ngx, Windows, Windows 10, Windows 11, Windows95, Wrt, Xenia, Xenia2, XFerience, Xray_OS,
+# Xubuntu, yiffOS, Zorin have ascii logos.
+
+# NOTE: arch, dragonfly, Fedora, LangitKetujuh, nixos, redhat, Ubuntu, void have 'old' logo
+# variants, use {distro}_old to use them.
+
+# NOTE: alpine, android, arch, arcolinux, artix, CalinixOS, centos, cleanjaro, crux, debian,
+# dragonfly, elementary, endeavouros, fedora, freebsd, garuda, gentoo, guix, haiku, hyperbola, kali,
+# Linux, linuxlite, linuxmint, mac, mageia, MainsailOS, manjaro, mx, netbsd, nixos, openbsd,
+# opensuse, orchid, parabola, popos, postmarketos, pureos, Raspbian, rocky, slackware, sunos,
+# ubuntu, venom, void have 'small' logo variants, use {distro}_small to use them.
+ascii_distro="auto"
+
+# Ascii Colors
+#
+# Default:  'distro'
+# Values:   'distro', 'num' 'num' 'num' 'num' 'num' 'num'
+# Flag:     --ascii_colors
+#
+# Example:
+# ascii_colors=(distro)      - Ascii is colored based on Distro colors.
+# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors.
+ascii_colors=(distro)
+
+# Bold ascii logo
+# Whether or not to bold the ascii logo.
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --ascii_bold
+ascii_bold="on"
+
+
+# Image Options
+
+
+# Image loop
+# Setting this to on will make neofetch redraw the image constantly until
+# Ctrl+C is pressed. This fixes display issues in some terminal emulators.
+#
+# Default:  'off'
+# Values:   'on', 'off'
+# Flag:     --loop
+image_loop="off"
+
+# Thumbnail directory
+#
+# Default: '~/.cache/thumbnails/neofetch'
+# Values:  'dir'
+thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch"
+
+# Crop mode
+#
+# Default:  'normal'
+# Values:   'normal', 'fit', 'fill'
+# Flag:     --crop_mode
+#
+# See this wiki page to learn about the fit and fill options.
+# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F
+crop_mode="normal"
+
+# Crop offset
+# Note: Only affects 'normal' crop mode.
+#
+# Default:  'center'
+# Values:   'northwest', 'north', 'northeast', 'west', 'center'
+#           'east', 'southwest', 'south', 'southeast'
+# Flag:     --crop_offset
+crop_offset="center"
+
+# Image size
+# The image is half the terminal width by default.
+#
+# Default: 'auto'
+# Values:  'auto', '00px', '00%', 'none'
+# Flags:   --image_size
+#          --size
+image_size="auto"
+
+# Catimg block size.
+# Control the resolution of catimg.
+#
+# Default: '2'
+# Values:  '1', '2'
+# Flags:   --catimg_size
+catimg_size="2"
+
+# Gap between image and text
+#
+# Default: '3'
+# Values:  'num', '-num'
+# Flag:    --gap
+gap=3
+
+# Image offsets
+# Only works with the w3m backend.
+#
+# Default: '0'
+# Values:  'px'
+# Flags:   --xoffset
+#          --yoffset
+yoffset=0
+xoffset=0
+
+# Image background color
+# Only works with the w3m backend.
+#
+# Default: ''
+# Values:  'color', 'blue'
+# Flag:    --bg_color
+background_color=
+
+
+# Misc Options
+
+# Stdout mode
+# If enabled, turn off all colors and disables image backend (ASCII/Image).
+# Useful for piping into another command.
+# Default: 'auto'
+# Values: 'auto', 'on', 'off'
+stdout="auto"
diff --git a/user/home/hyfetch.nix b/user/home/hyfetch/default.nix
index 9e89ba0..2c3cfd9 100644
--- a/user/home/hyfetch.nix
+++ b/user/home/hyfetch/default.nix
@@ -5,9 +5,12 @@
     settings = {
       backend = "neofetch";
       color_align.mode = "horizontal";
+      distro = "nixos_small";
       mode = "rgb";
       preset = "transgender";
       pride_month_disable = false;
     };
   };
+
+  xdg.configFile."neofetch/config.conf".source = ./config.conf;
 }
diff --git a/user/home/kakoune/default.nix b/user/home/kakoune/default.nix
index 54c3f0f..5def202 100644
--- a/user/home/kakoune/default.nix
+++ b/user/home/kakoune/default.nix
@@ -2,8 +2,9 @@
 {
   programs.kakoune = {
     enable = true;
+    colorSchemePackage = pkgs.kakounePlugins.kakoune-catppuccin;
     config = {
-      colorScheme = "rose-pine";
+      colorScheme = "catppuccin_mocha";
       hooks = [
         {
           commands = "set window indentwidth 2";
diff --git a/user/home/vencord/default.nix b/user/home/vencord/default.nix
index cf75ec6..229e1be 100644
--- a/user/home/vencord/default.nix
+++ b/user/home/vencord/default.nix
@@ -5,16 +5,11 @@
     vencord = {
       themes = {
         mocha-blue = ./mocha-blue.theme.css;
-        mocha-pink = ./mocha-pink.theme.css;
         rose-pine = ./rose-pine.css;
       };
 
       settings = {
-        enabledThemes =
-          if (config.desktop.accent == "pink") then
-            [ "mocha-pink.theme.css" ]
-          else
-            [ "mocha-blue.theme.css" ];
+        enabledThemes = [ "mocha-blue.theme.css" ];
         plugins = {
           AlwaysExpandRoles.enabled = true;
           MessageLogger.enabled = true;