From 6b6dc1eb2afe2ddd2de984760961b2b8e63ad8ff Mon Sep 17 00:00:00 2001 From: genofire Date: Fri, 7 Jul 2023 23:22:02 +0200 Subject: [PATCH] improve sway --- home/chrome.nix | 14 +++-- home/default.nix | 2 +- home/desktop-sway.nix | 134 ++++++++++++++++++----------------------- home/desktop.nix | 1 + nixos/desktop-sway.nix | 16 +++++ 5 files changed, 87 insertions(+), 80 deletions(-) diff --git a/home/chrome.nix b/home/chrome.nix index 38feb7f..9b84bb1 100644 --- a/home/chrome.nix +++ b/home/chrome.nix @@ -65,11 +65,17 @@ in version = "2.3"; }) ## Vertical Tabs by Michael + #(createChromiumExtension { + # id = "pddljdmihkpdfpkgmbhdomeeifpklgnm"; + ## "pddljdmihkpdfpkgmbhdomeeifpklgnm" + # sha256 = "19hb2gmkr4fb4mnsyvak0k1w33m3v9yjsad5lzcm8yamna18829y"; + # version = "2.0.4"; + #}) + # Tabs in Sidebar (createChromiumExtension { - id = "pddljdmihkpdfpkgmbhdomeeifpklgnm"; - # "pddljdmihkpdfpkgmbhdomeeifpklgnm" - sha256 = "19hb2gmkr4fb4mnsyvak0k1w33m3v9yjsad5lzcm8yamna18829y"; - version = "2.0.4"; + id = "akahnknmcbmgodngfjcflnaljdbhnlfo"; + sha256 = "0ydbfmhpkwrsf4zyhl4v5abjq7wm46j41r6scq5kbn536lih298q"; + version = "0.0.5"; }) ]; }; diff --git a/home/default.nix b/home/default.nix index 2d20e03..f908838 100644 --- a/home/default.nix +++ b/home/default.nix @@ -117,7 +117,7 @@ enable = true; enableAutosuggestions = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; # initExtra = '' # source ${pkgs.grml-zsh-config}/etc/zsh/zshrc # prompt pure diff --git a/home/desktop-sway.nix b/home/desktop-sway.nix index 3303042..e765437 100644 --- a/home/desktop-sway.nix +++ b/home/desktop-sway.nix @@ -75,6 +75,8 @@ in # wdisplays ]; + services.poweralertd.enable = true; + services.kanshi = { enable = true; profiles = { @@ -114,6 +116,7 @@ in white = "#ffffff"; cyan = "#00afd7"; + transcyan = "#00afd762"; aqua = "#00d787"; violet = "#800080"; wine = "#72003e"; @@ -163,27 +166,27 @@ in # # does it work? # enable = ""; #}; - #"Japan Display Inc. 0x364C Unknown" = { - # position = "0 0"; - # scale = "1.25"; - # enable = ""; - #}; - #"LG Electronics LG HDR 4K 0x0000655D" = { - # position = "2400 0"; - # enable = ""; - # scale = "1.0"; - # # disable = true; - # # resolution = "3840x2160@30Hz"; - # resolution = "3840x2160"; - #}; - #"Goldstar Company Ltd LG HDR 4K 0x0000655D" = { - # position = "2400 0"; - # enable = ""; - # scale = "1.0"; - # # disable = true; - # # resolution = "3840x2160@30Hz"; - # resolution = "3840x2160"; - #}; + # "Japan Display Inc. 0x364C Unknown" = { + # position = "0 0"; + # scale = "1.25"; + # enable = ""; + # }; + # "LG Electronics LG HDR 4K 0x0000655D" = { + # position = "2400 0"; + # enable = ""; + # scale = "1.0"; + # # disable = true; + # # resolution = "3840x2160@30Hz"; + # resolution = "3840x2160"; + # }; + # "Goldstar Company Ltd LG HDR 4K 0x0000655D" = { + # position = "2400 0"; + # enable = ""; + # scale = "1.0"; + # # disable = true; + # # resolution = "3840x2160@30Hz"; + # resolution = "3840x2160"; + # }; #"HEADLESS-1" = { # resolution = "2560x1440"; #}; @@ -202,11 +205,11 @@ in terminal = "alacritty"; fonts = { names = ["monospace"]; style = "monospace"; size = 7.0;}; colors = { - focused = { background = "${cyan}"; border = "${cyan}"; childBorder = "${cyan}"; indicator = "${white}"; text = "${elegant}"; }; - focusedInactive = { background = "${gray}"; border = "${gray}"; childBorder = "${gray}"; indicator = "${magenta}"; text = "${cyan}"; }; - unfocused = { background = "${elegant}"; border = "${elegant}"; childBorder = "${elegant}"; indicator = "${white}"; text = "${orange}"; }; - urgent = { background = "${magenta}"; border = "${magenta}"; childBorder = "${magenta}"; indicator = "${magenta}"; text = "${silver}"; }; - placeholder = { background = "${magenta}"; border = "${magenta}"; childBorder = "${magenta}"; indicator = "${white}"; text = "${silver}"; }; + focused = { background = "${transcyan}"; border = "${transcyan}"; childBorder = "${transcyan}"; indicator = "${white}"; text = "${elegant}"; }; + focusedInactive = { background = "${transparent}"; border = "${transparent}"; childBorder = "${transparent}"; indicator = "${magenta}"; text = "${cyan}"; }; + unfocused = { background = "${transparent}"; border = "${transparent}"; childBorder = "${transparent}"; indicator = "${white}"; text = "${orange}"; }; + urgent = { background = "${magenta}"; border = "${magenta}"; childBorder = "${magenta}"; indicator = "${magenta}"; text = "${silver}"; }; + placeholder = { background = "${magenta}"; border = "${magenta}"; childBorder = "${magenta}"; indicator = "${white}"; text = "${silver}"; }; background = "${transparent}"; }; bars = [{ @@ -216,7 +219,7 @@ in colors = { statusline = "${white}"; # focusedStatusline = "${white}"; - background = "${black}"; + background = "${transparent}"; # focusedBackground = "${transparent}"; activeWorkspace = { background = "${gray}"; border = "${gray}"; text = "${white}"; }; focusedWorkspace = { background = "${cyan}"; border = "${gray}"; text = "${white}"; }; @@ -225,6 +228,18 @@ in bindingMode = { background = "${orange}"; border = "${orange}"; text = "${white}"; }; }; }]; + window = { + border = 1; + titlebar = false; + # hideEdgeBorders = "smart_no_gaps"; + hideEdgeBorders = "smart"; + commands = [ + { command = "move to scratchpad"; criteria = { title = "Firefox.* Sharing Indicator"; }; } + { command = "sticky enable"; criteria = { title = "Picture-in-Picture"; }; } + { command = "floating enable"; criteria = { title = "Picture-in-Picture"; }; } + { command = "floating enable"; criteria = { title = "Extension: \(Tree Style Tab\) - .*"; }; } + ]; + }; gaps = { inner = 2; outer = 0; @@ -364,17 +379,6 @@ in floating = { modifier = modifier; }; - window = { - border = 1; - # hideEdgeBorders = "smart_no_gaps"; - hideEdgeBorders = "smart"; - commands = [ - { command = "move to scratchpad"; criteria = { title = "Firefox.* Sharing Indicator"; }; } - { command = "sticky enable"; criteria = { title = "Picture-in-Picture"; }; } - { command = "floating enable"; criteria = { title = "Picture-in-Picture"; }; } - { command = "floating enable"; criteria = { title = "Extension: \(Tree Style Tab\) - .*"; }; } - ]; - }; startup = [ # { command = "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK"; } # { command = "hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK" ; } @@ -444,7 +448,9 @@ exec_always "cat /proc/acpi/button/lid/*/state | grep -q open && swaymsg output sort = "+time"; backgroundColor = "#000000bf"; - borderColor = "#00afd7"; + borderColor = "#000000bf"; + #borderColor = "#00afd7"; + borderRadius = 4; extraConfig = '' [app-name=""] width=380 @@ -459,31 +465,19 @@ format=%s %h\n%b format=(%g) [%a] %s %h\n%b [actionable] -border-radius=2 +border-radius=4 [urgency=low] -#background-color=#00d787cf -border-color=#00d787 -progress-color=over #00d787c0 +border-color=#00d787a0 +progress-color=over #00d78760 [urgency=normal] -#background-color=#00afd7cf -#background-color=#ff8700df -#border-color=#00afd7 -progress-color=over #00afd7c0 -#progress-color=over #ff8700df +progress-color=over #1c1c1ca0 +#progress-color=over #00afd7a0 [urgency=high] -border-color=#af005f -#background-color=#af005f -#text-color=#e4e4e4 -#progress-color=over #ff8700df -progress-color=over #af005fc0 - -[app-icon="mail-message-new"] -border-color=#00afd7 -background-color=#00afd7c0 -border-size=1 +border-color=#af005fa0 +progress-color=over #af005f60 [app-icon="kdeconnect"] format=%s %h\n%b @@ -491,17 +485,6 @@ border-color=#353535 background-color=#1b1d1e border-size=1 anchor=top-left - -[summary="Log sum7"] -border-color=#ff8700 -background-color=#ff870090 -border-size=1 - -[summary="[Sum7] Alerts"] -format=%s %h\n%b -border-color=#af005f -background-color=#ff870090 -border-size=1 ''; }; @@ -518,7 +501,7 @@ border-size=1 window.opacity = 0.95; font.size = 8; colors.primary = { - background = "0x0a0a0a"; + background = "0x000000"; foreground = "0xffffff"; }; }; @@ -528,24 +511,25 @@ border-size=1 xdg.configFile."i3blocks/bin/battery".source = ./sway-i3block/battery; xdg.configFile."i3blocks/config".text = '' align=center -separator=false -# separator_block_width=15 +separator=true +separator_block_width=15 markup=pango # color=#f8f8f2 color=#e4e4e4 +# background=#00afd7 [root] -label=💽 +label= 💽 command=df -h / | awk 'FNR==2 { gsub(/[A-Za-z]/, ""); printf " %iG\n", $4 }' interval=3 [memory] -label=💾 +label= 💾 command=free --giga | awk 'FNR==2{ printf " %iG\n", $7 }' interval=2 [wifi] -label= +label=  command=~/.config/i3blocks/bin/wifi interval=5 color=#589df6 diff --git a/home/desktop.nix b/home/desktop.nix index a8c780f..c93d716 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -122,6 +122,7 @@ settings = { "general.useragent.override" = ""; "privacy.donottrackheader.enabled" = true; + "mailnews.mark_message_read.auto" = false; }; profiles.default = { isDefault = true; diff --git a/nixos/desktop-sway.nix b/nixos/desktop-sway.nix index becb7d5..e6ae170 100644 --- a/nixos/desktop-sway.nix +++ b/nixos/desktop-sway.nix @@ -66,6 +66,22 @@ }; }; + services.greetd = { + enable = true; + settings = { + default_session = { + # command = "${pkgs.greetd.greetd}/bin/agreety --cmd sway"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -r --remember-user-session --asterisks --cmd sway"; + # missing compositor + # command = "${pkgs.greetd.wlgreet}/bin/wlgreet --command sway"; + }; + }; + # package = pkgs.greetd.tuigreet; + # package = pkgs.greetd.wlgreet; + # package = pkgs.greetd.gtkgreet; + # package = pkgs.greetd.regreet; + }; + programs.sway = { enable = true; wrapperFeatures = { gtk = true; };