Compare commits
No commits in common. "b48035354874b6a7ba7eb2ebf4d97d288d509a42" and "85842b90604b36c523aad8a1cea206150a1453ea" have entirely different histories.
b480353548
...
85842b9060
11 changed files with 25 additions and 150 deletions
|
|
@ -1,6 +1,6 @@
|
|||
$darkbg: #0b0d16;
|
||||
$bg: rgb(40, 42, 54); //rgba(69, 71, 90, 0.3); #0d0f18;
|
||||
$contrastbg: rgba(189, 147, 249, 0.8);
|
||||
$bg: rgb(24, 27, 35); //rgba(69, 71, 90, 0.3); #0d0f18;
|
||||
$contrastbg: #0f111a;
|
||||
$bgSecondary: #11131c;
|
||||
$bgSecondaryAlt: #a5b6cf;
|
||||
$fg: #a5b6cf;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
.osk-toggle {
|
||||
font-size: 30px;
|
||||
min-height: 26px;
|
||||
min-width: 50px;
|
||||
padding: 0px 0px 0px 5px;
|
||||
}
|
||||
|
||||
.notif-panel {
|
||||
min-width: 50px;
|
||||
min-height: 26px;
|
||||
min-height: 16px;
|
||||
font-size: 20px;
|
||||
padding: 2px 25px 2px 35px;
|
||||
}
|
||||
|
|
@ -22,7 +15,7 @@
|
|||
transition: border-color 0.5s ease-in-out;
|
||||
color: #CBA6F7;
|
||||
border-radius: 80px;
|
||||
border: 2px solid #1b1b2b;
|
||||
border: 3px solid $contrastbg;
|
||||
}
|
||||
|
||||
.toggle-off:hover {
|
||||
|
|
@ -35,7 +28,7 @@
|
|||
transition: border-color 0.5s ease-in-out;
|
||||
color: #CBA6F7;
|
||||
border-radius: 80px;
|
||||
border: 2px solid $contrastbg;
|
||||
border: 3px solid #CBA6F7;
|
||||
}
|
||||
|
||||
.toggle-on:hover {
|
||||
|
|
|
|||
|
|
@ -1,32 +1,3 @@
|
|||
(defvar osk-toggle-state false)
|
||||
|
||||
(defwidget osk-toggle []
|
||||
(eventbox :class {osk-toggle-state ? "toggle-on" : "toggle-off"}
|
||||
:onclick "$HYPR_PATH/osk-toggle.sh toggle &"
|
||||
(box :class "osk-toggle"
|
||||
:space-evenly true
|
||||
:spacing 6
|
||||
:orientation "h"
|
||||
(label :text " ")
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
(defwindow osk-toggle
|
||||
:monitor 0
|
||||
:stacking "overlay"
|
||||
:exclusive "ignore"
|
||||
:geometry (geometry :x "10px"
|
||||
:y "9px"
|
||||
:width "0px"
|
||||
:height "0px"
|
||||
:anchor "top left"
|
||||
)
|
||||
(osk-toggle)
|
||||
)
|
||||
|
||||
|
||||
|
||||
(defvar toggle-state false)
|
||||
|
||||
(defwidget tablet-toggle []
|
||||
|
|
@ -46,7 +17,7 @@
|
|||
:monitor 0
|
||||
:stacking "overlay"
|
||||
:exclusive "ignore"
|
||||
:geometry (geometry :x "72px"
|
||||
:geometry (geometry :x "66px"
|
||||
:y "9px"
|
||||
:width "0px"
|
||||
:height "0px"
|
||||
|
|
@ -55,8 +26,6 @@
|
|||
(tablet-toggle)
|
||||
)
|
||||
|
||||
|
||||
|
||||
(defvar notif-panel-state false)
|
||||
|
||||
(defwidget notif-panel []
|
||||
|
|
@ -77,7 +46,7 @@
|
|||
:stacking "overlay"
|
||||
:exclusive "ignore"
|
||||
:geometry (geometry :x "50px"
|
||||
:y "11px"
|
||||
:y "10px"
|
||||
:width "0px"
|
||||
:height "0px"
|
||||
:anchor "top right"
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@ exec-once = bash -c "sleep 7; GalaxyBudsClient /StartMinimized"
|
|||
exec-once = eww daemon
|
||||
exec-once = eww open tablet-toggle
|
||||
exec-once = eww open notif-panel
|
||||
exec-once = eww open osk-toggle
|
||||
# TODO: put this in eww configs?
|
||||
exec-once = $HYPR_PATH/osk-toggle.sh getState
|
||||
|
||||
# sometimes waybar starts after and stops me from pressing eww buttons
|
||||
exec-once = bash -c "sleep 0.5; eww reload"
|
||||
|
|
@ -161,8 +158,6 @@ windowrule = float,^(com.nextcloud.desktopclient.nextcloud)$
|
|||
windowrule = move cursor 0 25,^(com.nextcloud.desktopclient.nextcloud)$
|
||||
windowrule = size 400 581,^(com.nextcloud.desktopclient.nextcloud)$
|
||||
|
||||
windowrule = tile,^(photoshop.exe)$
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||
$mainMod = SUPER
|
||||
|
||||
|
|
@ -222,7 +217,6 @@ bindm = $mainMod, mouse:273, resizewindow
|
|||
|
||||
# Take a screenshot
|
||||
bind =, Print, exec, bash -c 'grim -g "$(slurp)" - | swappy -f -'
|
||||
bind = $mainMod SHIFT, C, exec, wl-color-picker
|
||||
|
||||
# Volume control
|
||||
binde =, XF86AudioRaiseVolume, exec, swayosd --output-volume raise
|
||||
|
|
|
|||
|
|
@ -1,35 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
state () {
|
||||
if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]]; then
|
||||
if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]]
|
||||
then
|
||||
echo "Running"
|
||||
eww update osk-toggle-state=true
|
||||
else
|
||||
echo "Stopped"
|
||||
eww update osk-toggle-state=false
|
||||
fi
|
||||
}
|
||||
|
||||
toggle () {
|
||||
if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]]; then
|
||||
echo "Running"
|
||||
eww update osk-toggle-state=false
|
||||
busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
|
||||
else
|
||||
else
|
||||
echo "Stopped"
|
||||
eww update osk-toggle-state=true
|
||||
busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ $1 == "getState" ]]; then
|
||||
while true; do
|
||||
sleep 0.2
|
||||
state
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ $1 == "toggle" ]];then
|
||||
toggle
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
},
|
||||
{
|
||||
"label": "",
|
||||
"command": "swaync-client -cp; sleep 0.9; eww open closer; $EWW_PATH/open.sh powermenu"
|
||||
"command": "swaync-client -cp; sleep 1; eww open closer; $EWW_PATH/open.sh powermenu"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@
|
|||
|
||||
.widget-volume {
|
||||
background-color: @background;
|
||||
padding: 4px 16px 8px 8px;
|
||||
padding: 4px 8px 8px 8px;
|
||||
margin: 0px 8px 8px 8px;
|
||||
font-size: x-large;
|
||||
border-bottom: 2px solid @accent;
|
||||
|
|
@ -336,7 +336,7 @@
|
|||
|
||||
.widget-backlight {
|
||||
background-color: @background;
|
||||
padding: 8px 16px 4px 8px;
|
||||
padding: 8px 8px 4px 8px;
|
||||
margin: 8px 8px 0px 8px;
|
||||
font-size: x-large;
|
||||
border-top: 2px solid @accent;
|
||||
|
|
|
|||
|
|
@ -37,10 +37,8 @@
|
|||
|
||||
plymouth = {
|
||||
enable = true;
|
||||
#themePackages = [ pkgs.catppuccin-plymouth ];
|
||||
#theme = "catppuccin-macchiato";
|
||||
themePackages = [ (with import <nixpkgs> {}; callPackage ../overlays/dracula-plymouth.nix {}) ];
|
||||
theme = "dracula";
|
||||
themePackages = [ pkgs.catppuccin-plymouth ];
|
||||
theme = "catppuccin-macchiato";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{config, pkgs, lib, ...}:
|
||||
{config, pkgs, ...}:
|
||||
|
||||
{
|
||||
services = {
|
||||
|
|
@ -6,21 +6,12 @@
|
|||
enable = true;
|
||||
layout = "ca";
|
||||
displayManager = {
|
||||
sddm = {
|
||||
gdm = {
|
||||
enable = true;
|
||||
settings = {
|
||||
General = {
|
||||
DisplayServer = "wayland";
|
||||
InputMethod = "";
|
||||
};
|
||||
Wayland.CompositorCommand = "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so";
|
||||
Theme = {
|
||||
Current = "Dracula";
|
||||
ThemeDir = "${pkgs.dracula-theme}/share/sddm/themes";
|
||||
};
|
||||
};
|
||||
wayland = true;
|
||||
};
|
||||
sessionPackages = [
|
||||
pkgs.gnome.gnome-session.sessions # gnome session needed to fix bugs
|
||||
(builtins.getFlake "github:hyprwm/Hyprland").packages.x86_64-linux.default
|
||||
];
|
||||
defaultSession = "hyprland";
|
||||
|
|
@ -48,7 +39,6 @@
|
|||
"/nix/var/log/nix"
|
||||
"/proc"
|
||||
"/run/user/1000"
|
||||
"${pkgs.findutils}/" # doesn't work?
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -163,8 +153,6 @@
|
|||
evtest
|
||||
plasma5Packages.kio-admin
|
||||
plasma5Packages.ksshaskpass
|
||||
plasma5Packages.plasma-framework
|
||||
plasma5Packages.plasma-workspace
|
||||
];
|
||||
|
||||
fonts = {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
(with python311Packages; [
|
||||
python
|
||||
pyclip
|
||||
gdown
|
||||
|
||||
]) ++
|
||||
(with plasma5Packages; [
|
||||
|
|
@ -75,8 +74,6 @@
|
|||
dracula-theme
|
||||
dracula-icon-theme
|
||||
steam-run
|
||||
wineWowPackages.stable
|
||||
cabextract
|
||||
qt5.qtwayland
|
||||
qt6.qtwayland
|
||||
bottles-unwrapped
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dracula-plymouth";
|
||||
version = "unstable-2023-01-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "plymouth";
|
||||
owner = "dracula";
|
||||
rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
|
||||
hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/plymouth/themes
|
||||
mv ./dracula $out/share/plymouth/themes/
|
||||
|
||||
sed -i "s@\/usr\/@$out\/@" $out/share/plymouth/themes/dracula/dracula.plymouth
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dark theme for Plymouth";
|
||||
homepage = "https://github.com/dracula/plymouth/tree/main";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matt1432 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue