From 8d34189147cb4666e664bc50b454d68275b5abc6 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Wed, 21 May 2025 20:19:32 +0200 Subject: [PATCH] ... --- configs/fastfetch/config.json | 55 +++++++++++++++++++++++++++++++++++ configs/hypr/hyprland.conf | 19 +++++++----- configs/swaync/style.css | 8 ++--- hosts/darp8/configuration.nix | 4 +-- hosts/darp8/file.nix | 5 ++++ hosts/darp8/home.nix | 1 - hosts/darp8/pkgs.nix | 2 ++ 7 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 configs/fastfetch/config.json diff --git a/configs/fastfetch/config.json b/configs/fastfetch/config.json new file mode 100644 index 0000000..c620a85 --- /dev/null +++ b/configs/fastfetch/config.json @@ -0,0 +1,55 @@ +{ + "display": { + "color": { + "keys": "green" + }, + "separator": " -> " + }, + "logo": { + "padding": { + "left": 1, + "right": 2, + "top": 1 + }, + "source": "$HOME/pictures/smol-penguin.png", + "type": "kitty" + }, + "modules": [ + "title", + { + "color": "green", + "format": "────────── Env ──────────", + "type": "custom" + }, + { + "key": "OS ", + "type": "os" + }, + { + "key": "WM ", + "type": "wm" + }, + "editor", + "break", + { + "format": "────────── Sys ──────────", + "type": "custom" + }, + "cpu", + "gpu", + { + "key": "MEM", + "type": "memory" + }, + "vulkan", + "disk", + "battery", + { + "format": "─────────────────────────", + "type": "custom" + }, + "break", + "colors", + "break" + ] +} diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 078637e..dad5701 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -1,5 +1,5 @@ # Startup -exec-once = dbus-update-activation-environment --systemd --all && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target +exec-once=dbus-update-activation-environment --systemd --all && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target exec-once=wl-clipboard-history -t exec-once=wl-paste -p --watch wl-copy -p '' exec-once=hypridle @@ -7,7 +7,6 @@ exec-once=waybar exec-once=fcitx5 -d exec-once=swww-daemon exec-once=swaync -exec-once=hyprctl plugin load $HYPR_EXPO_LIB # Monitors @@ -42,6 +41,11 @@ $magenta=rgba(881798FF) $crimson=rgba(471520FF) +# USED COLORS +$active_border=$lightgreen +$inactive_border=$gray +$expo_bg=$active_border + animations { bezier=myBezier, 0.05, 0.9, 0.1, 1.05 @@ -92,8 +96,8 @@ experimental { general { border_size=2 - col.active_border=$green - col.inactive_border=$gray + col.active_border=$active_border + col.inactive_border=$inactive_border gaps_in=2 gaps_out=4 layout=dwindle @@ -135,8 +139,8 @@ misc { plugin { hyprexpo { columns = 3 - gap_size = 5 - bg_col = $lightblue + gap_size = 3 + bg_col = $expo_bg workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1 enable_gesture = true # laptop touchpad @@ -205,10 +209,11 @@ bind=$mainMod SHIFT, P, pseudo, bind=$mainMod, C, killactive, bind=$mainMod, V, togglefloating, bind=$mainMod SHIFT, S, togglesplit, -bind = SUPER, grave, hyprexpo:expo, toggle bind=$mainMod control, Q, exec, $lock bind=$mainMod, F4, exit, +# bind = SUPER, grave, hyprexpo:expo, toggle # Commented out cos "version mismatch (bs)" + # Binds :: Navigation bind=$mainMod, F, fullscreen, diff --git a/configs/swaync/style.css b/configs/swaync/style.css index 9eb0acc..9ee1df0 100644 --- a/configs/swaync/style.css +++ b/configs/swaync/style.css @@ -1,14 +1,14 @@ @import "../../.cache/wal/colors-waybar.css"; @define-color main-color @color13; -@define-color cc-bg alpha(@main-color, 0.2); +@define-color cc-bg alpha(@main-color, 0.3); @define-color border alpha(lighter(@foreground), 0.1); @define-color text-color @foreground; @define-color text-color-disabled darker(@text-color); @define-color noti-bg @cc-bg; -@define-color noti-bg-hover alpha(darker(@background), 0.2); -@define-color noti-close-bg alpha(darker(@background), 0.1); -@define-color noti-close-bg-hover alpha(darker(@background), 0.3); +@define-color noti-bg-hover alpha(darker(@background), 0.3); +@define-color noti-close-bg alpha(darker(@background), 0.3); +@define-color noti-close-bg-hover alpha(darker(@background), 0.5); @define-color noti-bg-opaque rgb(48, 48, 48); @define-color noti-bg-darker rgb(38, 38, 38); diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix index 204e828..eb88ea6 100644 --- a/hosts/darp8/configuration.nix +++ b/hosts/darp8/configuration.nix @@ -90,10 +90,10 @@ in libinput.enable = true; blueman.enable = true; gvfs.enable = true; - # auto-cpufreq.enable = true; + auto-cpufreq.enable = true; thermald.enable = true; - power-profiles-daemon.enable = true; + power-profiles-daemon.enable = false; pulseaudio.enable = false; }; diff --git a/hosts/darp8/file.nix b/hosts/darp8/file.nix index 26504ab..e520d82 100644 --- a/hosts/darp8/file.nix +++ b/hosts/darp8/file.nix @@ -51,6 +51,11 @@ in outOfStoreSymlink = true; recursive = true; }; + ".config/fastfetch" = { + source = ../../configs/fastfetch; + outOfStoreSymlink = true; + recursive = true; + }; # I have no idea why this is an issue... # ".config/emacs" = { diff --git a/hosts/darp8/home.nix b/hosts/darp8/home.nix index 41ab015..af6dbe0 100644 --- a/hosts/darp8/home.nix +++ b/hosts/darp8/home.nix @@ -20,7 +20,6 @@ # general modules ../../modules/home-manager/tmux.nix - ../../modules/home-manager/fastfetch.nix ]; # You should not change this value, even if you update Home Manager. If you do diff --git a/hosts/darp8/pkgs.nix b/hosts/darp8/pkgs.nix index 8ea651c..919de02 100644 --- a/hosts/darp8/pkgs.nix +++ b/hosts/darp8/pkgs.nix @@ -15,6 +15,7 @@ emacs-all-the-icons-fonts emacsPackages.pdf-tools exfatprogs + fastfetch filezilla floorp genymotion @@ -81,6 +82,7 @@ ls = "ls --color=auto"; ll = "ls -l"; la = "ls -lA"; + fastfetch = "fastfetch -c $HOME/.config/fastfetch/config.json"; nixrebuild = "nixos-rebuild build --flake ~/personal/nixos#darp8 && sudo nixos-rebuild switch --flake ~/personal/nixos#darp8"; nixbuild = "sudo nixos-rebuild switch --flake"; nixtest = "sudo nixos-rebuild test --flake";