diff --git a/config/hyprland.nix b/config/hyprland.nix index 164b458..659bed8 100644 --- a/config/hyprland.nix +++ b/config/hyprland.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { - home.file.".config/hyprland".text = '' + home.file.".config/hypr/hyprland.conf".text = '' # monitor=[monitor-name],[resolution@framerate],[pos-x,y],[scale factor],transform,[rotation] # Rotation Degrees Shorthand @@ -165,8 +165,8 @@ general { gaps_in = 4 gaps_out = 8 border_size = 3 - col.active_border = rgba(${base0C}ff) rgba(${base0D}ff) 45deg - col.inactive_border = rgba(${base00}cc) rgba(${base01}cc) 45deg + col.active_border = rgba(${config.colorScheme.colors.base0C}ff) rgba(${config.colorScheme.colors.base0D}ff) 45deg + col.inactive_border = rgba(${config.colorScheme.colors.base00}cc) rgba(${config.colorScheme.colors.base01}cc) 45deg layout = dwindle resize_on_border = true } diff --git a/config/hyprland/animations.conf b/config/hyprland/animations.conf deleted file mode 100644 index bce0e58..0000000 --- a/config/hyprland/animations.conf +++ /dev/null @@ -1,24 +0,0 @@ -# _______ _____ __________ -# ___ |_________(_)______ _________ __ /___(_)____________________ -# __ /| |_ __ \_ /__ __ `__ \ __ `/ __/_ /_ __ \_ __ \_ ___/ -# _ ___ | / / / / _ / / / / / /_/ // /_ _ / / /_/ / / / /(__ ) -# /_/ |_/_/ /_//_/ /_/ /_/ /_/\__,_/ \__/ /_/ \____//_/ /_//____/ - -animations { - enabled = yes - - # Define Settings For Animation Bezier Curve - bezier = wind, 0.05, 0.9, 0.1, 1.05 - bezier = winIn, 0.1, 1.1, 0.1, 1.1 - bezier = winOut, 0.3, -0.3, 0, 1 - bezier = liner, 1, 1, 1, 1 - - animation = windows, 1, 6, wind, slide - animation = windowsIn, 1, 6, winIn, slide - animation = windowsOut, 1, 5, winOut, slide - animation = windowsMove, 1, 5, wind, slide - animation = border, 1, 1, liner - animation = borderangle, 1, 30, liner, loop - animation = fade, 1, 10, default - animation = workspaces, 1, 5, wind -} diff --git a/config/hyprland/autostart.conf b/config/hyprland/autostart.conf deleted file mode 100644 index ed71215..0000000 --- a/config/hyprland/autostart.conf +++ /dev/null @@ -1,12 +0,0 @@ -# _______ _____ _____ _____ -# ___ |___ ___ /_______________ /______ _________ /_ -# __ /| | / / / __/ __ \_ ___/ __/ __ `/_ ___/ __/ -# _ ___ / /_/ // /_ / /_/ /(__ )/ /_ / /_/ /_ / / /_ -# /_/ |_\__,_/ \__/ \____//____/ \__/ \__,_/ /_/ \__/ -exec-once = dbus-update-activation-environment --systemd --all -exec-once = systemctl --user import-environment QT_QPA_PLATFORMTHEME WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = hyprctl setcursor Bibata-Modern-Ice 24 -exec-once = swww init -exec-once = waybar -exec-once = swaync -exec-once = wallsetter diff --git a/config/hyprland/hyprland.conf b/config/hyprland/hyprland.conf deleted file mode 100644 index 7fb6118..0000000 --- a/config/hyprland/hyprland.conf +++ /dev/null @@ -1,83 +0,0 @@ -# ███████╗ █████╗ ███╗ ██╗███████╗██╗ ██╗███████╗ -# ╚══███╔╝██╔══██╗████╗ ██║██╔════╝╚██╗ ██╔╝██╔════╝ -# ███╔╝ ███████║██╔██╗ ██║█████╗ ╚████╔╝ ███████╗ -# ███╔╝ ██╔══██║██║╚██╗██║██╔══╝ ╚██╔╝ ╚════██║ -# ███████╗██║ ██║██║ ╚████║███████╗ ██║ ███████║ -# ╚══════╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝ ╚═╝ ╚══════╝ -# Dotfiles circa 2023 - -# ______ ___ __________ -# ___ |/ /_______________(_)_ /_____________________ -# __ /|_/ /_ __ \_ __ \_ /_ __/ __ \_ ___/_ ___/ -# _ / / / / /_/ / / / / / / /_ / /_/ / / _(__ ) -# /_/ /_/ \____//_/ /_//_/ \__/ \____//_/ /____/ -# monitor=[monitor-name],[resolution@framerate],[pos-x,y],[scale factor],transform,[rotation] -# Rotation Degrees Shorthand -# normal (no transforms) -> 0 -# 90 degrees -> 1 -# 180 degrees -> 2 -# 270 degrees -> 3 -# flipped -> 4 -# flipped + 90 degrees -> 5 -# flipped + 180 degrees -> 6 -# flipped + 270 degrees -> 7 -monitor=,highres,auto,1 # Automatic Configuration - -# ___ ______ _________ ________ ______ -# __ | / /__(_)____________ /________ __ ___ __ \___ ____ /____________ -# __ | /| / /__ /__ __ \ __ /_ __ \_ | /| / / __ /_/ / / / /_ /_ _ \_ ___/ -# __ |/ |/ / _ / _ / / / /_/ / / /_/ /_ |/ |/ / _ _, _// /_/ /_ / / __/(__ ) -# ____/|__/ /_/ /_/ /_/\__,_/ \____/____/|__/ /_/ |_| \__,_/ /_/ \___//____/ -windowrule = float, ^(thunar)$ -windowrule = center, ^(thunar)$ -windowrule = size 1080 900, ^(thunar)$ -windowrule = float, ^(steam)$ -windowrule = center, ^(steam)$ -windowrule = size 1080 900, ^(steam)$ - -# ______ ________ ______ -# ___ / ______ _____ ______________ ___ __ \___ ____ /____________ -# __ / _ __ `/_ / / / _ \_ ___/ __ /_/ / / / /_ /_ _ \_ ___/ -# _ /___/ /_/ /_ /_/ // __/ / _ _, _// /_/ /_ / / __/(__ ) -# /_____/\__,_/ _\__, / \___//_/ /_/ |_| \__,_/ /_/ \___//____/ -# /____/ -layerrule = blur, ^(tofi)$ - -# ________ _____ -# ____ _/__________________ ___ /_ -# __ / __ __ \__ __ \ / / / __/ -# __/ / _ / / /_ /_/ / /_/ // /_ -# /___/ /_/ /_/_ .___/\__,_/ \__/ -# /_/ -input { - kb_layout = us - kb_options=caps:super - follow_mouse = 1 - - touchpad { - natural_scroll = false - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -gestures { - workspace_swipe = true - workspace_swipe_fingers = 3 -} - -# ________ ____________________ -# __ ___/_________ ___________________ ___ ____/__(_)__ /____________ -# _____ \_ __ \ / / /_ ___/ ___/ _ \ __ /_ __ /__ /_ _ \_ ___/ -# ____/ // /_/ / /_/ /_ / / /__ / __/ _ __/ _ / _ / / __/(__ ) -# /____/ \____/\__,_/ /_/ \___/ \___/ /_/ /_/ /_/ \___//____/ -source = ~/.config/hypr/autostart.conf -source = ~/.config/hypr/animations.conf -source = ~/.config/hypr/keybindings.conf -source = ~/.config/hypr/theme.conf - -# Ensure Mouse or Keyboard Inputs Turn On Displays -misc { - mouse_move_enables_dpms = true - key_press_enables_dpms = false -} diff --git a/config/hyprland/keybindings.conf b/config/hyprland/keybindings.conf deleted file mode 100644 index c5a30bd..0000000 --- a/config/hyprland/keybindings.conf +++ /dev/null @@ -1,88 +0,0 @@ -# ______ __ ______ _____ _____________ -# ___ //_/_________ ____ /____(_)____________ /__(_)_____________ ________ -# __ ,< _ _ \_ / / /_ __ \_ /__ __ \ __ /__ /__ __ \_ __ `/_ ___/ -# _ /| | / __/ /_/ /_ /_/ / / _ / / / /_/ / _ / _ / / / /_/ /_(__ ) -# /_/ |_| \___/_\__, / /_.___//_/ /_/ /_/\__,_/ /_/ /_/ /_/_\__, / /____/ -# /____/ /____/ -$mainMod = SUPER -# Sound Control Keybinds -bind = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle -bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle -# Brightness Control Keybinds -bind = , XF86MonBrightnessDown, exec, brightnessctl set 5%- -bind = , XF86MonBrightnessUp, exec, brightnessctl set +5% -# System Application Keybinds -bind = $mainMod, Return, exec, kitty -bind = $mainMod SHIFT, Return, exec, rofi -show drun -bind = $mainMod SHIFT, W, exec, kitty -e amfora -bind = $mainMod SHIFT, S, exec, wallsetter -bind = $mainMod, W, exec, firefox -bind = $mainMod, E, exec, emopicker9000 -bind = $mainMod, S, exec, grim -g "$(slurp)" -bind = $mainMod, D, exec, discord -bind = $mainMod, O, exec, obs -bind = $mainMod, G, exec, gimp -bind = $mainMod SHIFT, G, exec, godot4 -bind = $mainMod, T, exec, thunar -bind = $mainMod, M, exec, ario -# OBS Global Keybinds -bind = ALT, F1, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F2, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F3, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F4, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F5, pass, ^(com\.obsproject\.Studio)$ -# Hyprland Keybinds -bind = $mainMod, Q, killactive, -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod SHIFT, I, togglesplit, # dwindle -bind = $mainMod, F, fullscreen, -bind = $mainMod SHIFT, F, togglefloating, -bind = $mainMod SHIFT, C, exit, -# Move window with mainMod + shift + arrow keys -bind = $mainMod SHIFT, left, movewindow, l -bind = $mainMod SHIFT, right, movewindow, r -bind = $mainMod SHIFT, up, movewindow, u -bind = $mainMod SHIFT, down, movewindow, d -bind = $mainMod SHIFT, h, movewindow, l -bind = $mainMod SHIFT, l, movewindow, r -bind = $mainMod SHIFT, k, movewindow, u -bind = $mainMod SHIFT, j, movewindow, d -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d -bind = $mainMod, h, movefocus, l -bind = $mainMod, l, movefocus, r -bind = $mainMod, k, movefocus, u -bind = $mainMod, j, movefocus, d -# Switch workspaces with mainMod + [0-6] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 -# Move active window to a workspace with mainMod + SHIFT + [0-6] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow diff --git a/config/hyprland/theme.conf b/config/hyprland/theme.conf deleted file mode 100644 index d7a57ce..0000000 --- a/config/hyprland/theme.conf +++ /dev/null @@ -1,37 +0,0 @@ -# _____________ _____ -# ___ __/__ /_____________ ______(_)_____________ _ -# __ / __ __ \ _ \_ __ `__ \_ /__ __ \_ __ `/ -# _ / _ / / / __/ / / / / / / _ / / / /_/ / -# /_/ /_/ /_/\___//_/ /_/ /_//_/ /_/ /_/_\__, / -# /____/ -dwindle { - pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # you probably want this -} - -master { - new_is_master = true -} - -general { - gaps_in = 4 - gaps_out = 8 - border_size = 3 - col.active_border = rgba(bb9af7ff) rgba(b4f9f8ff) 45deg - col.inactive_border = rgba(565f89cc) rgba(9aa5cecc) 45deg - layout = dwindle - resize_on_border = true -} - -decoration { - rounding = 10 - drop_shadow = false - - blur { - enabled = true - size = 5 - passes = 3 - new_optimizations = on - ignore_opacity = on - } -} diff --git a/config/neofetch.nix b/config/neofetch.nix new file mode 100644 index 0000000..552180e --- /dev/null +++ b/config/neofetch.nix @@ -0,0 +1,25 @@ +{ pkgs, config, ... }: + +{ + home.file.".config/neofetch/config.conf".text = '' + print_info() { + info "$(color 6) OS " distro + info underline + info "$(color 7) VER" kernel + info "$(color 2) UP " uptime + info "$(color 4) PKG" packages + info "$(color 6) DE " de + info "$(color 5) TER" term + info "$(color 3) CPU" cpu + info "$(color 7) GPU" gpu + info "$(color 5) MEM" memory + prin " " + prin "$(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)" + } + distro_shorthand="on" + memory_unit="gib" + cpu_temp="F" + separator=" $(color 4)>" + stdout="off" + ''; +} diff --git a/config/neofetch/config.conf b/config/neofetch/config.conf deleted file mode 100644 index 7d77b43..0000000 --- a/config/neofetch/config.conf +++ /dev/null @@ -1,841 +0,0 @@ -print_info() { - info "$(color 1) OS " distro - info underline - - info "$(color 2) VER" kernel - info "$(color 3) UP " uptime - info "$(color 4) PKG" packages - info "$(color 6) DE " de - info "$(color 5) TER" term - info "$(color 3) CPU" cpu - info "$(color 1) GPU" gpu - info "$(color 2) MEM" memory - prin " " - prin "$(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)" -} - -# 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="on" - - -# 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="on" - -# 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 pecentage in output. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --memory_percent -# -# Example: -# on: '1801MiB / 7881MiB (22%)' -# off: '1801MiB / 7881MiB' -memory_percent="off" - -# Change memory output unit. -# -# Default: 'mib' -# Values: 'kib', 'mib', 'gib' -# Flag: --memory_unit -# -# Example: -# kib '1020928KiB / 7117824KiB' -# mib '1042MiB / 6951MiB' -# gib: ' 0.98GiB / 6.79GiB' -memory_unit="mib" - - -# 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" - - -# 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" - - -# 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="off" - -# 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="off" - -# 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="off" - - -# 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" - - -# 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 - - -# 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 -# clementine -# cmus -# deadbeef -# deepin-music -# dragon -# elisa -# exaile -# gnome-music -# gmusicbrowser -# gogglesmm -# guayadeque -# io.elementary.music -# iTunes -# juk -# lollypop -# 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 4)>" - - -# 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 15) - -# 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=3 - -# 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: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' -# 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: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, -# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, -# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, -# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, -# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, -# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, -# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, -# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -# and IRIX have ascii logos -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. -# Use '{distro name}_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, -# Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. -# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, -# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, -# Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, -# Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, -# postmarketOS, and Void have a smaller logo variant. -# Use '{distro name}_small' to use the small variants. -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" - -# 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 -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" diff --git a/config/waybar.nix b/config/waybar.nix index c6f5688..8e79a2b 100644 --- a/config/waybar.nix +++ b/config/waybar.nix @@ -158,70 +158,70 @@ color: #${config.colorScheme.colors.base07}; } #window { - color: #${config.colorScheme.colors.base06}; + color: #${config.colorScheme.colors.base05}; background: #${config.colorScheme.colors.base00}; border-radius: 0px 15px 50px 0px; margin: 5px 5px 5px 0px; padding: 2px 20px; } #memory { - color: #${config.colorScheme.colors.base05}; + color: #${config.colorScheme.colors.base0F}; background: #${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; } #clock { - color: #${config.colorScheme.colors.base07}; + color: #${config.colorScheme.colors.base0B}; background: #${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; } #cpu { - color: #${config.colorScheme.colors.base05}; + color: #${config.colorScheme.colors.base07}; background: #${config.colorScheme.colors.base00}; border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; } #disk { - color: #${config.colorScheme.colors.base02}; + color: #${config.colorScheme.colors.base03}; background: #${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; } #battery { - color: #${config.colorScheme.colors.base01}; + color: #${config.colorScheme.colors.base08}; background: #${config.colorScheme.colors.base00}; border-radius: 15px; margin: 5px; padding: 2px 20px; } #network { - color: #${config.colorScheme.colors.base03}; + color: #${config.colorScheme.colors.base09}; background: #${config.colorScheme.colors.base00}; border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; } #tray { - color: #${config.colorScheme.colors.base07}; + color: #${config.colorScheme.colors.base05}; background: #${config.colorScheme.colors.base00}; border-radius: 15px 0px 0px 50px; margin: 5px 0px 5px 5px; padding: 2px 20px; } #pulseaudio { - color: #${config.colorScheme.colors.base05}; + color: #${config.colorScheme.colors.base0D}; background: #${config.colorScheme.colors.base00}; border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; } #custom-notification { - color: #${config.colorScheme.colors.base04}; + color: #${config.colorScheme.colors.base0C}; background: #${config.colorScheme.colors.base00}; border-radius: 15px 50px 15px 50px; margin: 5px; diff --git a/flake.nix b/flake.nix index 589d821..a790fad 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,8 @@ modules = [ ./laptop/configuration.nix home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit username; - inherit gitUsername; inherit gitEmail; + inherit gitUsername; inherit gitEmail; + inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -51,6 +52,7 @@ home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit username; inherit gitUsername; inherit gitEmail; inherit inputs; + inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home.nix b/home.nix index ad49c7a..9268101 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,5 @@ -{ config, pkgs, inputs, username, gitUsername, gitEmail, ... }: +{ config, pkgs, inputs, username, + gitUsername, gitEmail, gtkThemeFromScheme, ... }: { # Home Manager Settings @@ -12,6 +13,7 @@ imports = [ inputs.nix-colors.homeManagerModules.default ./config/waybar.nix + ./config/neofetch.nix ./config/hyprland.nix ./config/kitty.nix ./config/vimcolors.nix @@ -20,7 +22,6 @@ # Place Files Inside Home Directory home.file.".config/zaney-stinger.mov".source = ./media/zaney-stinger.mov; home.file.".config/pipewire/pipewire.conf".source = ./config/pipewire/pipewire.conf; - home.file.".config/neofetch/config.conf".source = ./config/neofetch/config.conf; home.file.".vimrc".source = ./config/vimrc; home.file.".emoji".source = ./config/emoji; home.file.".face".source = ./config/face.jpg; @@ -94,8 +95,8 @@ package = pkgs.ubuntu_font_family; }; theme = { - name = "Tokyonight-Storm-BL"; - package = pkgs.tokyo-night-gtk; + name = "${config.colorScheme.slug}"; + package = gtkThemeFromScheme {scheme = config.colorScheme;}; }; iconTheme = { name = "Papirus-Dark";