From 8576abd055164359b59612531cd20371d44941ff Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 1 May 2025 09:31:11 -0500 Subject: [PATCH 01/10] gah --- home/home.nix | 6 +++--- scripts/fflof | 40 ++-------------------------------------- scripts/fflof.bak | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 41 deletions(-) create mode 100755 scripts/fflof.bak diff --git a/home/home.nix b/home/home.nix index bd742ac..ac84833 100644 --- a/home/home.nix +++ b/home/home.nix @@ -634,9 +634,9 @@ in { recursive = true; }; - home.file.".librewolf/native-messaging-hosts/tridactyl.json" = { - source = pkgs.tridactyl-native - }; + # home.file.".librewolf/native-messaging-hosts/tridactyl.json" = { + # source = pkgs.tridactyl-native; + # }; programs.librewolf = { enable = true; diff --git a/scripts/fflof b/scripts/fflof index f3ae5bc..4c772b3 100755 --- a/scripts/fflof +++ b/scripts/fflof @@ -1,39 +1,3 @@ -#!/usr/bin/env bash -export MOZ_ENABLE_WAYLAND=1 -echo $MOZ_ENABLE_WAYLAND +#!/usr/bin/env nu -# Check to see if librewolf is running -if [ $(pgrep -c librewolf) -gt 0 ]; then - echo "ff running" - - if [ "$XDG_SESSION_TYPE" = "x11" ]; then - #X11 - ffrg=$(wmctrl -lx | rg librewolf | awk '{print $1}') - # echo $emacsrg - - if [ -z $ffrg ]; then - exec librewolf - exit - else - exec wmctrl -ia $ffrg - exit - fi - else - if [ "$KDE_FULL_SESSION" = "true" ]; then - echo "KDE" - exec /home/chris/bin/ww -fa librewolf -c librewolf - exit - else - # WAYLAND - ffrg=$(hyprctl clients | rg ff) - - ffwin=$(echo $ffrg | sed 's/.*\: //') - # echo $ffwin - - exec hyprctl dispatch focuswindow "class:lw" - exit - fi - fi -else - exec librewolf --name "lw" -fi +if (hyprctl clients -j | from json | where initialTitle == LibreWolf | is-not-empty) { hyprctl dispatch focuswindow "initialtitle:LibreWolf" } else { librewolf --name "lw" } diff --git a/scripts/fflof.bak b/scripts/fflof.bak new file mode 100755 index 0000000..f3ae5bc --- /dev/null +++ b/scripts/fflof.bak @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +export MOZ_ENABLE_WAYLAND=1 +echo $MOZ_ENABLE_WAYLAND + +# Check to see if librewolf is running +if [ $(pgrep -c librewolf) -gt 0 ]; then + echo "ff running" + + if [ "$XDG_SESSION_TYPE" = "x11" ]; then + #X11 + ffrg=$(wmctrl -lx | rg librewolf | awk '{print $1}') + # echo $emacsrg + + if [ -z $ffrg ]; then + exec librewolf + exit + else + exec wmctrl -ia $ffrg + exit + fi + else + if [ "$KDE_FULL_SESSION" = "true" ]; then + echo "KDE" + exec /home/chris/bin/ww -fa librewolf -c librewolf + exit + else + # WAYLAND + ffrg=$(hyprctl clients | rg ff) + + ffwin=$(echo $ffrg | sed 's/.*\: //') + # echo $ffwin + + exec hyprctl dispatch focuswindow "class:lw" + exit + fi + fi +else + exec librewolf --name "lw" +fi From 370aa9615d1efce781309df11331977daa940665 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 1 May 2025 15:32:56 -0500 Subject: [PATCH 02/10] ahh --- .config/eww/eww.scss | 4 ++-- .config/eww/eww.yuck | 4 ++-- home/home.nix | 4 ++-- pkgs/desktop-packages.nix | 1 + scripts/fflof | 6 +++++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index a2d2d41..17e6e6b 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -318,7 +318,7 @@ tooltip label { color: $base03; font-weight: bold; font-size: 14px; - margin-left: -15px; + // margin-left: -10px; margin-right: 8px; } @@ -326,7 +326,7 @@ tooltip label { color: $base03; font-weight: bold; font-size: 14px; - margin-right: 9px; + margin-right: 3px; } .works { diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 9e47993..abe690b 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -292,10 +292,10 @@ (disk) (cpu) (mem) - (volume) ;; {right_modules.width > 1 ? null : (bright)} (bright) - (bat)) + (bat) + (volume)) (label :class "right_sep" :text "|") diff --git a/home/home.nix b/home/home.nix index ac84833..04eec0c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -93,7 +93,7 @@ in { "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; - "application/pdf" = "emacsclient.desktop"; + "application/pdf" = "okular.desktop"; "x-scheme-handler/about" = "librewolf.desktop"; "x-scheme-handler/unknown" = "librewolf.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; @@ -132,7 +132,7 @@ in { "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; - "application/pdf" = "emacsclient.desktop"; + "application/pdf" = "okular.desktop"; "x-scheme-handler/about" = "librewolf.desktop"; "x-scheme-handler/unknown" = "librewolf.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index eb4762e..1404a39 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -22,6 +22,7 @@ kdePackages.breeze kdePackages.dolphin geticons + pdfmixtool # kdePackages.kio-fuse # kdePackages.kio-extras # kdePackages.qtsvg diff --git a/scripts/fflof b/scripts/fflof index 4c772b3..25a02d0 100755 --- a/scripts/fflof +++ b/scripts/fflof @@ -1,3 +1,7 @@ #!/usr/bin/env nu -if (hyprctl clients -j | from json | where initialTitle == LibreWolf | is-not-empty) { hyprctl dispatch focuswindow "initialtitle:LibreWolf" } else { librewolf --name "lw" } +if (hyprctl clients -j | from json | where initialTitle == LibreWolf | is-not-empty) { + hyprctl dispatch focuswindow "initialtitle:LibreWolf" +} else { + librewolf --name "lw" +} From 27ffac56bc09ae61b2cbe1693f27806691f4ad60 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 5 May 2025 12:49:03 -0500 Subject: [PATCH 03/10] add gpu utilization script --- scripts/gpu | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 scripts/gpu diff --git a/scripts/gpu b/scripts/gpu new file mode 100755 index 0000000..30a169c --- /dev/null +++ b/scripts/gpu @@ -0,0 +1,2 @@ +#!/usr/bin/env nu +nvtop -s | from json | get gpu_util | first \ No newline at end of file From df37a2b2147a10ec7023922673d263906ba56864 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 5 May 2025 13:05:43 -0500 Subject: [PATCH 04/10] adding gpu to eww --- .config/eww/eww.scss | 14 ++++++++++++++ .config/eww/eww.yuck | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index 17e6e6b..33b14e8 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -262,6 +262,20 @@ tooltip label { padding-top: 3px; } +.icongpu { + color: $base0E; + // margin: 2px 10px 0px 8px; + padding-top: 3px; + padding-left: 10px; + padding-right: 8px; + // padding-right: 12px; +} + +.gpu_label { + color: $base0E; + padding-top: 3px; +} + // Volume .iconvol { color: $base08; diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index abe690b..6d47fd5 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -17,6 +17,7 @@ (defpoll WLAN_ICON :interval "1m" "scripts/wifi --ICON") (defpoll HOST :interval "1h" "hostname") (defpoll DISK :interval "1m" "disk") +(defpoll gpu :interval "1s" "gpu") ;; (defpoll nextcloud :interval "2s" "scripts/nextcloud.sh") (deflisten volume_percent :interval "0.2s" "tail -F /tmp/vol") (deflisten appname "scripts/appname") @@ -193,6 +194,21 @@ :text "${round(EWW_CPU.avg, 0)}%" :class "cpu_label"))) +(defwidget gpu [] + (box + :class "gpu_module" + :vexpand "false" + :hexpand "false" + :space-evenly false + (button + :onclick "scripts/pop system" + :class "icongpu" + :tooltip "using ${gpu} of gpu" + "󱤓") + (label + :text "${gpu}" + :class "gpu_label"))) + (defwidget mem [] (box :class "mem_module" @@ -291,6 +307,7 @@ :class "sysmodules" (disk) (cpu) + (gpu) (mem) ;; {right_modules.width > 1 ? null : (bright)} (bright) From 9a9e1cef445a8891ecf80fc188ad9cd53dfe5008 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 5 May 2025 13:52:43 -0500 Subject: [PATCH 05/10] more transparent windows --- .config/eww/eww.yuck | 4 ++-- home/modules/hyprland.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 6d47fd5..6fcbfca 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -203,10 +203,10 @@ (button :onclick "scripts/pop system" :class "icongpu" - :tooltip "using ${gpu} of gpu" + :tooltip gpu "󱤓") (label - :text "${gpu}" + :text gpu :class "gpu_label"))) (defwidget mem [] diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 346fd69..96cb273 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -150,7 +150,7 @@ in rounding = 18; # multisample_edges=true active_opacity = 0.97; - inactive_opacity = 0.97; + inactive_opacity = 0.70; fullscreen_opacity = 1.0; blur = { From 5976121dad62745989cc4c1c4702cb04d24a2ddf Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 8 May 2025 14:27:39 -0500 Subject: [PATCH 06/10] fixing up eww for better things --- .config/eww/eww.scss | 12 ++++++----- .config/eww/eww.yuck | 45 +++++++++++---------------------------- home/home.nix | 32 +++++++++++++++++++++------- home/modules/hyprland.nix | 17 +++++++++------ 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index 33b14e8..d99c5a7 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -201,7 +201,9 @@ tooltip label { // Icon Size .iconbat, .iconmem, .iconcpu .iconvol .iconbright { - font-size: 12; + // font-size: 12; + // padding-top: 2px; + // padding-left: 8px; } // Memory @@ -215,8 +217,8 @@ tooltip label { .iconmem { color: $base0A; padding-top: 2px; - padding-left: 10px; - padding-right: 8px; + padding-left: 8px; + // padding-right: 8px; } .mem_label { color: $base0A; @@ -313,12 +315,12 @@ tooltip label { } .icondisk { - font-size: 18; + // font-size: 18; color: $base09; // margin: 3px 5px 0px 3px; padding-top: 3px; padding-left: 5px; - padding-right: 8px; + padding-right: 3px; } .separ { diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 6fcbfca..2182361 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -17,7 +17,7 @@ (defpoll WLAN_ICON :interval "1m" "scripts/wifi --ICON") (defpoll HOST :interval "1h" "hostname") (defpoll DISK :interval "1m" "disk") -(defpoll gpu :interval "1s" "gpu") +(defpoll gpu_percent :interval "1s" "gpu") ;; (defpoll nextcloud :interval "2s" "scripts/nextcloud.sh") (deflisten volume_percent :interval "0.2s" "tail -F /tmp/vol") (deflisten appname "scripts/appname") @@ -139,13 +139,10 @@ :space-evenly false :spacing 0 (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e btop -p 2 &" :class "icondisk" :tooltip "${DISK}" - "󰋊") - (label - :text "${DISK}" - :class "disk_label"))) + "󰋊 ${DISK}"))) (defwidget bright [] (box @@ -158,11 +155,7 @@ :class "iconbright" ;; :onclick "scripts/pop audio" :tooltip "${brightness_percent}%" - "") - (label - :text brightness_percent - :class "bright_label")) - ) + " ${brightness_percent}"))) (defwidget volume [] (box @@ -172,12 +165,9 @@ :space-evenly false (button :class "iconvol" - :onclick "scripts/pop audio" + :onclick "alacritty --class pulsemixer -e pulsemixer &" :tooltip "${volume_percent}%" - "󰕾") - (label - :text volume_percent - :class "vol_label"))) + "󰕾 ${volume_percent}"))) (defwidget cpu [] (box @@ -186,13 +176,10 @@ :hexpand "false" :space-evenly false (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e btop &" :class "iconcpu" :tooltip "using ${EWW_CPU.avg}% of cpu" - "") - (label - :text "${round(EWW_CPU.avg, 0)}%" - :class "cpu_label"))) + " ${round(EWW_CPU.avg, 0)}%"))) (defwidget gpu [] (box @@ -201,13 +188,10 @@ :hexpand "false" :space-evenly false (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e nvtop &" :class "icongpu" - :tooltip gpu - "󱤓") - (label - :text gpu - :class "gpu_label"))) + :tooltip gpu_percent + "󱤓 ${gpu_percent}"))) (defwidget mem [] (box @@ -216,13 +200,10 @@ :vexpand "true" :hexpand "false" (button - :onclick "scripts/pop system" + :onclick "alacritty --class btop -e btop &" :class "iconmem" :tooltip "using ${EWW_RAM.used_mem_perc}% ram" - "") - (label - :text "${round(EWW_RAM.used_mem_perc, 0)}%" - :class "mem_label"))) + " ${round(EWW_RAM.used_mem_perc, 0)}%"))) (defwidget kdeconnect [] (box diff --git a/home/home.nix b/home/home.nix index 04eec0c..8be8c9a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -664,12 +664,12 @@ in { output = [ "DP-1" "eDP-1" ]; position = if laptop then "bottom" else "top"; height = 35; - width = if laptop then 1400 else 2100; + width = if laptop then 1400 else 3000; # Choose the order of the modules "custom/wintitle", modules-left = [ "hyprland/workspaces" "hyprland/window" ]; modules-center = [ ]; modules-right = - [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "tray" "clock" ]; + [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "custom/gpu" "tray" "clock" ]; margin-top = if laptop then -5 else 5; margin-bottom = if laptop then 4 else 0; margin-left = 6; @@ -694,7 +694,7 @@ in { # on-scroll-down = "hyprctl dispatch workspace e-1"; }; tray = { - icon-size = 21; + icon-size = 20; spacing = 10; }; clock = { @@ -704,8 +704,15 @@ in { format-alt = "{:%Y-%m-%d}"; format = "{:%a %b %e, %I:%M %p}"; }; - cpu = { format = " {usage}%"; }; - memory = { format = " {}%"; }; + cpu = { format = " {usage}%"; on-click = "alacritty --class btop -e btop"; }; + memory = { format = " {}%"; on-click = "alacritty --class btop -e btop"; }; + "custom/gpu" = { + exec = "cat /sys/class/hwmon/hwmon0/device/gpu_busy_percent"; + format = "󱤓 {}%"; + return-type = ""; + interval = 1; + on-click = "alacritty --class btop -e nvtop"; + }; temperature = { # "thermal-zone": 2, # "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", @@ -748,7 +755,7 @@ in { }; pulseaudio = { scroll-step = 1; - format = "{icon} {volume}%"; + format = "{icon} {volume}%"; format-muted = "󰝟 muted"; format-source = ""; format-source-muted = ""; @@ -936,7 +943,7 @@ in { padding-right: 5px; border-radius: 20px; transition: none; - color: @base09; + color: @base0A; background: transparent; } @@ -958,6 +965,15 @@ in { background: transparent; } + #custom-gpu { + padding-left: 5px; + padding-right: 5px; + border-radius: 20px; + transition: none; + color: @base08; + background: transparent; + } + #battery { padding-left: 5px; padding-right: 5px; @@ -1434,7 +1450,7 @@ in { padding.y = 10; dynamic_padding = true; }; - terminal.shell.program = "zellij"; + terminal.shell.program = "nu"; font = { normal = { family = "VictorMono Nerd Font"; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 96cb273..3cd70af 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -355,23 +355,26 @@ in # Blur waybar # blurls = "gtk-layer-shell"; + layerrule = [ + # "blur, gtk-layer-shell" + "ignorezero, gtk-layer-shell" + "animation snapslide, gtk-layer-shell" + ]; # blurls=notifications exec-once = [ "kwalletd6" - # "eww daemon" + "eww daemon" "hyprpaper" - # "eww open ${if laptop then "bar0" else "bar1"}" + "eww open ${if laptop then "bar0" else "bar1"}" # "dunst" - "waybar" + # "waybar" "rbw-agent" "hyprctl dispatch --batch 'splitratio 1; splitration -0.35'" "dbus-update-activation-environment --systemd --all" "/usr/lib/kdeconnectd" - # "systemctl --user stop jellyfin-mpv-shim" - # "systemctl --user stop emacs" - "systemctl --user stop nextcloud-client" - # "jellyfin-mpv-shim" + "systemctl --user restart jellyfin-mpv-shim" + "systemctl --user restart nextcloud-client" # "nextcloud" "kdeconnect-indicator" "wl-paste --watch cliphist store" From bd603a3a65522d6c2e30703e7f87418a73b96816 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 8 May 2025 14:28:49 -0500 Subject: [PATCH 07/10] updating --- flake.lock | 108 +++++++++++++++++++------------------- scripts/plasma-startup.sh | 19 ------- scripts/startup.sh | 14 +++++ 3 files changed, 68 insertions(+), 73 deletions(-) delete mode 100755 scripts/plasma-startup.sh create mode 100755 scripts/startup.sh diff --git a/flake.lock b/flake.lock index 6118ec7..1655a68 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1744998480, - "narHash": "sha256-fGXcra5ppvBHLwW2AsmSksxRrYFonfL965n5URIPOtQ=", + "lastModified": 1746525479, + "narHash": "sha256-60BthdWowhsOHgzet3uix08+1s1tD/kzhUX75pf0+uU=", "owner": "sdaqo", "repo": "anipy-cli", - "rev": "24747d398cc68eb61a44538c17e64409c7b407a0", + "rev": "e8785d0205faa1079470fa823df3ab21f30c4a5b", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "lastModified": 1746162366, + "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", "owner": "nix-community", "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", "type": "github" }, "original": { @@ -412,11 +412,11 @@ ] }, "locked": { - "lastModified": 1745340124, - "narHash": "sha256-zQTOl/JPGjiAQoU1yraCGfPBg7yr4nlHNdbZy8Ebrl4=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "c9433ae62fbb4bd09609e242569edc3b551e21a9", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1745198506, - "narHash": "sha256-0hVbHuqAnZUnnGaBTqNes0P0kfH+KKyup2boWDST0iI=", + "lastModified": 1746369725, + "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0cc092405da805da6fa964f5a178343658ceaf0", + "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745320144, - "narHash": "sha256-Rbw+E3Na694sTPjNSRFHtT1o31eQXO3OLEzM+25kcME=", + "lastModified": 1746529785, + "narHash": "sha256-gfBL3G+hepeQzg+vtLF0nd9DB4IggfDuCYUGJaO1Jp0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "84d7c1002734f21f150c641da095c5ce43f1cb98", + "rev": "3779328f563511c7e163d3206142dc409eab1988", "type": "github" }, "original": { @@ -514,11 +514,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1746468201, + "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "type": "github" }, "original": { @@ -530,11 +530,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1745215074, - "narHash": "sha256-JjkdlVI9BImDV5RrCiJk17cMSIqbefUXBM9trHRif+c=", + "lastModified": 1746511170, + "narHash": "sha256-/LHyhxNwop/1lyg9kclGHBpyBadLFZda4z0QOzERUKY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78e2cd1a1590f8c70b329cbc7d13bb2ab5b5a16c", + "rev": "5a837cb8662b841d5e3f491791aa1c389f68b25e", "type": "github" }, "original": { @@ -593,11 +593,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -609,11 +609,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -689,11 +689,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -742,11 +742,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -847,11 +847,11 @@ ] }, "locked": { - "lastModified": 1745289264, - "narHash": "sha256-7nt+UJ7qaIUe2J7BdnEEph9n2eKEwxUwKS/QIr091uA=", + "lastModified": 1746498961, + "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3b7171858c20d5293360042936058fb0c4cb93a9", + "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", "type": "github" }, "original": { @@ -868,11 +868,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1734884447, - "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", + "lastModified": 1746469806, + "narHash": "sha256-kL3cc25sc0x+6gBZYjuE4566RT1E3XLQs4V8sl7D+VE=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "63209b1def2c9fc891ad271f474a3464a5833294", + "rev": "14857a0309d7bbdf7c51bbfa309d0d13448ae77e", "type": "gitlab" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745332124, - "narHash": "sha256-2lRWKSUlKTsfqLhyxXsxKcoPQG5tFQ3GbTne8/vVCQY=", + "lastModified": 1746519367, + "narHash": "sha256-bdCCX84HW4CecAgokOi0BgRBR3JSPeGFlusWAGIh3fE=", "owner": "danth", "repo": "stylix", - "rev": "375b1de2424aac1338ee6e8b4ef15976b64b0462", + "rev": "a2b80b900647f28658a2c9456d9a10ab4aa3b250", "type": "github" }, "original": { @@ -1015,11 +1015,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -1031,11 +1031,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { diff --git a/scripts/plasma-startup.sh b/scripts/plasma-startup.sh deleted file mode 100755 index 0da812e..0000000 --- a/scripts/plasma-startup.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -export MOZ_ENABLE_WAYLAND=1 -export QT_SCALE_FACTOR=1 - -# exec ydotoold & -# exec systemctl enable --user --now libinput-gestures & -# exec emacs --daemon & - - -systemctl --user stop jellyfin-mpv-shim.service & -systemctl --user stop nextcloud-client.service & -systemctl --user stop emacs.service & - -sleep 1 - -exec emacs --daemon & -exec jellyfin-mpv-shim & -exec nextcloud --background & diff --git a/scripts/startup.sh b/scripts/startup.sh new file mode 100755 index 0000000..7c4c3e6 --- /dev/null +++ b/scripts/startup.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +export MOZ_ENABLE_WAYLAND=1 +export QT_SCALE_FACTOR=1 + +# exec ydotoold & +# exec systemctl enable --user --now libinput-gestures & +# exec emacs --daemon & + + +systemctl --user restart jellyfin-mpv-shim.service & +systemctl --user restart nextcloud-client.service & +systemctl --user restart emacs.service & + From bd920ad2741b6587e1f584de5fe1cef7c2d55b82 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 23 May 2025 10:26:31 -0500 Subject: [PATCH 08/10] adding OVMFFull --- modules/desktop.nix | 8 ++++---- pkgs/base-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/desktop.nix b/modules/desktop.nix index 104225d..5f8f6ff 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -205,10 +205,10 @@ in runAsRoot = false; ovmf = { enable = true; - # packages = [ - # pkgs.OVMFFull.fd - # pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd - # ]; + packages = [ + pkgs.OVMFFull.fd + pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd + ]; }; swtpm.enable = true; }; diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 73fca7d..84852f0 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -60,7 +60,7 @@ samba blesh # OVMFFull - # quickemu + quickemu macchina neofetch fwupd From 2de8b374f90ed48dd5918e09ed5dac0e64989f74 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 10 May 2025 07:12:54 -0500 Subject: [PATCH 09/10] make it pertty --- .config/eww/eww.scss | 5 +++++ .config/hypr/hyprpaper.conf | 12 ++++++------ home/home.nix | 2 +- home/modules/hyprland.nix | 20 ++++++++++++-------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index d99c5a7..30e0809 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -233,6 +233,11 @@ tooltip label { // margin: 0px 0px 0px 5px; } +button:hover { + background-color: rgba(00, 00, 00, 0.2); + border-radius: 16px; +} + .iconbat { color: $base0E; // margin: 2px 10px 0px 8px; diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index ae8dd02..8c44ca9 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,6 +1,6 @@ -preload = ~/pics/wallpapers/nixorange.jpeg -wallpaper = DP-2,~/pics/wallpapers/nixorange.jpeg -wallpaper = HDMI-A-1,~/pics/wallpapers/nixorange.jpeg -wallpaper = DP-3,~/pics/wallpapers/nixorange.jpeg -wallpaper = DP-1,~/pics/wallpapers/nixorange.jpeg -wallpaper = eDP-1,~/pics/wallpapers/nixorange.jpeg \ No newline at end of file +preload = ~/pics/wallpapers/tech.jpg +wallpaper = DP-2,~/pics/wallpapers/tech.jpg +wallpaper = HDMI-A-1,~/pics/wallpapers/tech.jpg +wallpaper = DP-3,~/pics/wallpapers/tech.jpg +wallpaper = DP-1,~/pics/wallpapers/tech.jpg +wallpaper = eDP-1,~/pics/wallpapers/tech.jpg \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index 8be8c9a..73b5205 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1444,7 +1444,7 @@ in { enable = true; settings = { window = { - opacity = 1.0; + opacity = 0.9; dynamic_title = true; padding.x = 10; padding.y = 10; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 3cd70af..5906231 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -155,11 +155,12 @@ in blur = { enabled = true; - size = 10; # minimum 1; + size = 15; # minimum 1; passes = 3; # minimum 1, more passes = more resource intensive.; new_optimizations = true; ignore_opacity = false; special = false; + noise = 0.2; }; shadow = { @@ -170,7 +171,7 @@ in scale = 0.998; range = 20; }; - dim_inactive = false; + dim_inactive = true; dim_strength = 0.2; dim_special = 0; }; @@ -264,7 +265,9 @@ in "SUPER,B,exec,/home/chris/bin/fflof" "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer" "SUPERCTRL,i,exec,alacritty --class btop -e btop" - ",Print,exec,screenshot" + "SUPERSHIFT,p,exec,${pkgs.hyprshot}/bin/hyprshot -m region" + "SUPERALT,p,exec,${pkgs.hyprshot}/bin/hyprshot -m window" + "SUPERCTRL,p,exec,${pkgs.hyprshot}/bin/hyprshot -m active" "SUPERSHIFT,mouse_down,exec,zoomin in" "SUPERSHIFT,mouse_up,exec,zoomin out" "SUPERALT,r,exec,zoomin in" @@ -288,10 +291,10 @@ in "SUPERCTRL,l,splitratio,+0.05" "SUPERCTRL,h,splitratio,-0.05" "SUPERSHIFT,c,centerwindow" - "ALTCTRL,l,moveintogroup,right" - "ALTCTRL,h,moveintogroup,left" - "ALTCTRL,k,moveintogroup,up" - "ALTCTRL,j,moveintogroup,down" + "SUPERSHIFT,Right,moveintogroup,right" + "SUPERSHIFT,Left,moveintogroup,left" + "SUPERSHIFT,Up,moveintogroup,up" + "SUPERSHIFT,Down,moveintogroup,down" "SUPERALT,g,togglegroup" "SUPER,1,workspace,1" @@ -369,6 +372,7 @@ in "eww open ${if laptop then "bar0" else "bar1"}" # "dunst" # "waybar" + "swww-daemon" "rbw-agent" "hyprctl dispatch --batch 'splitratio 1; splitration -0.35'" "dbus-update-activation-environment --systemd --all" @@ -379,8 +383,8 @@ in "kdeconnect-indicator" "wl-paste --watch cliphist store" "hyprctl setcursor phinger-cursors-light 24" - # "sleep 3 && swww img /home/chris/pics/wallpapers/nixorange.jpeg --resize crop -t grow --transition-bezier .14,0,.14,.99" "nm-tray" + "swww img /home/chris/pics/wallpapers/tech.jpg --resize crop -t grow --transition-bezier .14,0,.14,.99" # "emacs --daemon" ]; xwayland = { From 1a87a74cf51c26615915dd9c795a0f7741a9174f Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 20 May 2025 06:37:25 -0500 Subject: [PATCH 10/10] aesthetic tweaks --- home/home.nix | 8 +++---- home/modules/hyprland.nix | 49 +++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/home/home.nix b/home/home.nix index 73b5205..34bc359 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1313,7 +1313,7 @@ in { progress_bar_frame_width = 1; progress_bar_min_width = 150; progress_bar_max_width = 300; - transparency = 10; + transparency = 30; separator_height = 2; padding = 10; horizontal_padding = 8; @@ -1334,19 +1334,19 @@ in { dmenu = "${pkgs.rofi}/bin/rofi -dmenu -p dunst:"; }; urgency_low = { - background = "#282a36"; + background = "#282a36aa"; foreground = "#57c7ff"; timeout = 10; }; urgency_normal = { - background = "#282a36"; + background = "#282a36aa"; foreground = "#5af78e"; timeout = 10; }; urgency_critical = { - background = "#282a36"; + background = "#282a36aa"; foreground = "#ff5c57"; frame_color = "#ff0000"; timeout = 0; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 5906231..954fbc5 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -6,12 +6,15 @@ in { home.file.".config/hypr/hyprlock.conf" = { text = '' + auth { + fingerprint:enable = false + } background { monitor = - path = /home/chris/pics/wallpapers/nixorange.png # only png supported for now + path = /home/chris/pics/wallpapers/tech.jpg # only png supported for now blur_passes = 3 # 0 disables blurring - blur_size = 7 - noise = 0.0117 + blur_size = 12 + noise = 0.1 contrast = 0.8916 brightness = 0.8172 vibrancy = 0.1696 @@ -19,22 +22,22 @@ in } input-field { monitor = - size = 200, 50 - outline_thickness = 3 + size = 400, 50 + outline_thickness = 2 dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = false + dots_center = true dots_rounding = -1 # -1 default circle, -2 follow input-field rounding - outer_color = rgb(151515) - inner_color = rgb(200, 200, 200) - font_color = rgb(10, 10, 10) + outer_color = rgb(90, 247, 142) + inner_color = rgb(40, 42, 54) + font_color = rgb(90, 247, 142) fade_on_empty = true fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. placeholder_text = Input Password... # Text rendered in the input box when it's empty. hide_input = false rounding = -1 # -1 means complete rounding (circle/oval) - check_color = rgb(204, 136, 34) - fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color + check_color = rgb(255, 159, 67) + fail_color = rgb(255, 92, 87) # if authentication failed, changes outer_color and fail message color fail_text = $FAIL ($ATTEMPTS) # can be set to empty fail_transition = 300 # transition time in ms between normal outer_color and fail_color capslock_color = -1 @@ -149,7 +152,7 @@ in decoration = { rounding = 18; # multisample_edges=true - active_opacity = 0.97; + active_opacity = 0.90; inactive_opacity = 0.70; fullscreen_opacity = 1.0; @@ -176,6 +179,18 @@ in dim_special = 0; }; + group = { + "col.border_active" = "rgba(282a3600) rgba(57c7ff00) rgba(5af78e00) 45deg"; + "col.border_inactive" = "rgba(282a3655) rgba(57c7ff55) rgba(5af78e55) 45deg"; + groupbar = { + rounding = 16; + gradients = true; + gradient_rounding = 12; + "col.active" = "rgba(282a36ff)"; + "col.inactive" = "rgba(282a3655)"; + }; + }; + bezier = "snapslide,0.07,0.66,0.04,1.02"; animations = { @@ -295,7 +310,7 @@ in "SUPERSHIFT,Left,moveintogroup,left" "SUPERSHIFT,Up,moveintogroup,up" "SUPERSHIFT,Down,moveintogroup,down" - "SUPERALT,g,togglegroup" + "SUPERSHIFT,g,togglegroup" "SUPER,1,workspace,1" "SUPER,2,workspace,2" @@ -330,7 +345,7 @@ in "SUPERALT,a,movetoworkspace,special:agenda" "SUPER,g,togglespecialworkspace,agenda" - "SUPERSHIFT,g,exec,waybar.sh" + # "SUPERSHIFT,g,exec,waybar.sh" "SUPERALT,n,exec,eww update rightside=true" "SUPERCTRL,f,exec,forms-fill.sh" ]; @@ -359,9 +374,13 @@ in # Blur waybar # blurls = "gtk-layer-shell"; layerrule = [ - # "blur, gtk-layer-shell" + "blur, notifications" + # "blur, panel" + "ignorezero, notifications" + "ignorezero, panel" "ignorezero, gtk-layer-shell" "animation snapslide, gtk-layer-shell" + "animation snapslide, panel" ]; # blurls=notifications