diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index 30e0809..a2d2d41 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -201,9 +201,7 @@ tooltip label { // Icon Size .iconbat, .iconmem, .iconcpu .iconvol .iconbright { - // font-size: 12; - // padding-top: 2px; - // padding-left: 8px; + font-size: 12; } // Memory @@ -217,8 +215,8 @@ tooltip label { .iconmem { color: $base0A; padding-top: 2px; - padding-left: 8px; - // padding-right: 8px; + padding-left: 10px; + padding-right: 8px; } .mem_label { color: $base0A; @@ -233,11 +231,6 @@ 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; @@ -269,20 +262,6 @@ button:hover { 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; @@ -320,12 +299,12 @@ button:hover { } .icondisk { - // font-size: 18; + font-size: 18; color: $base09; // margin: 3px 5px 0px 3px; padding-top: 3px; padding-left: 5px; - padding-right: 3px; + padding-right: 8px; } .separ { @@ -339,7 +318,7 @@ button:hover { color: $base03; font-weight: bold; font-size: 14px; - // margin-left: -10px; + margin-left: -15px; margin-right: 8px; } @@ -347,7 +326,7 @@ button:hover { color: $base03; font-weight: bold; font-size: 14px; - margin-right: 3px; + margin-right: 9px; } .works { diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 2182361..9e47993 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -17,7 +17,6 @@ (defpoll WLAN_ICON :interval "1m" "scripts/wifi --ICON") (defpoll HOST :interval "1h" "hostname") (defpoll DISK :interval "1m" "disk") -(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,10 +138,13 @@ :space-evenly false :spacing 0 (button - :onclick "alacritty --class btop -e btop -p 2 &" + :onclick "scripts/pop system" :class "icondisk" :tooltip "${DISK}" - "󰋊 ${DISK}"))) + "󰋊") + (label + :text "${DISK}" + :class "disk_label"))) (defwidget bright [] (box @@ -155,7 +157,11 @@ :class "iconbright" ;; :onclick "scripts/pop audio" :tooltip "${brightness_percent}%" - " ${brightness_percent}"))) + "") + (label + :text brightness_percent + :class "bright_label")) + ) (defwidget volume [] (box @@ -165,9 +171,12 @@ :space-evenly false (button :class "iconvol" - :onclick "alacritty --class pulsemixer -e pulsemixer &" + :onclick "scripts/pop audio" :tooltip "${volume_percent}%" - "󰕾 ${volume_percent}"))) + "󰕾") + (label + :text volume_percent + :class "vol_label"))) (defwidget cpu [] (box @@ -176,22 +185,13 @@ :hexpand "false" :space-evenly false (button - :onclick "alacritty --class btop -e btop &" + :onclick "scripts/pop system" :class "iconcpu" :tooltip "using ${EWW_CPU.avg}% of cpu" - " ${round(EWW_CPU.avg, 0)}%"))) - -(defwidget gpu [] - (box - :class "gpu_module" - :vexpand "false" - :hexpand "false" - :space-evenly false - (button - :onclick "alacritty --class btop -e nvtop &" - :class "icongpu" - :tooltip gpu_percent - "󱤓 ${gpu_percent}"))) + "") + (label + :text "${round(EWW_CPU.avg, 0)}%" + :class "cpu_label"))) (defwidget mem [] (box @@ -200,10 +200,13 @@ :vexpand "true" :hexpand "false" (button - :onclick "alacritty --class btop -e btop &" + :onclick "scripts/pop system" :class "iconmem" :tooltip "using ${EWW_RAM.used_mem_perc}% ram" - " ${round(EWW_RAM.used_mem_perc, 0)}%"))) + "") + (label + :text "${round(EWW_RAM.used_mem_perc, 0)}%" + :class "mem_label"))) (defwidget kdeconnect [] (box @@ -288,12 +291,11 @@ :class "sysmodules" (disk) (cpu) - (gpu) (mem) + (volume) ;; {right_modules.width > 1 ? null : (bright)} (bright) - (bat) - (volume)) + (bat)) (label :class "right_sep" :text "|") diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 8c44ca9..ae8dd02 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,6 +1,6 @@ -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 +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 diff --git a/flake.lock b/flake.lock index 1655a68..6118ec7 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1746525479, - "narHash": "sha256-60BthdWowhsOHgzet3uix08+1s1tD/kzhUX75pf0+uU=", + "lastModified": 1744998480, + "narHash": "sha256-fGXcra5ppvBHLwW2AsmSksxRrYFonfL965n5URIPOtQ=", "owner": "sdaqo", "repo": "anipy-cli", - "rev": "e8785d0205faa1079470fa823df3ab21f30c4a5b", + "rev": "24747d398cc68eb61a44538c17e64409c7b407a0", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1743774811, + "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "owner": "nix-community", "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "type": "github" }, "original": { @@ -412,11 +412,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1745340124, + "narHash": "sha256-zQTOl/JPGjiAQoU1yraCGfPBg7yr4nlHNdbZy8Ebrl4=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "c9433ae62fbb4bd09609e242569edc3b551e21a9", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1746369725, - "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", + "lastModified": 1745198506, + "narHash": "sha256-0hVbHuqAnZUnnGaBTqNes0P0kfH+KKyup2boWDST0iI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", + "rev": "b0cc092405da805da6fa964f5a178343658ceaf0", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746529785, - "narHash": "sha256-gfBL3G+hepeQzg+vtLF0nd9DB4IggfDuCYUGJaO1Jp0=", + "lastModified": 1745320144, + "narHash": "sha256-Rbw+E3Na694sTPjNSRFHtT1o31eQXO3OLEzM+25kcME=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "3779328f563511c7e163d3206142dc409eab1988", + "rev": "84d7c1002734f21f150c641da095c5ce43f1cb98", "type": "github" }, "original": { @@ -514,11 +514,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746468201, - "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -530,11 +530,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1746511170, - "narHash": "sha256-/LHyhxNwop/1lyg9kclGHBpyBadLFZda4z0QOzERUKY=", + "lastModified": 1745215074, + "narHash": "sha256-JjkdlVI9BImDV5RrCiJk17cMSIqbefUXBM9trHRif+c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a837cb8662b841d5e3f491791aa1c389f68b25e", + "rev": "78e2cd1a1590f8c70b329cbc7d13bb2ab5b5a16c", "type": "github" }, "original": { @@ -593,11 +593,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -609,11 +609,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -689,11 +689,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -742,11 +742,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1743884191, + "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", "type": "github" }, "original": { @@ -847,11 +847,11 @@ ] }, "locked": { - "lastModified": 1746498961, - "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", + "lastModified": 1745289264, + "narHash": "sha256-7nt+UJ7qaIUe2J7BdnEEph9n2eKEwxUwKS/QIr091uA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", + "rev": "3b7171858c20d5293360042936058fb0c4cb93a9", "type": "github" }, "original": { @@ -868,11 +868,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1746469806, - "narHash": "sha256-kL3cc25sc0x+6gBZYjuE4566RT1E3XLQs4V8sl7D+VE=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "14857a0309d7bbdf7c51bbfa309d0d13448ae77e", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", "type": "gitlab" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746519367, - "narHash": "sha256-bdCCX84HW4CecAgokOi0BgRBR3JSPeGFlusWAGIh3fE=", + "lastModified": 1745332124, + "narHash": "sha256-2lRWKSUlKTsfqLhyxXsxKcoPQG5tFQ3GbTne8/vVCQY=", "owner": "danth", "repo": "stylix", - "rev": "a2b80b900647f28658a2c9456d9a10ab4aa3b250", + "rev": "375b1de2424aac1338ee6e8b4ef15976b64b0462", "type": "github" }, "original": { @@ -1015,11 +1015,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1742851696, + "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", "type": "github" }, "original": { @@ -1031,11 +1031,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1743296873, + "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 34bc359..bd742ac 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" = "okular.desktop"; + "application/pdf" = "emacsclient.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" = "okular.desktop"; + "application/pdf" = "emacsclient.desktop"; "x-scheme-handler/about" = "librewolf.desktop"; "x-scheme-handler/unknown" = "librewolf.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; @@ -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; @@ -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 3000; + width = if laptop then 1400 else 2100; # Choose the order of the modules "custom/wintitle", modules-left = [ "hyprland/workspaces" "hyprland/window" ]; modules-center = [ ]; modules-right = - [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "custom/gpu" "tray" "clock" ]; + [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "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 = 20; + icon-size = 21; spacing = 10; }; clock = { @@ -704,15 +704,8 @@ in { format-alt = "{:%Y-%m-%d}"; format = "{:%a %b %e, %I:%M %p}"; }; - 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"; - }; + cpu = { format = " {usage}%"; }; + memory = { format = " {}%"; }; temperature = { # "thermal-zone": 2, # "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", @@ -755,7 +748,7 @@ in { }; pulseaudio = { scroll-step = 1; - format = "{icon} {volume}%"; + format = "{icon} {volume}%"; format-muted = "󰝟 muted"; format-source = ""; format-source-muted = ""; @@ -943,7 +936,7 @@ in { padding-right: 5px; border-radius: 20px; transition: none; - color: @base0A; + color: @base09; background: transparent; } @@ -965,15 +958,6 @@ 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; @@ -1313,7 +1297,7 @@ in { progress_bar_frame_width = 1; progress_bar_min_width = 150; progress_bar_max_width = 300; - transparency = 30; + transparency = 10; separator_height = 2; padding = 10; horizontal_padding = 8; @@ -1334,19 +1318,19 @@ in { dmenu = "${pkgs.rofi}/bin/rofi -dmenu -p dunst:"; }; urgency_low = { - background = "#282a36aa"; + background = "#282a36"; foreground = "#57c7ff"; timeout = 10; }; urgency_normal = { - background = "#282a36aa"; + background = "#282a36"; foreground = "#5af78e"; timeout = 10; }; urgency_critical = { - background = "#282a36aa"; + background = "#282a36"; foreground = "#ff5c57"; frame_color = "#ff0000"; timeout = 0; @@ -1444,13 +1428,13 @@ in { enable = true; settings = { window = { - opacity = 0.9; + opacity = 1.0; dynamic_title = true; padding.x = 10; padding.y = 10; dynamic_padding = true; }; - terminal.shell.program = "nu"; + terminal.shell.program = "zellij"; font = { normal = { family = "VictorMono Nerd Font"; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 954fbc5..346fd69 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -6,15 +6,12 @@ in { home.file.".config/hypr/hyprlock.conf" = { text = '' - auth { - fingerprint:enable = false - } background { monitor = - path = /home/chris/pics/wallpapers/tech.jpg # only png supported for now + path = /home/chris/pics/wallpapers/nixorange.png # only png supported for now blur_passes = 3 # 0 disables blurring - blur_size = 12 - noise = 0.1 + blur_size = 7 + noise = 0.0117 contrast = 0.8916 brightness = 0.8172 vibrancy = 0.1696 @@ -22,22 +19,22 @@ in } input-field { monitor = - size = 400, 50 - outline_thickness = 2 + size = 200, 50 + outline_thickness = 3 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 = true + dots_center = false dots_rounding = -1 # -1 default circle, -2 follow input-field rounding - outer_color = rgb(90, 247, 142) - inner_color = rgb(40, 42, 54) - font_color = rgb(90, 247, 142) + outer_color = rgb(151515) + inner_color = rgb(200, 200, 200) + font_color = rgb(10, 10, 10) 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(255, 159, 67) - fail_color = rgb(255, 92, 87) # if authentication failed, changes outer_color and fail message color + check_color = rgb(204, 136, 34) + fail_color = rgb(204, 34, 34) # 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 @@ -152,18 +149,17 @@ in decoration = { rounding = 18; # multisample_edges=true - active_opacity = 0.90; - inactive_opacity = 0.70; + active_opacity = 0.97; + inactive_opacity = 0.97; fullscreen_opacity = 1.0; blur = { enabled = true; - size = 15; # minimum 1; + size = 10; # minimum 1; passes = 3; # minimum 1, more passes = more resource intensive.; new_optimizations = true; ignore_opacity = false; special = false; - noise = 0.2; }; shadow = { @@ -174,23 +170,11 @@ in scale = 0.998; range = 20; }; - dim_inactive = true; + dim_inactive = false; dim_strength = 0.2; 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 = { @@ -280,9 +264,7 @@ in "SUPER,B,exec,/home/chris/bin/fflof" "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer" "SUPERCTRL,i,exec,alacritty --class btop -e btop" - "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" + ",Print,exec,screenshot" "SUPERSHIFT,mouse_down,exec,zoomin in" "SUPERSHIFT,mouse_up,exec,zoomin out" "SUPERALT,r,exec,zoomin in" @@ -306,11 +288,11 @@ in "SUPERCTRL,l,splitratio,+0.05" "SUPERCTRL,h,splitratio,-0.05" "SUPERSHIFT,c,centerwindow" - "SUPERSHIFT,Right,moveintogroup,right" - "SUPERSHIFT,Left,moveintogroup,left" - "SUPERSHIFT,Up,moveintogroup,up" - "SUPERSHIFT,Down,moveintogroup,down" - "SUPERSHIFT,g,togglegroup" + "ALTCTRL,l,moveintogroup,right" + "ALTCTRL,h,moveintogroup,left" + "ALTCTRL,k,moveintogroup,up" + "ALTCTRL,j,moveintogroup,down" + "SUPERALT,g,togglegroup" "SUPER,1,workspace,1" "SUPER,2,workspace,2" @@ -345,7 +327,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" ]; @@ -373,37 +355,29 @@ in # Blur waybar # blurls = "gtk-layer-shell"; - layerrule = [ - "blur, notifications" - # "blur, panel" - "ignorezero, notifications" - "ignorezero, panel" - "ignorezero, gtk-layer-shell" - "animation snapslide, gtk-layer-shell" - "animation snapslide, panel" - ]; # 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" - "swww-daemon" + "waybar" "rbw-agent" "hyprctl dispatch --batch 'splitratio 1; splitration -0.35'" "dbus-update-activation-environment --systemd --all" "/usr/lib/kdeconnectd" - "systemctl --user restart jellyfin-mpv-shim" - "systemctl --user restart nextcloud-client" + # "systemctl --user stop jellyfin-mpv-shim" + # "systemctl --user stop emacs" + "systemctl --user stop nextcloud-client" + # "jellyfin-mpv-shim" # "nextcloud" "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 = { diff --git a/modules/desktop.nix b/modules/desktop.nix index 5f8f6ff..104225d 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 84852f0..73fca7d 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -60,7 +60,7 @@ samba blesh # OVMFFull - quickemu + # quickemu macchina neofetch fwupd diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 1404a39..eb4762e 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -22,7 +22,6 @@ kdePackages.breeze kdePackages.dolphin geticons - pdfmixtool # kdePackages.kio-fuse # kdePackages.kio-extras # kdePackages.qtsvg diff --git a/scripts/fflof b/scripts/fflof index 25a02d0..f3ae5bc 100755 --- a/scripts/fflof +++ b/scripts/fflof @@ -1,7 +1,39 @@ -#!/usr/bin/env nu +#!/usr/bin/env bash +export MOZ_ENABLE_WAYLAND=1 +echo $MOZ_ENABLE_WAYLAND -if (hyprctl clients -j | from json | where initialTitle == LibreWolf | is-not-empty) { - hyprctl dispatch focuswindow "initialtitle:LibreWolf" -} else { - librewolf --name "lw" -} +# 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 diff --git a/scripts/fflof.bak b/scripts/fflof.bak deleted file mode 100755 index f3ae5bc..0000000 --- a/scripts/fflof.bak +++ /dev/null @@ -1,39 +0,0 @@ -#!/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 diff --git a/scripts/gpu b/scripts/gpu deleted file mode 100755 index 30a169c..0000000 --- a/scripts/gpu +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env nu -nvtop -s | from json | get gpu_util | first \ No newline at end of file diff --git a/scripts/plasma-startup.sh b/scripts/plasma-startup.sh new file mode 100755 index 0000000..0da812e --- /dev/null +++ b/scripts/plasma-startup.sh @@ -0,0 +1,19 @@ +#!/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 deleted file mode 100755 index 7c4c3e6..0000000 --- a/scripts/startup.sh +++ /dev/null @@ -1,14 +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 restart jellyfin-mpv-shim.service & -systemctl --user restart nextcloud-client.service & -systemctl --user restart emacs.service & -