From 6f620359d3dde8f8e459fedf629cd551f80de423 Mon Sep 17 00:00:00 2001 From: suri-codes Date: Wed, 12 Aug 2026 22:28:58 -0700 Subject: [PATCH] lots of reworking --- hosts/Styx/configuration.nix | 10 +- modules/home/bars/sketchybar/default.nix | 11 -- .../home/bars/sketchybar/sketchybar/colors.sh | 8 -- .../bars/sketchybar/sketchybar/graphs/cpu.sh | 33 ----- .../bars/sketchybar/sketchybar/graphs/disk.sh | 21 --- .../sketchybar/sketchybar/graphs/memory.sh | 20 --- .../sketchybar/sketchybar/graphs/network.sh | 16 --- .../sketchybar/plugins/aerospace.sh | 20 --- .../sketchybar/sketchybar/plugins/battery.sh | 28 ---- .../sketchybar/sketchybar/plugins/clock.sh | 7 - .../bars/sketchybar/sketchybar/plugins/cpu.sh | 18 --- .../sketchybar/sketchybar/plugins/disk.sh | 32 ----- .../sketchybar/plugins/front_app.sh | 10 -- .../sketchybar/sketchybar/plugins/memory.sh | 26 ---- .../sketchybar/sketchybar/plugins/network.sh | 28 ---- .../sketchybar/sketchybar/plugins/space.sh | 7 - .../sketchybar/sketchybar/plugins/volume.sh | 20 --- .../bars/sketchybar/sketchybar/sketchybarrc | 133 ------------------ modules/home/shells/default.nix | 1 + .../{wm => shells}/noctalia/config/bar.toml | 0 .../noctalia/config/keybinds.toml | 0 .../noctalia/config/lockscreen.toml | 0 .../{wm => shells}/noctalia/config/osd.toml | 0 .../{wm => shells}/noctalia/config/shell.toml | 0 .../{wm => shells}/noctalia/config/theme.toml | 0 .../noctalia/config/wallpaper.toml | 0 .../home/{wm => shells}/noctalia/default.nix | 0 modules/home/tools/btop.nix | 2 +- modules/home/tools/default.nix | 49 +++---- modules/home/tools/zellij/default.nix | 12 -- modules/home/tools/zk/default.nix | 30 ---- modules/home/wm/default.nix | 1 - modules/home/wm/niri/config.kdl | 8 +- modules/home/wm/niri/default.nix | 11 -- modules/system/boot.nix | 19 ++- modules/system/grub-theme.nix | 33 +++++ 36 files changed, 70 insertions(+), 544 deletions(-) delete mode 100644 modules/home/bars/sketchybar/default.nix delete mode 100755 modules/home/bars/sketchybar/sketchybar/colors.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/graphs/cpu.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/graphs/disk.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/graphs/memory.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/graphs/network.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/aerospace.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/battery.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/clock.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/cpu.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/disk.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/front_app.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/memory.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/network.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/space.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/plugins/volume.sh delete mode 100755 modules/home/bars/sketchybar/sketchybar/sketchybarrc rename modules/home/{wm => shells}/noctalia/config/bar.toml (100%) rename modules/home/{wm => shells}/noctalia/config/keybinds.toml (100%) rename modules/home/{wm => shells}/noctalia/config/lockscreen.toml (100%) rename modules/home/{wm => shells}/noctalia/config/osd.toml (100%) rename modules/home/{wm => shells}/noctalia/config/shell.toml (100%) rename modules/home/{wm => shells}/noctalia/config/theme.toml (100%) rename modules/home/{wm => shells}/noctalia/config/wallpaper.toml (100%) rename modules/home/{wm => shells}/noctalia/default.nix (100%) delete mode 100644 modules/home/tools/zk/default.nix create mode 100644 modules/system/grub-theme.nix diff --git a/hosts/Styx/configuration.nix b/hosts/Styx/configuration.nix index 7dd88ea..edeb0f3 100644 --- a/hosts/Styx/configuration.nix +++ b/hosts/Styx/configuration.nix @@ -22,20 +22,16 @@ efiSupport = true; device = "nodev"; # Use "nodev" for EFI systems useOSProber = true; # Automatically find Windows/other OS + theme = pkgs.callPackage ../../modules/system/grub-theme.nix { }; }; # Use latest kernel. boot.kernelPackages = pkgs.linuxPackages_latest; + # Enable networking networking.hostName = "Styx"; # Define your hostname. networking.networkmanager.wifi.powersave = false; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking + networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking.networkmanager.enable = true; hardware.bluetooth.enable = true; services.power-profiles-daemon.enable = true; diff --git a/modules/home/bars/sketchybar/default.nix b/modules/home/bars/sketchybar/default.nix deleted file mode 100644 index 0820c59..0000000 --- a/modules/home/bars/sketchybar/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: { - home.file.".config/sketchybar/".source = ./sketchybar; - # home.file.".config/sketchybar/".source = builtins.fetchGit { - # url = "https://github.com/zphrs/sketchybar-config"; - # rev = "2545e7bab0c41577a8bcabc783c17e0593100182"; - # }; - - # home.file.".config/sketchybar/".source = ./sketchybar-config; - # home.file.".config/sketchybar/" - -} diff --git a/modules/home/bars/sketchybar/sketchybar/colors.sh b/modules/home/bars/sketchybar/sketchybar/colors.sh deleted file mode 100755 index 847898e..0000000 --- a/modules/home/bars/sketchybar/sketchybar/colors.sh +++ /dev/null @@ -1,8 +0,0 @@ -BLACK=0xFF2E312D -RED=0xFFFF8C54 -GREEN=0xFF86B59E -YELLOW=0xFFDCA11D -BLUE=0xFFA5A1FF -MAGENTA=0xFFE79788 -CYAN=0xFFBCEED5 -WHITE=0xFF777771 diff --git a/modules/home/bars/sketchybar/sketchybar/graphs/cpu.sh b/modules/home/bars/sketchybar/sketchybar/graphs/cpu.sh deleted file mode 100755 index f268678..0000000 --- a/modules/home/bars/sketchybar/sketchybar/graphs/cpu.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env sh -source "$HOME/.config/sketchybar/colors.sh" -sketchybar \ - --add item cpu.percent q \ - --set cpu.percent label.font="FiraCode Nerd Font:Bold:12" \ - label=CPU \ - y_offset=-4 \ - width=0 \ - icon.drawing=off \ - update_freq=2 \ - \ - --add graph cpu.sys q 80 \ - --set cpu.sys width=0 \ - graph.color=$RED \ - graph.fill_color=$RED \ - label.drawing=off \ - icon.drawing=off \ - background.padding_right=5 \ - \ - --add item cpu.top q \ - --set cpu.top label.font="FiraCode Nerd Font:Medium:7" \ - label=CPU \ - icon.drawing=off \ - y_offset=6 \ - background.padding_right=5 \ - width=0 \ - --add graph cpu.user q 80 \ - --set cpu.user graph.color=$BLUE \ - update_freq=2 \ - label.drawing=off \ - icon.drawing=off \ - background.padding_left=4 \ - script="$PLUGIN_DIR/cpu.sh" \ diff --git a/modules/home/bars/sketchybar/sketchybar/graphs/disk.sh b/modules/home/bars/sketchybar/sketchybar/graphs/disk.sh deleted file mode 100755 index 9598337..0000000 --- a/modules/home/bars/sketchybar/sketchybar/graphs/disk.sh +++ /dev/null @@ -1,21 +0,0 @@ - -#!/usr/bin/env sh -source "$HOME/.config/sketchybar/colors.sh" -sketchybar \ - --add item disk.used_txt q \ - --set disk.used_txt label.font="FiraCode Nerd Font:Bold:10" \ - label=DISK \ - y_offset=-4 \ - width=0 \ - icon.drawing=off \ - update_freq=1 \ - padding_left=15 \ - \ - --add graph disk.used e 80 \ - --set disk.used graph.color=$RED \ - update_freq=1 \ - label.drawing=off \ - icon.drawing=off \ - background.padding_left=4 \ - padding_left=15 \ - script="$PLUGIN_DIR/disk.sh" \ diff --git a/modules/home/bars/sketchybar/sketchybar/graphs/memory.sh b/modules/home/bars/sketchybar/sketchybar/graphs/memory.sh deleted file mode 100755 index 45985fa..0000000 --- a/modules/home/bars/sketchybar/sketchybar/graphs/memory.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env sh -source "$HOME/.config/sketchybar/colors.sh" -sketchybar \ - --add item mem.used_txt e \ - --set mem.used_txt label.font="FiraCode Nerd Font:Bold:10" \ - label=MEM \ - y_offset=-4 \ - width=0 \ - icon.drawing=off \ - update_freq=2 \ - padding_left=15 \ - \ - --add graph mem.used e 80 \ - --set mem.used graph.color=$RED \ - update_freq=2 \ - label.drawing=off \ - icon.drawing=off \ - background.padding_left=4 \ - padding_left=15 \ - script="$PLUGIN_DIR/memory.sh" \ diff --git a/modules/home/bars/sketchybar/sketchybar/graphs/network.sh b/modules/home/bars/sketchybar/sketchybar/graphs/network.sh deleted file mode 100755 index 462b571..0000000 --- a/modules/home/bars/sketchybar/sketchybar/graphs/network.sh +++ /dev/null @@ -1,16 +0,0 @@ -sketchybar --add graph net.in e 100 \ - --set net.in icon.drawing=off label.drawing=off graph.color=$BLUE width=0 script="$PLUGIN_DIR/network.sh" \ - padding_left=15 \ - --add item net.in_txt e \ - --set net.in_txt icon.drawing=off icon.font.size=10 width=0 label="-.--KB/s" label.font.size=10 label.font.style=Bold \ - padding_left=15 \ - --add item net.out_txt e \ - --set net.out_txt icon.drawing=off icon.font.size=10 width=0 label="-.--KB/s" label.font.size=10 label.font.style=Bold \ - y_offset=12 \ - padding_left=15 \ - --add graph net.out e 100 \ - --set net.out icon.drawing=off label.drawing=off graph.color=$YELLOW padding_left=0 \ - padding_left=15 \ - --add bracket networks net.out net.in net.in_txt net.out_txt \ - --set networks background.color=0xff000000 padding_left=5 padding_right=5 background.corner_radius=0 background.height=40 \ - padding_left=15 \ diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/aerospace.sh b/modules/home/bars/sketchybar/sketchybar/plugins/aerospace.sh deleted file mode 100755 index cdb15aa..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/aerospace.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# make sure it's executable with: -# chmod +x ~/.config/sketchybar/plugins/aerospace.sh - -if [ "$1" = "$FOCUSED_WORKSPACE" ]; then - # sketchybar --set $NAME background.drawing=on - - sketchybar --animate quadratic 7 \ - --set $NAME icon.font.size=25 - - # --set $NAME y_offset=10 \ - -else - # sketchybar --set $NAME background.drawing=off - sketchybar --animate quadratic 7 \ - --set $NAME icon.font.size=15 - - # --set $NAME y_offset=0 \ -fi diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/battery.sh b/modules/home/bars/sketchybar/sketchybar/plugins/battery.sh deleted file mode 100755 index 9dd9627..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/battery.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -PERCENTAGE="$(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1)" -CHARGING="$(pmset -g batt | grep 'AC Power')" - -if [ "$PERCENTAGE" = "" ]; then - exit 0 -fi - -case "${PERCENTAGE}" in - 9[0-9]|100) ICON="" - ;; - [6-8][0-9]) ICON="" - ;; - [3-5][0-9]) ICON="" - ;; - [1-2][0-9]) ICON="" - ;; - *) ICON="" -esac - -if [[ "$CHARGING" != "" ]]; then - ICON="" -fi - -# The item invoking this script (name $NAME) will get its icon and label -# updated with the current battery status -sketchybar --set "$NAME" icon="$ICON" label="${PERCENTAGE}%" diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/clock.sh b/modules/home/bars/sketchybar/sketchybar/plugins/clock.sh deleted file mode 100755 index cf1b8c6..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/clock.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# The $NAME variable is passed from sketchybar and holds the name of -# the item invoking this script: -# https://felixkratz.github.io/SketchyBar/config/events#events-and-scripting - -sketchybar --set "$NAME" label="$(date '+%m/%d %l:%M %p')" diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/cpu.sh b/modules/home/bars/sketchybar/sketchybar/plugins/cpu.sh deleted file mode 100755 index 2418784..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/cpu.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env sh - -source "$HOME/.config/sketchybar/colors.sh" - -CORE_COUNT=$(sysctl -n machdep.cpu.thread_count) -CPU_INFO=$(ps -eo pcpu,user) -CPU_SYS=$(echo "$CPU_INFO" | grep -v $(whoami) | sed "s/[^ 0-9\.]//g" | awk "{sum+=\$1} END {print sum/(100.0 * $CORE_COUNT)}") -CPU_USER=$(echo "$CPU_INFO" | grep $(whoami) | sed "s/[^ 0-9\.]//g" | awk "{sum+=\$1} END {print sum/(100.0 * $CORE_COUNT)}") - -TOPPROC=$(LANG=C && ps axo "%cpu,ucomm" | sort -nr | tail +1 | head -n1 | awk '{printf "%.0f%% %s\n", $1, $2}' | sed -e 's/com.apple.//g') -CPUP=$(echo $TOPPROC | sed -nr 's/([^\%]+).*/\1/p') - -CPU_PERCENT="$(echo "$CPU_SYS $CPU_USER" | awk '{printf "%.0f\n", ($1 + $2)*100}')" - -sketchybar --set cpu.percent label=$CPU_PERCENT% \ - --set cpu.top label="$TOPPROC" \ - --push cpu.sys $CPU_SYS \ - --push cpu.user $CPU_USER diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/disk.sh b/modules/home/bars/sketchybar/sketchybar/plugins/disk.sh deleted file mode 100755 index 954c351..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/disk.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Script to sum up the "Used" column from df -k output -# Usage: ./df-k-usage-sum.sh - -# No conversion function needed since df -k outputs in kilobytes - -# Function to convert kilobytes to human-readable format -kb_to_human() { - local kb="$1" - - if (( kb >= 1073741824 )); then # 1 TiB in KB - echo "$kb" | awk '{printf "%.1fT", $1/1073741824}' - elif (( kb >= 1048576 )); then # 1 GiB in KB - echo "$kb" | awk '{printf "%.1fG", $1/1048576}' - elif (( kb >= 1024 )); then # 1 MiB in KB - echo "$kb" | awk '{printf "%.1fM", $1/1024}' - else - echo "${kb}K" - fi -} - -# Get df -k output and process it -total_kb=$(df -k | awk ' - BEGIN { total = 0 } - NR > 1 && $3 ~ /^[0-9]+$/ { total += $3 } - END { print total } -') - -total_kb_human=$(kb_to_human $total_kb) - -sketchybar --set "$NAME" icon="" label="$total_kb_human" diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/front_app.sh b/modules/home/bars/sketchybar/sketchybar/plugins/front_app.sh deleted file mode 100755 index fb6d0b3..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/front_app.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Some events send additional information specific to the event in the $INFO -# variable. E.g. the front_app_switched event sends the name of the newly -# focused application in the $INFO variable: -# https://felixkratz.github.io/SketchyBar/config/events#events-and-scripting - -if [ "$SENDER" = "front_app_switched" ]; then - sketchybar --set "$NAME" label="$INFO" -fi diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/memory.sh b/modules/home/bars/sketchybar/sketchybar/plugins/memory.sh deleted file mode 100755 index ba620ce..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/memory.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# Get total physical memory in bytes -total_ram=$(sysctl -n hw.memsize) - -# Get used memory using vm_stat (convert page counts to bytes) -pages_free=$(vm_stat | awk '/Pages free/ {print $3}' | tr -d '.') -pages_speculative=$(vm_stat | awk '/Pages speculative/ {print $3}' | tr -d '.') -pages_purgeable=$(vm_stat | awk '/Pages purgeable/ {print $3}' | tr -d '.') -page_size=$(vm_stat | head -1 | awk '{print $8}') -page_size=${page_size%\.} # remove any trailing period - -# Calculate used RAM in bytes -free_ram=$(( (pages_free + pages_speculative + pages_purgeable) * page_size )) -used_ram=$(( total_ram - free_ram )) - -# Calculate percentage used (rounded) -ram_usage_frac=$(awk "BEGIN {printf \"%.6f\", $used_ram / $total_ram}") - -# Optional: format output for human readability -total_ram_human=$(bc <<< "$total_ram / (1024^3)") -used_ram_human=$(bc <<< "scale=2; $used_ram / (1024^3)") - -sketchybar \ - --set mem.used_txt label="$used_ram_human/$total_ram_human GB" \ - --push mem.used $ram_usage_frac diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/network.sh b/modules/home/bars/sketchybar/sketchybar/plugins/network.sh deleted file mode 100755 index 76250ee..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/network.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env sh -source "$HOME/.config/sketchybar/colors.sh" - -ifstat -i en0 | while read -r IN_KB OUT_KB; do - if [[ $IN_KB == "KB/s" ]] || [[ $IN_KB == "en0" ]]; then - sketchybar --push net.in 0 \ - --push net.out 0 - continue; - fi - - if [[ $IN_KB == "0.00" ]]; then - sketchybar --push net.in 0 \ - --set net.in_txt label="0.00KB/s " label.color=$BLUE icon.color=$BLUE - else - IN=$(echo "l(5 + $IN_KB)/21" | bc -l) - sketchybar --push net.in $IN \ - --set net.in_txt label="${IN_KB}KB/s " label.color=$BLUE icon.color=$BLUE - fi - if [[ $OUT_KB == "0.00" ]]; then - sketchybar --push net.out 0 \ - --set net.out_txt label="0.00KB/s " label.color=$YELLOW icon.color=$YELLOW - else - OUT=$(echo "l(5 + $OUT_KB)/21" | bc -l) - sketchybar --push net.out $OUT \ - --set net.out_txt label="${OUT_KB}KB/s " label.color=$YELLOW icon.color=$YELLOW - - fi -done diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/space.sh b/modules/home/bars/sketchybar/sketchybar/plugins/space.sh deleted file mode 100755 index b8602b5..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/space.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# The $SELECTED variable is available for space components and indicates if -# the space invoking this script (with name: $NAME) is currently selected: -# https://felixkratz.github.io/SketchyBar/config/components#space----associate-mission-control-spaces-with-an-item - -sketchybar --set "$NAME" background.drawing="$SELECTED" diff --git a/modules/home/bars/sketchybar/sketchybar/plugins/volume.sh b/modules/home/bars/sketchybar/sketchybar/plugins/volume.sh deleted file mode 100755 index 6e69a5d..0000000 --- a/modules/home/bars/sketchybar/sketchybar/plugins/volume.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# The volume_change event supplies a $INFO variable in which the current volume -# percentage is passed to the script. - -if [ "$SENDER" = "volume_change" ]; then - VOLUME="$INFO" - - case "$VOLUME" in - [6-9][0-9]|100) ICON="󰕾" - ;; - [3-5][0-9]) ICON="󰖀" - ;; - [1-9]|[1-2][0-9]) ICON="󰕿" - ;; - *) ICON="󰖁" - esac - - sketchybar --set "$NAME" icon="$ICON" label="$VOLUME%" -fi diff --git a/modules/home/bars/sketchybar/sketchybar/sketchybarrc b/modules/home/bars/sketchybar/sketchybar/sketchybarrc deleted file mode 100755 index 489f1d7..0000000 --- a/modules/home/bars/sketchybar/sketchybar/sketchybarrc +++ /dev/null @@ -1,133 +0,0 @@ -# This is a demo config to showcase some of the most important commands. -# It is meant to be changed and configured, as it is intentionally kept sparse. -# For a (much) more advanced configuration example see my dotfiles: -# https://github.com/FelixKratz/dotfiles - -PLUGIN_DIR="$CONFIG_DIR/plugins" - -##### Bar Appearance ##### -# Configuring the general appearance of the bar. -# These are only some of the options available. For all options see: -# https://felixkratz.github.io/SketchyBar/config/bar -# If you are looking for other colors, see the color picker: -# https://felixkratz.github.io/SketchyBar/config/tricks#color-picker - -sketchybar --bar position=top height=40 blur_radius=30 color=0x40000000 - -##### Changing Defaults ##### -# We now change some default values, which are applied to all further items. -# For a full list of all available item properties see: -# https://felixkratz.github.io/SketchyBar/config/items - -default=( - padding_left=5 - padding_right=5 - icon.font="Hack Nerd Font:Bold:17.0" - label.font="Hack Nerd Font:Bold:14.0" - icon.color=0xffffffff - label.color=0xffffffff - icon.padding_left=4 - icon.padding_right=4 - label.padding_left=4 - label.padding_right=4 -) -sketchybar --default "${default[@]}" - -##### Adding Mission Control Space Indicators ##### -# Let's add some mission control spaces: -# https://felixkratz.github.io/SketchyBar/config/components#space----associate-mission-control-spaces-with-an-item -# to indicate active and available mission control spaces. - -# SPACE_ICONS=("1" "2" "3" "4" "5" "6" "7" "8" "9" "10") -# for i in "${!SPACE_ICONS[@]}" -# do -# sid="$(($i+1))" -# space=( -# space="$sid" -# icon="${SPACE_ICONS[i]}" -# icon.padding_left=7 -# icon.padding_right=7 -# background.color=0x40ffffff -# background.corner_radius=5 -# background.height=25 -# label.drawing=off -# script="$PLUGIN_DIR/space.sh" -# click_script="yabai -m space --focus $sid" -# ) -# sketchybar --add space space."$sid" left --set space."$sid" "${space[@]}" -# done - -##### Adding Left Items ##### -# We add some regular items to the left side of the bar, where -# only the properties deviating from the current defaults need to be set - -sketchybar --add item chevron left \ - --set chevron icon= label.drawing=off \ - --add item front_app left \ - --set front_app icon.drawing=off script="$PLUGIN_DIR/front_app.sh" \ - --subscribe front_app front_app_switched - -##### Adding Right Items ##### -# In the same way as the left items we can add items to the right side. -# Additional position (e.g. center) are available, see: -# https://felixkratz.github.io/SketchyBar/config/items#adding-items-to-sketchybar - -# Some items refresh on a fixed cycle, e.g. the clock runs its script once -# every 10s. Other items respond to events they subscribe to, e.g. the -# volume.sh script is only executed once an actual change in system audio -# volume is registered. More info about the event system can be found here: -# https://felixkratz.github.io/SketchyBar/config/events - -sketchybar --add item clock right \ - --set clock update_freq=10 icon= script="$PLUGIN_DIR/clock.sh" \ - --add item volume right \ - --set volume script="$PLUGIN_DIR/volume.sh" \ - --subscribe volume volume_change \ - --add item battery right \ - --set battery update_freq=120 script="$PLUGIN_DIR/battery.sh" \ - --subscribe battery system_woke power_source_change \ - --add item disk right \ - --set disk update_freq=20 script="$PLUGIN_DIR/disk.sh" \ - - - -##### Aerospace Configuration ##### -sketchybar --add event aerospace_workspace_change - -# Get all aerospace workspaces and reverse them -WORKSPACES=($(aerospace list-workspaces --all)) -REVERSED_WORKSPACES=() - -# Reverse the array -for ((i=${#WORKSPACES[@]}-1; i>=0; i--)); do - REVERSED_WORKSPACES+=("${WORKSPACES[i]}") -done - -source "${CONFIG_DIR}/graphs/cpu.sh" - -sketchybar --add item spacer q \ - --set spacer \ - padding_right=25 - -# Add workspace items to sketchybar in reversed order -for sid in "${REVERSED_WORKSPACES[@]}"; do - sketchybar --add item space.$sid q \ - --subscribe space.$sid aerospace_workspace_change \ - --set space.$sid \ - background.color=0x44ffffff \ - background.corner_radius=5 \ - background.height=20 \ - background.drawing=off \ - icon="◉" \ - label.padding_left=0 \ - label.padding_right=0 \ - click_script="aerospace workspace $sid" \ - script="$CONFIG_DIR/plugins/aerospace.sh $sid" -done - - -source "${CONFIG_DIR}/graphs/memory.sh" -source "${CONFIG_DIR}/graphs/network.sh" - -##### Force all scripts to run the first time (never do this in a script) ##### -sketchybar --update diff --git a/modules/home/shells/default.nix b/modules/home/shells/default.nix index 3aed910..69e95d6 100644 --- a/modules/home/shells/default.nix +++ b/modules/home/shells/default.nix @@ -21,6 +21,7 @@ in imports = [ ./fish + ./noctalia ./zsh diff --git a/modules/home/wm/noctalia/config/bar.toml b/modules/home/shells/noctalia/config/bar.toml similarity index 100% rename from modules/home/wm/noctalia/config/bar.toml rename to modules/home/shells/noctalia/config/bar.toml diff --git a/modules/home/wm/noctalia/config/keybinds.toml b/modules/home/shells/noctalia/config/keybinds.toml similarity index 100% rename from modules/home/wm/noctalia/config/keybinds.toml rename to modules/home/shells/noctalia/config/keybinds.toml diff --git a/modules/home/wm/noctalia/config/lockscreen.toml b/modules/home/shells/noctalia/config/lockscreen.toml similarity index 100% rename from modules/home/wm/noctalia/config/lockscreen.toml rename to modules/home/shells/noctalia/config/lockscreen.toml diff --git a/modules/home/wm/noctalia/config/osd.toml b/modules/home/shells/noctalia/config/osd.toml similarity index 100% rename from modules/home/wm/noctalia/config/osd.toml rename to modules/home/shells/noctalia/config/osd.toml diff --git a/modules/home/wm/noctalia/config/shell.toml b/modules/home/shells/noctalia/config/shell.toml similarity index 100% rename from modules/home/wm/noctalia/config/shell.toml rename to modules/home/shells/noctalia/config/shell.toml diff --git a/modules/home/wm/noctalia/config/theme.toml b/modules/home/shells/noctalia/config/theme.toml similarity index 100% rename from modules/home/wm/noctalia/config/theme.toml rename to modules/home/shells/noctalia/config/theme.toml diff --git a/modules/home/wm/noctalia/config/wallpaper.toml b/modules/home/shells/noctalia/config/wallpaper.toml similarity index 100% rename from modules/home/wm/noctalia/config/wallpaper.toml rename to modules/home/shells/noctalia/config/wallpaper.toml diff --git a/modules/home/wm/noctalia/default.nix b/modules/home/shells/noctalia/default.nix similarity index 100% rename from modules/home/wm/noctalia/default.nix rename to modules/home/shells/noctalia/default.nix diff --git a/modules/home/tools/btop.nix b/modules/home/tools/btop.nix index 8847a23..a466797 100644 --- a/modules/home/tools/btop.nix +++ b/modules/home/tools/btop.nix @@ -2,7 +2,7 @@ programs.btop = { enable = true; settings = { - # color_theme = "TTY"; + color_theme = "TTY"; }; }; } diff --git a/modules/home/tools/default.nix b/modules/home/tools/default.nix index 74a9a0e..18b8232 100644 --- a/modules/home/tools/default.nix +++ b/modules/home/tools/default.nix @@ -1,6 +1,5 @@ { pkgs, - lib, ... }: { @@ -17,51 +16,35 @@ ]; - # home.sessionVariables.LIBRARY_PATH = "${ - # lib.makeLibraryPath [ pkgs.libiconv ] - # }\${LIBRARY_PATH:+:$LIBRARY_PATH}"; - # - home.packages = with pkgs; [ - # codex - qpdf - spicetify-cli - devenv + # rice + tty-clock + fastfetch - onefetch + # user tools + github-cli + glow + tokei zoxide - eza - fd - - uv - ripgrep bat - fastfetch - zstd - coreutils-prefixed - nh yazi - fzf - github-cli + nh dust - glow just - tokei - - codex - - timr-tui claude-code - kitty + libqalculate - stress - - tty-clock - # libqalculate + #system tools + qpdf + zstd + coreutils-prefixed + fzf + fd + # wait this is sick lol (pkgs.writeShellApplication { name = "ns"; runtimeInputs = with pkgs; [ diff --git a/modules/home/tools/zellij/default.nix b/modules/home/tools/zellij/default.nix index 80d264c..91bf1bd 100644 --- a/modules/home/tools/zellij/default.nix +++ b/modules/home/tools/zellij/default.nix @@ -8,17 +8,6 @@ with lib; let cfg = config.nyx.zellij; - - suri_zellij_session_helper = pkgs.writeShellScriptBin "suri_zellij_session_helper" '' - ZELLIJ_SESSIONS=$(${pkgs.zellij}/bin/zellij ls | ${pkgs.gnused}/bin/sed 's/\x1b\[[0-9;]*m//g' | ${pkgs.coreutils}/bin/cut -d ' ' -f 1) - NUM_SESSIONS=$(${pkgs.coreutils}/bin/echo "''${ZELLIJ_SESSIONS}" | ${pkgs.coreutils}/bin/wc -l ) - if [ "''${NUM_SESSIONS}" -ge 1 ]; then - SESSION="$(${pkgs.coreutils}/bin/echo "''${ZELLIJ_SESSIONS}" | ${pkgs.fzf}/bin/fzf)" - ${pkgs.zellij}/bin/zellij a ''${SESSION} - else - ${pkgs.zellij}/bin/zellij attach -c - fi - ''; in { @@ -33,7 +22,6 @@ in packages = [ pkgs.zellij pkgs.fzf - suri_zellij_session_helper ]; }; diff --git a/modules/home/tools/zk/default.nix b/modules/home/tools/zk/default.nix deleted file mode 100644 index 2689d07..0000000 --- a/modules/home/tools/zk/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - ... -}: - -with lib; -let - cfg = config.nyx.zk; -in -{ - options.nyx.zk = { - enable = mkEnableOption "zk"; - - }; - - config = mkIf (cfg.enable) { - - programs.zk = { - enable = true; - }; - - home.file.".config/zk/config.toml".text = '' - [notebook] - dir = "~/dev/personal/meditations" - ''; - - }; - -} diff --git a/modules/home/wm/default.nix b/modules/home/wm/default.nix index 524811d..aebe1b5 100644 --- a/modules/home/wm/default.nix +++ b/modules/home/wm/default.nix @@ -5,7 +5,6 @@ ./aerospace ./niri ./paneru - ./noctalia ]; } diff --git a/modules/home/wm/niri/config.kdl b/modules/home/wm/niri/config.kdl index be103d8..194b7d2 100644 --- a/modules/home/wm/niri/config.kdl +++ b/modules/home/wm/niri/config.kdl @@ -1,7 +1,7 @@ // ask to turn off client side decorations prefer-no-csd -// create efault workspaces +// create default workspaces workspace "Zen" workspace "Coding" workspace "Chat" @@ -20,7 +20,7 @@ input { mouse { // off // natural-scroll - // accel-speed 0.05 + accel-speed -0.3 accel-profile "flat" // scroll-method "no-scroll" } @@ -372,9 +372,9 @@ layer-rule { } blur { - passes 2 // more passes = stronger blur (default: 3) + passes 3 // more passes = stronger blur (default: 3) offset 3.0 // sample distance per pass (default: 3.0) - noise 0.05 // grain overlay (default: 0.02) + noise 0.02 // grain overlay (default: 0.02) saturation 1.0 // color saturation boost (default: 1.5) } diff --git a/modules/home/wm/niri/default.nix b/modules/home/wm/niri/default.nix index 736f086..9b0edef 100644 --- a/modules/home/wm/niri/default.nix +++ b/modules/home/wm/niri/default.nix @@ -13,20 +13,9 @@ in enable = mkEnableOption "Niri Window Manager"; }; config = mkIf (cfg.enable && pkgs.stdenv.isLinux) { - # home.packages = [ pkgs.aerospace ]; home.file.".config/niri/config.kdl".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nyx/modules/home/wm/niri/config.kdl"; - # launchd.agents.aerospace = { - # enable = true; - # config = { - # ProgramArguments = [ "${pkgs.aerospace}/bin/aerospace" ]; - # KeepAlive = true; - # RunAtLoad = true; - # StandardOutPath = "/tmp/aerospace.out.log"; - # StandardErrorPath = "/tmp/aerospace.err.log"; - # }; - # }; }; } diff --git a/modules/system/boot.nix b/modules/system/boot.nix index 13b6a80..0341bcd 100644 --- a/modules/system/boot.nix +++ b/modules/system/boot.nix @@ -1,10 +1,15 @@ { # TODO: get a grub theme - boot.loader.systemd-boot.enable = false; - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.useOSProber = true; - boot.loader.grub.efiSupport = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot"; + + # boot.loader.efi.canTouchEfiVariables = true; + # boot.loader.grub = { + # enable = true; + # efiSupport = true; + # device = "nodev"; # Use "nodev" for EFI systems + # useOSProber = true; # Automatically find Windows/other OS + # }; + + # Use latest kernel. + # boot.kernelPackages = pkgs.linuxPackages_latest; + } diff --git a/modules/system/grub-theme.nix b/modules/system/grub-theme.nix new file mode 100644 index 0000000..d00eb9f --- /dev/null +++ b/modules/system/grub-theme.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation { + pname = "xenlism-grub-theme-nixos"; + version = "unstable-2024"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/xenlism/Grub-themes/main/xenlism-grub-2k-nixos.tar.xz"; + sha256 = "140mbqmsaz9qd99fpscl4lj53z4a95bga926gcal60wrv7ssfg0w"; + }; + + sourceRoot = "xenlism-grub-2k-nixos/Xenlism-Nixos"; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r . $out/ + runHook postInstall + ''; + + meta = with lib; { + description = "Xenlism GRUB theme, NixOS flavor, 2K resolution"; + homepage = "https://github.com/xenlism/Grub-themes"; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} -- 2.51.2