diff --git a/README.org b/README.org index 7cedafc..5098a69 100644 --- a/README.org +++ b/README.org @@ -439,6 +439,7 @@ alacritty libsForQt5.bismuth libnotify rofi-wayland +wf-recorder wofi waybar tridactyl-native @@ -2341,7 +2342,9 @@ I also use home-manager for managing dotfiles. This means that everything is con enable = true; }; - home.file.".config/hypr".source = config.lib.file.mkOutOfStoreSymlink ../hypr; + home.file.".config/hypr" = { + source = config.lib.file.mkOutOfStoreSymlink /home/chris/.dotfiles/hypr; + }; home.file.".config/dunst" = { source = ../dunst; @@ -2373,7 +2376,7 @@ I also use home-manager for managing dotfiles. This means that everything is con home.file.".config/mpv" = { source = ../mpv; - recursive = true; + recursive = false; }; home.file.".config/imv" = { diff --git a/eww/eww.yuck b/eww/eww.yuck index 39cd501..ac945fb 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -6,7 +6,7 @@ (include "volume.yuck") (defpoll clock_time :interval "5s" "date '+\%l:\%M \%p'") -(defpoll clock_full :interval "5s" "date '+\%b \%d, \%Y, \%l:\%M \%p'") +(defpoll clock_full :interval "5s" "date '+\%a \%b \%d, \%-I:\%M \%p'") (defpoll clock_date :interval "1h" "date '+%b %d, %Y'") (defpoll calendar_day :interval "2h" "date '+%d'") (defpoll calendar_year :interval "2h" "date '+%Y'") @@ -204,7 +204,7 @@ :orientation "h" :spacing "0" (label - :text {HOST == "kaladin" ? clock_full : clock_time} + :text clock_full :class "clock_time_class" ) (revealer :transition "slideleft" :reveal {HOST == "kaladin" ? false : time_rev} diff --git a/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css b/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css index fc7edd5..cf48502 100644 --- a/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css +++ b/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css @@ -54,11 +54,10 @@ display: flex; justify-content: center; align-items: center; - margin-top: 5px; - max-height: 20px; + margin-top: 0px; min-width: 100% !important; - padding: 0 10px !important; } + .tab-icon-image { margin-top: 4px; } @@ -71,43 +70,36 @@ the close button is positioned to the far right */ -moz-box-flex: 1 } +.tab-label { + margin-top: 5px !important; +} + /* Tab close button */ .tab-close-button { opacity: 1 !important; - min-width: 10px; + min-width: 30px; } #tabs-newtab-button { visibility: hidden !important; } -#tabbrowser-tabs { - max-height: 30px !important; - margin-top: 0px !important; - margin-bottom: -5px !important; - padding-bottom: 0px !important; - max-height: 10px !important; -} - #TabsToolbar{ - margin-top: 8px !important; - margin-bottom: -1px !important; - padding-bottom: opx !important; + margin-top: 0px !important; max-height: 30px; } .tabbrowser-tab, .tab-background, .tab-stack { margin-top: 0px !important; - margin-bottom: 0px !important; - max-height: 10px !important; + max-height: 20px !important; border: none !important; border-radius: 1px !important; } .tab-background { margin-top: 0px !important; - max-height: 10px !important; + max-height: 20px !important; } .tab-background[selected]:-moz-lwtheme { @@ -122,15 +114,6 @@ the close button is positioned to the far right */ padding: 0px !important; } -.tab-close-button { - margin-top: 5px; - min-width: 25px !important; -} - -#navigator-toolbox { - padding: 0px !important; -} - /* Autohide Navbar */ #nav-bar:not([customizing="true"]):not([inFullscreen]) { @@ -178,7 +161,7 @@ the close button is positioned to the far right */ } #urlbar[breakout][breakout-extend] { - margin-top: 14px !important; + margin-top: 0px !important; top: 0px !important; } @@ -187,13 +170,3 @@ the close button is positioned to the far right */ padding-block: calc(2px + (var(--uc-toolbar-height) - var(--urlbar-height)) / 2); padding-inline: calc(5px + 2px); } - -#nav-bar-customization-target{ - margin-top: 0px; -} -#nav-bar-overflow-button{ - margin-top: 0px !important; -} -#PanelUI-button{ - margin-top: 0px !important; -} diff --git a/flake.lock b/flake.lock index 5ba8b05..29b5bbc 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -222,9 +222,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "wlroots": "wlroots", "xdph": "xdph" }, @@ -278,7 +276,7 @@ "inputs": { "cargo2nix": "cargo2nix", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1671049146, @@ -298,7 +296,7 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { @@ -318,16 +316,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654275867, - "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", - "owner": "nixos", + "lastModified": 1672262501, + "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", + "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-22.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -365,6 +363,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1654275867, + "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1670507980, "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", @@ -380,7 +394,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1670700605, "narHash": "sha256-5dlpATkcyITpdtMflhltuD+A3RNpsVI1Mb+dtKkll6Y=", @@ -396,7 +410,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1671983799, "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", @@ -420,7 +434,7 @@ "hyprland": "hyprland", "libre-presenter": "libre-presenter", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" } }, diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 69919a3..7af7519 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -103,6 +103,9 @@ windowrule=workspace 2,emacs windowrule=float,btop windowrule=size 70% 70%,btop windowrule=center,btop +windowrule=float,presenter +windowrule=size 80% 80%,presenter +windowrule=center,presenter # example binds bind=SUPER,RETURN,exec,alacritty @@ -190,4 +193,5 @@ exec-once=/home/chris/bin/startup.sh exec-once=hyprpaper exec-once=dunst exec-once=hyprctl dispatch --batch "splitratio 1; splitration -0.35" -exec-once=dbus-update-activation-environment --systemd --all \ No newline at end of file +exec-once=dbus-update-activation-environment --systemd --all +exec-once=jellyfin-mpv-shim \ No newline at end of file diff --git a/mpv/mpv.conf b/mpv/mpv.conf index f879063..07c94e9 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -2,7 +2,7 @@ osc=no vo=gpu af=scaletempo2 -autofit=2800 +autofit=2800x1800 geometry=50%:50% # input-ipc-server="/tmp/mpvsocket" hwdec=auto diff --git a/scripts/emacslof b/scripts/emacslof index bb06deb..8142450 100755 --- a/scripts/emacslof +++ b/scripts/emacslof @@ -22,7 +22,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then exit else echo WAYLAND - emacsrg=$(wlrctl window list | rg Emacs) + emacsrg=$(wlrctl window list | rg emacs) emacswin=$(echo $emacsrg | sed 's/.*\: //') echo $emacswin diff --git a/scripts/startup.sh b/scripts/startup.sh index 4df2b48..ec78175 100755 --- a/scripts/startup.sh +++ b/scripts/startup.sh @@ -4,13 +4,13 @@ kwalletd5 & systemctl --user stop jellyfin-mpv-shim.service & systemctl --user stop nextcloud-client.service & systemctl --user stop emacs.service & +killall .jellyfin-mpv-shim /usr/lib/kdeconnectd & nm-applet & greenclip daemon & rbw-agent & emacs --daemon & nextcloud --background & -jellyfin-mpv-shim & killall eww diff --git a/scripts/voldown b/scripts/voldown index ba1cea9..9a8a7c1 100755 --- a/scripts/voldown +++ b/scripts/voldown @@ -1,11 +1,11 @@ #!/bin/sh -touch /tmp/vol -awesome-client "naughty.destroy_all_notifications()" +# killall volup +# killall voldown pamixer --allow-boost -d 5 pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga -volume=$(pulsemixer --get-volume | awk '{print $1}' | cut -c 1-2) -echo $volume >> /tmp/vol +volume=$(pulsemixer --get-volume | awk '{print $1}') +echo $volume > /tmp/vol eww open volume diff --git a/scripts/volup b/scripts/volup index d022250..149bd72 100755 --- a/scripts/volup +++ b/scripts/volup @@ -1,20 +1,14 @@ -#!/usr/bin/env bash +#!/bin/sh -touch /tmp/vol -touch /tmp/ewwvol -echo on > /tmp/ewwvol +# killall volup +# killall voldown pamixer --allow-boost -i 5 pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga -volume=$(pulsemixer --get-volume | awk '{print $1}' | cut -c 1-2) -echo $volume >> /tmp/vol -ewwvol=$(cat /tmp/ewwvol) +volume=$(pulsemixer --get-volume | awk '{print $1}') +echo $volume > /tmp/vol eww open volume sleep 3 -if [[ ewwvol == "on" ]]; then - -fi - eww close volume diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index c30abbe..c07d77f 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -316,6 +316,7 @@ libsForQt5.bismuth libnotify rofi-wayland + wf-recorder wofi waybar tridactyl-native diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index a415b59..e27f826 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -335,6 +335,7 @@ libsForQt5.bismuth libnotify rofi-wayland + wf-recorder wofi waybar tridactyl-native diff --git a/user/home.nix b/user/home.nix index 5a0beea..3c2494c 100644 --- a/user/home.nix +++ b/user/home.nix @@ -346,7 +346,9 @@ enable = true; }; - home.file.".config/hypr".source = config.lib.file.mkOutOfStoreSymlink ../hypr; + home.file.".config/hypr" = { + source = config.lib.file.mkOutOfStoreSymlink /home/chris/.dotfiles/hypr; + }; home.file.".config/dunst" = { source = ../dunst; @@ -378,6 +380,7 @@ home.file.".config/mpv" = { source = ../mpv; + recursive = false; }; home.file.".config/imv" = {