diff --git a/dotfiles/niri/config.kdl b/dotfiles/niri/config.kdl index 848d942..001000e 100644 --- a/dotfiles/niri/config.kdl +++ b/dotfiles/niri/config.kdl @@ -95,7 +95,7 @@ environment { // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout layout { // Set gaps around windows in logical pixels. - gaps 32 + gaps 16 // When to center a column when changing focus, options are: // - "never", default behavior, focusing an off-screen column will keep at the left @@ -179,7 +179,7 @@ layout { // If you enable the border, you probably want to disable the focus ring. off - width 4 + width 3 active-color "#ffc87f" inactive-color "#505050" @@ -211,7 +211,7 @@ spawn-at-startup "swww-daemon" spawn-at-startup "wl-paste --type text --watch cliphist store # Stores only text data" spawn-at-startup "wl-paste --type image --watch cliphist store # Stores only image data" spawn-at-startup "~/Code/nixos-config/scripts/swww.sh ~/Code/wallpaper" -spawn-at-startup "firefox" +spawn-at-startup "zen" spawn-at-startup "kitty" hotkey-overlay { @@ -258,6 +258,10 @@ window-rule { default-column-width {} } +window-rule { + match title="rofi" + open-floating true +} // Example: block out two password managers from screen capture. // (This example rule is commented out with a "/-" in front.) /-window-rule { @@ -275,7 +279,7 @@ window-rule { window-rule { geometry-corner-radius 5 clip-to-geometry true - opacity 0.95 + opacity 0.98 } binds { diff --git a/dotfiles/rofi/config.rasi b/dotfiles/rofi/config.rasi new file mode 100644 index 0000000..bd1d15f --- /dev/null +++ b/dotfiles/rofi/config.rasi @@ -0,0 +1,6 @@ +configuration { + font: "Inter Semibold 13px"; + icon-theme: "Papirus-Dark"; +} + +@theme "~/.config/rofi/theme/cherry-midnight.rasi" diff --git a/dotfiles/rofi/images/header-1.jpg b/dotfiles/rofi/images/header-1.jpg new file mode 100644 index 0000000..f9777ef Binary files /dev/null and b/dotfiles/rofi/images/header-1.jpg differ diff --git a/dotfiles/rofi/rofi-session.conf b/dotfiles/rofi/rofi-session.conf new file mode 100644 index 0000000..752fb10 --- /dev/null +++ b/dotfiles/rofi/rofi-session.conf @@ -0,0 +1,8 @@ +# +# rofi-session configuration +# + +icon=true +choices=lockscreen:logout:reboot:shutdown +label=false +theme=~/.config/rofi/theme/cherry-midnight.session.rasi diff --git a/dotfiles/rofi/theme/cherry-midnight.rasi b/dotfiles/rofi/theme/cherry-midnight.rasi new file mode 100644 index 0000000..1163f70 --- /dev/null +++ b/dotfiles/rofi/theme/cherry-midnight.rasi @@ -0,0 +1,104 @@ +configuration { + show-icons: true; + display-run: ">_"; +} + +* { + color0: #33333f; + color1: #ff568e; + color2: #64de83; + color3: #efff73; + color4: #73a9ff; + color5: #946ff7; + color6: #62c6da; + color7: #dedeef; + + bg: #101017f0; + bg-alt: #1f222e; + fg: #bdc3c7; + + color: @fg; + background-color: transparent; + highlight: underline bold #ff568e; + padding: 0; + margin: 0; + border: 0; +} + +window { + width: 480px; + children: [ mainbox]; + location: center; + transparency: "real"; + background-color: @bg; +} + +mainbox { + orientation: vertical; + children: [ inputbar, message, listview, mode-switcher]; + border: 1px; + border-color: @color0; +} + +inputbar { + padding: 1em; + children: [prompt,entry]; + spacing: -1px; +} + +prompt { + background-color: @color1; + padding: 15px; + text-color: @bg; + border-radius: 50% 0 0 50%; +} + +entry { + padding: 15px 30px 15px 15px; + border: 0px; + border-radius: 0 100% 100% 0; + background-color: @bg; + text-color: @fg; +} + +message { + padding: 0 0 1em 0; +} + +textbox { + background-color: @color1; + padding: 0 1.5em; +} + +listview { + margin: 0.5em 0 0 0; + lines: 6; +} + +element { + padding: 0.5em; + color: @fg; +} + +element selected.normal { + background-color: @bg-alt; +} + +element-icon { + padding: 0 0.5em 0 1em; +} + +mode-switcher { + padding: 0 1em; +} + +button { + margin: 0.3em 0 0.5em; + padding: 0.3em; + border-radius: 50%; +} + +button selected { + background-color: @color5; + text-color: @color0; +} diff --git a/dotfiles/rofi/theme/cherry-midnight.session.rasi b/dotfiles/rofi/theme/cherry-midnight.session.rasi new file mode 100644 index 0000000..5aeba97 --- /dev/null +++ b/dotfiles/rofi/theme/cherry-midnight.session.rasi @@ -0,0 +1,93 @@ +configuration { + show-icons: true; +} + +* { + color0: #33333f; + color1: #ff568e; + color2: #64de83; + color3: #efff73; + color4: #73a9ff; + color5: #946ff7; + color6: #62c6da; + color7: #dedeef; + + bg: #101017; + bg-alt: #1f222e; + fg: #bdc3c7; + + color: @fg; + background-color: transparent; + highlight: underline bold #ff568e; + padding: 0; + margin: 0; + border: 0; +} + +window { + children: [ mainbox]; + transparency: "real"; + location: center; + width: 480px; + background-color: #101017f0; +} + +mainbox { + children: [ inputbar, listview, message]; + border: 1px; + border-color: @color0; + background-color: transparent; +} + +inputbar { + children: [ textbox-prompt-colon, prompt]; + spacing: -1px; + padding: 3em; + background-image: url("~/.config/rofi/images/header-1.jpg", width); +} + +textbox-prompt-colon { + expand: false; + str: ""; + padding: 15px; + border-radius: 100% 0 0 100%; + background-color: @color5; + text-color: @bg; +} + +prompt { + padding: 15px 30px 15px 15px; + border: 0px; + border-radius: 0 100% 100% 0; + background-color: #101017f0; +} + +listview { + columns: 6; + lines: 1; + spacing: -1px; + margin: 2em; + border-radius: 50px; + border: 1px; + border-color: @bg-alt; + text-color: @fg; + background-color: #101017f0; +} + +element { + padding: 20px; + border-radius: 50%; + orientation: vertical; + children: [ element-icon]; +} + +element-icon { + size: 32px; +} + +element selected.normal { + border-radius: 50%; + background-color: #ff568e25; + border: 1px; + border-color: #ff568e; +} diff --git a/dotfiles/rofi/theme/cherry.rasi b/dotfiles/rofi/theme/cherry.rasi new file mode 100644 index 0000000..c04a80d --- /dev/null +++ b/dotfiles/rofi/theme/cherry.rasi @@ -0,0 +1,105 @@ +configuration { + show-icons: true; + display-run: ">_"; +} + +* { + color0: #43434f; + color1: #ff568e; + color2: #64de83; + color3: #efff73; + color4: #73a9ff; + color5: #946ff7; + color6: #62c6da; + color7: #dedeef; + + bg: #23232ff0; + bg-alt: #3c3e4d; + fg: #bdc3c7; + + color: @fg; + background-color: transparent; + highlight: underline bold #ff568e; + padding: 0; + margin: 0; + border: 0; +} + +window { + width: 480px; + children: [ mainbox]; + location: center; + transparency: "real"; + background-color: @bg; +} + +mainbox { + orientation: vertical; + children: [ inputbar, message, listview, mode-switcher]; + border: 1px; + border-color: @color0; +} + +inputbar { + padding: 3em; + background-image: url("~/.config/rofi/images/header-1.jpg", width); + children: [prompt,entry]; + spacing: -1px; +} + +prompt { + background-color: @color1; + padding: 15px; + text-color: @bg; + border-radius: 50% 0 0 50%; +} + +entry { + padding: 15px 30px 15px 15px; + border: 0px; + border-radius: 0 100% 100% 0; + background-color: @bg; + text-color: @fg; +} + +message { + padding: 0 0 1em 0; +} + +textbox { + background-color: @color1; + padding: 0 1.5em; +} + +listview { + margin: 0.5em 0 0 0; + lines: 6; +} + +element { + padding: 0.5em; + color: @fg; +} + +element selected.normal { + background-color: @bg-alt; +} + +element-icon { + padding: 0 0.5em 0 1em; +} + +mode-switcher { + padding: 0 1em; +} + +button { + margin: 0.3em 0 0.5em; + padding: 0.3em; + border-radius: 50%; +} + +button selected { + background-color: @color5; + text-color: @color0; +} diff --git a/dotfiles/waybar/config.jsonc b/dotfiles/waybar/config.jsonc index 1329dca..a169240 100644 --- a/dotfiles/waybar/config.jsonc +++ b/dotfiles/waybar/config.jsonc @@ -17,15 +17,15 @@ "niri/window" ], "modules-right": [ - "network", - "cpu", - "memory", + //"network", + //"cpu", + //"memory", "battery", "pulseaudio", - "custom/cliphist", + //"custom/cliphist", "tray", - "clock", - "custom/exit" + "clock" + //"custom/exit" ], "disable-scroll": true, "tray": { @@ -34,7 +34,9 @@ "tooltip": false }, "clock": { - "format": "{:%a %d %b %H:%M}", + //"format": "{:%a %d %b %H:%M}", + "format": "{:L%a %d %b %R}", + "locale": "fr_FR.utf8", "tooltip": false }, "cpu": { @@ -54,7 +56,7 @@ "on-click": "kitty btop" }, "battery": { - "format": "{icon} {capacity}%", + "format": "{icon} {capacity}%", "format-icons": [ "", "", @@ -79,8 +81,8 @@ "pulseaudio": { "scroll-step": 1, "max-volume": 100, - "format": "󰕾 {volume}%", - "format-bluetooth": "󱄠 {volume}%", + "format": "󰕾 {volume}%", + "format-bluetooth": "󱄠 {volume}%", "nospacing": 1, "on-click": "pavucontrol", "tooltip": false @@ -130,5 +132,5 @@ "on-click-right": "sleep 0.1 && ~/Code/nixos-config/scripts/cliphist.sh d", "on-click-middle": "sleep 0.1 && ~/Code/nixos-config/scripts/cliphist.sh w", "tooltip": false - }, + } } diff --git a/dotfiles/waybar/style.css b/dotfiles/waybar/style.css index 63c4aba..c8cb638 100644 --- a/dotfiles/waybar/style.css +++ b/dotfiles/waybar/style.css @@ -20,7 +20,7 @@ * { font-size: 13px; min-height: 0; - font-family: "Iosevka Nerd Font Mono"; + font-family: "Inter Display Medium"; } window#waybar { all: unset; @@ -33,15 +33,16 @@ window#waybar { padding: 0; } .modules-left { - margin-left: 9px; + margin-left: 0px; } .modules-right { - margin-right: 9px; + margin-right: 0px; } tooltip { background: @base; color: @text; } +#custom-appmenu, #custom-wallpaper, #clock, #bluetooth, @@ -56,11 +57,12 @@ tooltip { #window, #workspaces { border-radius: 8px; - background: alpha(@base, 0.75); + background: @base; box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.75); color: @text; padding: 2px 8px; margin: 3px; + min-width: 20px; } #custom-wallpaper:hover, #clock:hover, @@ -76,7 +78,7 @@ tooltip { #window:hover, #workspaces:hover { transition: all 0.3s ease; - background: @base; + background: alpha(@base, 0.85); } #network { @@ -89,7 +91,7 @@ tooltip { } #workspaces button { - padding: 1px; + padding: 0px; margin: 1px; color: @text; border-radius: 50%; diff --git a/scripts/swww.sh b/scripts/swww.sh index 81e2fbd..aec8736 100755 --- a/scripts/swww.sh +++ b/scripts/swww.sh @@ -13,7 +13,7 @@ if [[ $# -lt 1 ]] || [[ ! -d $1 ]]; then fi # Edit below to control the images transition -export SWWW_TRANSITION_FPS=120 +export SWWW_TRANSITION_FPS=240 export SWWW_TRANSITION_DURATION=1 export SWWW_TRANSITION_STEP=2