diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index bfe6632..4651710 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -404,7 +404,7 @@ calendar:indeterminate { color: $base0D; font-size : 14px; font-weight : bold; - // margin : 11px 5px 0px 0px; + margin : 3px 5px 0px 0px; } .app-icon { diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 633b372..aa82f82 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -35,34 +35,6 @@ (literal :content workspace)) -;; (defwidget workspaces [] -;; (box -;; :class "works" -;; :orientation "h" -;; :spacing 5 -;; :space-evenly "false" -;; :valign "center" -;; (button -;; :onclick "hyprctl dispatch workspace 1" -;; :onrightclick "hyprctl dispatch workspace 1 && $HOME/.config/hypr/themes/neon/scripts/default_app" -;; :class "0$o1$f1" "") -;; (button -;; :onclick "hyprctl dispatch workspace 2" -;; :onrightclick "hyprctl dispatch workspace 2 && $HOME/.config/hypr/themes/neon/scripts/default_app" -;; :class "0$o2$f2" "") -;; (button -;; :onclick "hyprctl dispatch workspace 3" -;; :onrightclick "hyprctl dispatch workspace 3 && $HOME/.config/hypr/themes/neon/scripts/default_app" -;; :class "0$o3$f3" "") -;; (button -;; :onclick "hyprctl dispatch workspace 4" -;; :onrightclick "hyprctl dispatch workspace 4 && $HOME/.config/hypr/themes/neon/scripts/default_app" -;; :class "0$o4$f4" "") -;; (button -;; :onclick "hyprctl dispatch workspace 5" -;; :onrightclick "hyprctl dispatch workspace 5 && $HOME/.config/hypr/themes/neon/scripts/default_app" -;; :class "0$o5$f5" ""))) - (defwidget appnames [] (eventbox :onhover "${EWW_CMD} update control_reveal=true" @@ -93,52 +65,6 @@ :class "app-button" :onclick "hyprctl dispatch killactive 1" "")))))) -;; (defwidget bright [] -;; (eventbox -;; :onhover "${EWW_CMD} update br_reveal=true" -;; :onhoverlost "${EWW_CMD} update br_reveal=false" -;; :visible {HOST == "kaladin" ? "false" : "true"} -;; (box -;; :class "module" -;; :space-evenly "false" -;; :orientation "h" -;; :spacing "3" -;; (scale -;; :class "brightbar" -;; :value brightness_percent -;; :orientation "h" -;; :tooltip "${brightness_percent}%" -;; :max 100 -;; :min 0 -;; :onchange "brightnessctl s {}%" ) -;; (label -;; :text "" -;; :class "bright_icon" -;; :tooltip "brightness")))) - -;; (defwidget volume [] -;; (eventbox -;; :onhover "${EWW_CMD} update vol_reveal=true" -;; :onhoverlost "${EWW_CMD} update vol_reveal=false" -;; (box -;; :class "module-2" -;; :space-evenly "false" -;; :orientation "h" -;; :spacing "3" -;; (scale -;; :class "volbar" -;; :value volume_percent -;; :draw-value: true -;; :orientation "h" -;; :tooltip "${volume_percent}%" -;; :max 150 -;; :min 0 -;; :onchange "pamixer --set-volume {}" ) -;; (button -;; :onclick "scripts/pop audio" -;; :class "volume_icon" -;; "墳")))) - (defwidget wifi [] (eventbox :onhover "${EWW_CMD} update wifi_rev=true" diff --git a/.config/rofi/launchers-git/launcher.sh b/.config/rofi/launchers-git/launcher.sh deleted file mode 100755 index 5ed7804..0000000 --- a/.config/rofi/launchers-git/launcher.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -if [ $(hostname) = "syl" ]; then - if [ $XDG_SESSION_TYPE = "x11" ]; then - style="laptop" - else - style="laptop-wayland" - #echo "this is hidpi" - fi -else - style="desktop" - #echo "this is not hidpi" -fi - -rofi -no-lazy-grab -modi combi -show combi -combi-modi "drun,run" -theme launchers-git/"$style".rasi -# wofi --show drun,run - - -# $@ & -# c=0 -# while ! xprop -f _KDE_NET_WM_BLUR_BEHIND_REGION 32c -set _KDE_NET_WM_BLUR_BEHIND_REGION 0 -id $(xdotool search -class 'rofi') ; do -# sleep .1 -# c=$((c+1)) -# [[ c = 50 ]] && exit; # stop script window didn't appear after 5 seconds -# done diff --git a/home/home.nix b/home/home.nix index cc90740..1a6d2ea 100644 --- a/home/home.nix +++ b/home/home.nix @@ -22,7 +22,17 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; + xdg.userDirs.desktop = "${config.home.homeDirectory}/desk"; + xdg.userDirs.documents = "${config.home.homeDirectory}/docs"; + xdg.userDirs.download = "${config.home.homeDirectory}/dls"; + xdg.userDirs.music = "${config.home.homeDirectory}/music"; + xdg.userDirs.pictures = "${config.home.homeDirectory}/pics"; + xdg.userDirs.publicShare = "${config.home.homeDirectory}/public"; + # xdg.userDirs.temptlates = "${config.home.homeDirectory}/templates"; + xdg.userDirs.videos = "${config.home.homeDirectory}/vids"; + accounts.email = { + maildirBasePath = "$HOME/mail"; accounts = { personal = { address = "chris@cochrun.xyz"; @@ -125,7 +135,6 @@ home.file.".config/mpv" = { source = ../.config/mpv; - recursive = true; }; services.nextcloud-client = { diff --git a/LightlyShaders/default.nix b/pkgs/LightlyShaders/default.nix similarity index 100% rename from LightlyShaders/default.nix rename to pkgs/LightlyShaders/default.nix diff --git a/LightlyShaders/flake.lock b/pkgs/LightlyShaders/flake.lock similarity index 100% rename from LightlyShaders/flake.lock rename to pkgs/LightlyShaders/flake.lock diff --git a/LightlyShaders/flake.nix b/pkgs/LightlyShaders/flake.nix similarity index 100% rename from LightlyShaders/flake.nix rename to pkgs/LightlyShaders/flake.nix diff --git a/RoundedSBE/default.nix b/pkgs/RoundedSBE/default.nix similarity index 100% rename from RoundedSBE/default.nix rename to pkgs/RoundedSBE/default.nix diff --git a/RoundedSBE/flake.lock b/pkgs/RoundedSBE/flake.lock similarity index 100% rename from RoundedSBE/flake.lock rename to pkgs/RoundedSBE/flake.lock diff --git a/RoundedSBE/flake.nix b/pkgs/RoundedSBE/flake.nix similarity index 100% rename from RoundedSBE/flake.nix rename to pkgs/RoundedSBE/flake.nix diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 98ae779..29111d4 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -137,7 +137,7 @@ with lib; python3 airshipper # hyprland - (callPackage ../ydotool { }) + # (callPackage ./ydotool { }) # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders # (libsForQt5.callPackage /home/chris/.dotfiles/RoundedSBE {}) # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter diff --git a/.config/ydotool/default.nix b/pkgs/ydotool/default.nix similarity index 100% rename from .config/ydotool/default.nix rename to pkgs/ydotool/default.nix diff --git a/scripts/geticons b/scripts/geticons new file mode 100755 index 0000000..32c27b6 Binary files /dev/null and b/scripts/geticons differ diff --git a/scripts/launcher.sh b/scripts/launcher.sh deleted file mode 120000 index fa0f119..0000000 --- a/scripts/launcher.sh +++ /dev/null @@ -1 +0,0 @@ -/home/chris/.dotfiles/rofi/launchers-git/launcher.sh \ No newline at end of file diff --git a/scripts/launcher.sh b/scripts/launcher.sh new file mode 100755 index 0000000..5ed7804 --- /dev/null +++ b/scripts/launcher.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +if [ $(hostname) = "syl" ]; then + if [ $XDG_SESSION_TYPE = "x11" ]; then + style="laptop" + else + style="laptop-wayland" + #echo "this is hidpi" + fi +else + style="desktop" + #echo "this is not hidpi" +fi + +rofi -no-lazy-grab -modi combi -show combi -combi-modi "drun,run" -theme launchers-git/"$style".rasi +# wofi --show drun,run + + +# $@ & +# c=0 +# while ! xprop -f _KDE_NET_WM_BLUR_BEHIND_REGION 32c -set _KDE_NET_WM_BLUR_BEHIND_REGION 0 -id $(xdotool search -class 'rofi') ; do +# sleep .1 +# c=$((c+1)) +# [[ c = 50 ]] && exit; # stop script window didn't appear after 5 seconds +# done diff --git a/systemd/user/aw-qt.service b/systemd-units/user/aw-qt.service similarity index 100% rename from systemd/user/aw-qt.service rename to systemd-units/user/aw-qt.service diff --git a/systemd/user/jellyfin-mpv-shim.service b/systemd-units/user/jellyfin-mpv-shim.service similarity index 100% rename from systemd/user/jellyfin-mpv-shim.service rename to systemd-units/user/jellyfin-mpv-shim.service diff --git a/systemd/user/lolcate-update.service b/systemd-units/user/lolcate-update.service similarity index 100% rename from systemd/user/lolcate-update.service rename to systemd-units/user/lolcate-update.service diff --git a/systemd/user/lolcate-update.timer b/systemd-units/user/lolcate-update.timer similarity index 100% rename from systemd/user/lolcate-update.timer rename to systemd-units/user/lolcate-update.timer diff --git a/systemd/user/mail.service b/systemd-units/user/mail.service similarity index 100% rename from systemd/user/mail.service rename to systemd-units/user/mail.service diff --git a/systemd/user/mail.timer b/systemd-units/user/mail.timer similarity index 100% rename from systemd/user/mail.timer rename to systemd-units/user/mail.timer diff --git a/systemd/user/secretserviced.service b/systemd-units/user/secretserviced.service similarity index 100% rename from systemd/user/secretserviced.service rename to systemd-units/user/secretserviced.service