Compare commits
5 Commits
ece78f0ec6
...
91ed62194a
Author | SHA1 | Date | |
---|---|---|---|
91ed62194a | |||
7bc90a7723 | |||
02d957480d | |||
f59c9050c3 | |||
28cf6d4489 |
@ -9,6 +9,7 @@
|
|||||||
# syntaxes = {};
|
# syntaxes = {};
|
||||||
# themes = {};
|
# themes = {};
|
||||||
};
|
};
|
||||||
|
bottom.enable = true;
|
||||||
fzf.enable = true;
|
fzf.enable = true;
|
||||||
fzf.enableZshIntegration = true;
|
fzf.enableZshIntegration = true;
|
||||||
gitui = {
|
gitui = {
|
||||||
|
@ -7,8 +7,9 @@ let
|
|||||||
(lib.toUpper (builtins.substring 0 1 str)) +
|
(lib.toUpper (builtins.substring 0 1 str)) +
|
||||||
(builtins.substring 1 (builtins.stringLength str) str);
|
(builtins.substring 1 (builtins.stringLength str) str);
|
||||||
|
|
||||||
accent = config.home-manager.users.${config.mainuser}.catppuccin.accent;
|
accent = "mauve";
|
||||||
flavor = config.home-manager.users.${config.mainuser}.catppuccin.flavor;
|
# accent = "lavender";
|
||||||
|
flavor = "mocha";
|
||||||
size = "standard"; # "standard" "compact"
|
size = "standard"; # "standard" "compact"
|
||||||
tweaks = [ "normal" ]; # "black" "rimless" "normal"
|
tweaks = [ "normal" ]; # "black" "rimless" "normal"
|
||||||
flavorUpper = mkUpper flavor;
|
flavorUpper = mkUpper flavor;
|
||||||
@ -17,14 +18,22 @@ let
|
|||||||
gtkTheme = if flavor == "latte" then "Light" else "Dark";
|
gtkTheme = if flavor == "latte" then "Light" else "Dark";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
imports = [ inputs.catppuccin.nixosModules.catppuccin ];
|
||||||
|
catppuccin.accent = accent;
|
||||||
|
catppuccin.flavor = flavor;
|
||||||
|
boot.loader.grub.catppuccin.enable = true;
|
||||||
|
console.catppuccin.enable = true;
|
||||||
|
|
||||||
home-manager.users.${config.mainuser} = rec {
|
home-manager.users.${config.mainuser} = rec {
|
||||||
imports = [ inputs.catppuccin.homeManagerModules.catppuccin ];
|
imports = [ inputs.catppuccin.homeManagerModules.catppuccin ];
|
||||||
|
catppuccin.accent = accent;
|
||||||
|
catppuccin.flavor = flavor;
|
||||||
|
|
||||||
qt.style.catppuccin.enable = true;
|
qt.style.catppuccin.enable = true;
|
||||||
qt.style.catppuccin.apply = true;
|
qt.style.catppuccin.apply = true;
|
||||||
services.mako.catppuccin.enable = true;
|
services.mako.catppuccin.enable = true;
|
||||||
programs = {
|
programs = {
|
||||||
bat.catppuccin.enable = true;
|
bat.catppuccin.enable = true;
|
||||||
bottom.enable = true;
|
|
||||||
bottom.catppuccin.enable = true;
|
bottom.catppuccin.enable = true;
|
||||||
fzf.catppuccin.enable = true;
|
fzf.catppuccin.enable = true;
|
||||||
gitui.catppuccin.enable = true;
|
gitui.catppuccin.enable = true;
|
||||||
@ -66,7 +75,6 @@ in
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"gopls.ui.semanticTokens" = lib.mkForce true;
|
|
||||||
"editor.semanticHighlighting.enabled" = lib.mkForce true;
|
"editor.semanticHighlighting.enabled" = lib.mkForce true;
|
||||||
"terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
|
"terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
|
||||||
"window.titleBarStyle" = lib.mkForce "custom";
|
"window.titleBarStyle" = lib.mkForce "custom";
|
||||||
@ -77,7 +85,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
wayland.windowManager.hyprland.extraConfig = ''
|
wayland.windowManager.hyprland.extraConfig = ''
|
||||||
exec-once=hyprctl setcursor catppuccin-${flavor}-${accent}-cursors ${toString thm.cursorSize}
|
exec=hyprctl setcursor catppuccin-${flavor}-${accent}-cursors ${toString thm.cursorSize}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# GTK
|
# GTK
|
||||||
@ -118,6 +126,6 @@ in
|
|||||||
iconPackage = lib.mkForce (pkgs.catppuccin-papirus-folders.override { inherit accent flavor; });
|
iconPackage = lib.mkForce (pkgs.catppuccin-papirus-folders.override { inherit accent flavor; });
|
||||||
cursorPackage = lib.mkForce (pkgs.catppuccin-cursors.${flavor + accentUpper});
|
cursorPackage = lib.mkForce (pkgs.catppuccin-cursors.${flavor + accentUpper});
|
||||||
cursorTheme = lib.mkForce "catppuccin-${flavor}-${accent}-cursors";
|
cursorTheme = lib.mkForce "catppuccin-${flavor}-${accent}-cursors";
|
||||||
cursorSize = lib.mkForce 24;
|
cursorSize = lib.mkForce 32;
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -149,6 +149,7 @@ in with config.deviceSpecific; with lib; {
|
|||||||
bind=${modifier},f11,exec,sleep 1 && hyprctl dispatch dpms off
|
bind=${modifier},f11,exec,sleep 1 && hyprctl dispatch dpms off
|
||||||
bind=${modifier},f12,exec,sleep 1 && hyprctl dispatch dpms on
|
bind=${modifier},f12,exec,sleep 1 && hyprctl dispatch dpms on
|
||||||
|
|
||||||
|
bind=${modifier},p,exec,${pkgs.wlogout}/bin/wlogout -b 5
|
||||||
bind=${modifier},escape,exec,${apps.monitor.cmd}
|
bind=${modifier},escape,exec,${apps.monitor.cmd}
|
||||||
bind=${modifier},w,exec,${apps.dmenu.desktop} -show run
|
bind=${modifier},w,exec,${apps.dmenu.desktop} -show run
|
||||||
bind=${modifier}CTRL,w,exec,${apps.dmenu.desktop} -show drun -modi drun -show-icons
|
bind=${modifier}CTRL,w,exec,${apps.dmenu.desktop} -show drun -modi drun -show-icons
|
||||||
@ -281,10 +282,11 @@ in with config.deviceSpecific; with lib; {
|
|||||||
env=QT_AUTO_SCREEN_SCALE_FACTOR=1
|
env=QT_AUTO_SCREEN_SCALE_FACTOR=1
|
||||||
env=QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
env=QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||||
env=QT_QPA_PLATFORMTHEME=qt5ct
|
env=QT_QPA_PLATFORMTHEME=qt5ct
|
||||||
|
env=GSETTINGS_SCHEMA_DIR=${pkgs.glib.getSchemaPath pkgs.gsettings-desktop-schemas}
|
||||||
'' ''
|
'' ''
|
||||||
exec=${importGsettings}
|
exec=${importGsettings}
|
||||||
exec-once=${hyprpaper-pkg}/bin/hyprpaper
|
exec-once=${hyprpaper-pkg}/bin/hyprpaper
|
||||||
exec-once=hyprctl setcursor ${config.lib.base16.theme.cursorTheme} ${toString config.lib.base16.theme.cursorSize}
|
exec=hyprctl setcursor ${config.lib.base16.theme.cursorTheme} ${toString config.lib.base16.theme.cursorSize}
|
||||||
exec-once=${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1
|
exec-once=${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1
|
||||||
exec-once=${pkgs.wl-clipboard}/bin/wl-paste --type text --watch ${pkgs.cliphist}/bin/cliphist store
|
exec-once=${pkgs.wl-clipboard}/bin/wl-paste --type text --watch ${pkgs.cliphist}/bin/cliphist store
|
||||||
exec-once=${pkgs.wl-clipboard}/bin/wl-paste --type image --watch ${pkgs.cliphist}/bin/cliphist store
|
exec-once=${pkgs.wl-clipboard}/bin/wl-paste --type image --watch ${pkgs.cliphist}/bin/cliphist store
|
||||||
|
@ -72,7 +72,7 @@ with config.deviceSpecific; {
|
|||||||
};
|
};
|
||||||
cpu = {
|
cpu = {
|
||||||
interval = 4;
|
interval = 4;
|
||||||
format = "<span color=\"@base\"> </span>{usage}%";
|
format = "<span color=\"#7aa2f7\"> </span>{usage}%";
|
||||||
};
|
};
|
||||||
disk = {
|
disk = {
|
||||||
interval = 60;
|
interval = 60;
|
||||||
|
96
profiles/workspace/wlogout/default.nix
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
{ config, lib, ... }: {
|
||||||
|
home-manager.users.${config.mainuser} = let
|
||||||
|
inherit (config.home-manager.users.${config.mainuser}.catppuccin) sources flavor accent;
|
||||||
|
|
||||||
|
thm = config.lib.base16.theme;
|
||||||
|
palette = (lib.importJSON "${sources.palette}/palette.json").${flavor}.colors;
|
||||||
|
in {
|
||||||
|
programs.wlogout = {
|
||||||
|
enable = true;
|
||||||
|
layout = [{
|
||||||
|
label = "lock";
|
||||||
|
action = "";
|
||||||
|
text = "Lock";
|
||||||
|
} {
|
||||||
|
label = "reboot";
|
||||||
|
action = "systemctl reboot";
|
||||||
|
text = "Reboot";
|
||||||
|
} {
|
||||||
|
label = "shutdown";
|
||||||
|
action = "systemctl poweroff";
|
||||||
|
text = "Shutdown";
|
||||||
|
} {
|
||||||
|
label = "logout";
|
||||||
|
action = "hyprctl dispatch exit 0";
|
||||||
|
text = "Logout";
|
||||||
|
} {
|
||||||
|
label = "suspend";
|
||||||
|
action = "systemctl suspend";
|
||||||
|
text = "Suspend";
|
||||||
|
}];
|
||||||
|
style = ''
|
||||||
|
window {
|
||||||
|
font-family: "${thm.fonts.mono.family}";
|
||||||
|
font-size: 18pt;
|
||||||
|
color: ${palette.text.hex};
|
||||||
|
background-color: rgba(${toString palette.base.rgb.r}, ${toString palette.base.rgb.g}, ${toString palette.base.rgb.b}, 0.8);
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-position: center;
|
||||||
|
background-size: 25%;
|
||||||
|
border: none;
|
||||||
|
background-color: rgba(${toString palette.base.rgb.r}, ${toString palette.base.rgb.g}, ${toString palette.base.rgb.b}, 0);
|
||||||
|
color: ${palette.${accent}.hex};
|
||||||
|
}
|
||||||
|
button:hover {
|
||||||
|
background-color: rgba(${toString palette.surface0.rgb.r}, ${toString palette.surface0.rgb.g}, ${toString palette.surface0.rgb.b}, 0.1);
|
||||||
|
}
|
||||||
|
button:focus {
|
||||||
|
background-color: ${palette.${accent}.hex};
|
||||||
|
color: ${palette.base.hex};
|
||||||
|
}
|
||||||
|
#lock {
|
||||||
|
background-image: image(url("${./lock.png}"));
|
||||||
|
padding: 35px;
|
||||||
|
}
|
||||||
|
#lock:focus {
|
||||||
|
background-image: image(url("${./lock-hover.png}"));
|
||||||
|
padding: 35px;
|
||||||
|
}
|
||||||
|
#logout {
|
||||||
|
background-image: image(url("${./logout.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#logout:focus {
|
||||||
|
background-image: image(url("${./logout-hover.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#suspend {
|
||||||
|
background-image: image(url("${./sleep.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#suspend:focus {
|
||||||
|
background-image: image(url("${./sleep-hover.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#shutdown {
|
||||||
|
background-image: image(url("${./power.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#shutdown:focus {
|
||||||
|
background-image: image(url("${./power-hover.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#reboot {
|
||||||
|
background-image: image(url("${./restart.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
#reboot:focus {
|
||||||
|
background-image: image(url("${./restart-hover.png}"));
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
BIN
profiles/workspace/wlogout/lock-hover.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
profiles/workspace/wlogout/lock.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
profiles/workspace/wlogout/logout-hover.png
Normal file
After Width: | Height: | Size: 3.7 KiB |
BIN
profiles/workspace/wlogout/logout.png
Normal file
After Width: | Height: | Size: 3.7 KiB |
BIN
profiles/workspace/wlogout/power-hover.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
profiles/workspace/wlogout/power.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
profiles/workspace/wlogout/restart-hover.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
profiles/workspace/wlogout/restart.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
profiles/workspace/wlogout/sleep-hover.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
profiles/workspace/wlogout/sleep.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
@ -40,6 +40,7 @@
|
|||||||
proxy
|
proxy
|
||||||
hyprland
|
hyprland
|
||||||
waybar
|
waybar
|
||||||
|
wlogout
|
||||||
xdg
|
xdg
|
||||||
vpn
|
vpn
|
||||||
|
|
||||||
|