format
This commit is contained in:
Kopatz
@@ -1,22 +1,24 @@
|
||||
{ osConfig, config, pkgs, inputs, lib, ... }: {
|
||||
config = lib.mkIf osConfig.custom.graphical.code.enable rec {
|
||||
home.activation.makeVSCodeConfigWritable = let
|
||||
configDirName = {
|
||||
"vscode" = "Code";
|
||||
"vscode-insiders" = "Code - Insiders";
|
||||
"vscodium" = "VSCodium";
|
||||
}.${programs.vscode.package.pname};
|
||||
configPath =
|
||||
"${config.xdg.configHome}/${configDirName}/User/settings.json";
|
||||
in {
|
||||
after = [ "writeBoundary" ];
|
||||
before = [ ];
|
||||
data = ''
|
||||
if [ -e "$(readlink ${configPath})" ]; then
|
||||
install -m 0640 "$(readlink ${configPath})" ${configPath}
|
||||
fi
|
||||
'';
|
||||
};
|
||||
home.activation.makeVSCodeConfigWritable =
|
||||
let
|
||||
configDirName = {
|
||||
"vscode" = "Code";
|
||||
"vscode-insiders" = "Code - Insiders";
|
||||
"vscodium" = "VSCodium";
|
||||
}.${programs.vscode.package.pname};
|
||||
configPath =
|
||||
"${config.xdg.configHome}/${configDirName}/User/settings.json";
|
||||
in
|
||||
{
|
||||
after = [ "writeBoundary" ];
|
||||
before = [ ];
|
||||
data = ''
|
||||
if [ -e "$(readlink ${configPath})" ]; then
|
||||
install -m 0640 "$(readlink ${configPath})" ${configPath}
|
||||
fi
|
||||
'';
|
||||
};
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ config, pkgs, inputs, ...}:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -122,9 +122,9 @@
|
||||
"pdfjs.enableScripting" = true;
|
||||
|
||||
# copied these from a blog
|
||||
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
||||
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
||||
"browser.newtabpage.activity-stream.feeds.asrouterfeed" = false;
|
||||
"browser.newtabpage.activity-stream.telemetry" = false;
|
||||
"browser.newtabpage.activity-stream.telemetry" = false;
|
||||
"browser.ping-centre.telemetry" = false;
|
||||
"devtools.onboarding.telemetry.logged" = false;
|
||||
"accessibility.force_disabled" = 1;
|
||||
|
||||
@@ -58,7 +58,8 @@ let
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
stylix = lib.mkIf osConfig.custom.graphical.stylix.enable {
|
||||
targets.firefox = {
|
||||
profileNames = [ "default" ];
|
||||
|
||||
@@ -58,7 +58,8 @@ let
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.floorp = {
|
||||
enable = true;
|
||||
policies = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ...}:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
home.file.".gitconfig" = {
|
||||
enable = true;
|
||||
|
||||
@@ -12,7 +12,8 @@ let
|
||||
'';
|
||||
monitor1 = if isPc then "DP-1" else if isLaptop then "eDP-1" else "eDP-1";
|
||||
monitor2 = "HDMI-A-1";
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
home.file.".config/hypr/hyprshade.toml".source =
|
||||
@@ -29,21 +30,22 @@ in {
|
||||
#
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
monitor = if isPc then [
|
||||
"${monitor2},1920x1080@60,0x0,1"
|
||||
"${monitor1},2560x1440@144,1920x0,1"
|
||||
"Unknown-1,disable"
|
||||
] else if isLaptop then [
|
||||
# laptop
|
||||
"eDP-1,1920x1080@60,0x0,1"
|
||||
#"DP-3,1920x1080@60,1920x0,1"
|
||||
#",preferred,auto,1,mirror,eDP-1"
|
||||
",preferred,auto,auto"
|
||||
] else
|
||||
[
|
||||
# Default
|
||||
monitor =
|
||||
if isPc then [
|
||||
"${monitor2},1920x1080@60,0x0,1"
|
||||
"${monitor1},2560x1440@144,1920x0,1"
|
||||
"Unknown-1,disable"
|
||||
] else if isLaptop then [
|
||||
# laptop
|
||||
"eDP-1,1920x1080@60,0x0,1"
|
||||
#"DP-3,1920x1080@60,1920x0,1"
|
||||
#",preferred,auto,1,mirror,eDP-1"
|
||||
",preferred,auto,auto"
|
||||
];
|
||||
] else
|
||||
[
|
||||
# Default
|
||||
",preferred,auto,auto"
|
||||
];
|
||||
|
||||
workspace =
|
||||
lib.lists.optionals (osConfig.networking.hostName == "kop-pc") [
|
||||
@@ -181,90 +183,92 @@ in {
|
||||
"$mainMod" = "SUPER";
|
||||
|
||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||
bind = let
|
||||
rofi = "${pkgs.rofi-wayland}/bin/rofi";
|
||||
kitty = "${pkgs.kitty}/bin/kitty";
|
||||
#dolphin = "${pkgs.dolphin}/bin/dolphin";
|
||||
thunar = "${pkgs.xfce.thunar}/bin/thunar";
|
||||
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
||||
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||
grim = "${pkgs.grim}/bin/grim";
|
||||
slurp = "${pkgs.slurp}/bin/slurp";
|
||||
swww = "${pkgs.swww}/bin/swww";
|
||||
pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep";
|
||||
brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
|
||||
#swaylock = "${pkgs.swaylock}/bin/swaylock";
|
||||
hyprlock = "${pkgs.hyprlock}/bin/hyprlock";
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
in [
|
||||
"$mainMod, Q, exec, ${kitty}"
|
||||
"$mainMod, C, killactive"
|
||||
#"$mainMod, L, exec, ${swaylock} -f -c 000000"
|
||||
"$mainMod, L, exec, ${hyprlock}"
|
||||
"$mainMod, M, exit,"
|
||||
"$mainMod, E, exec, ${thunar}"
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod, V, togglefloating"
|
||||
"$mainMod, I, exec, ${rofi} -show drun -show-icons"
|
||||
''
|
||||
$mainMod, S, exec, cat ~/songs | shuf -n 1 | sed "s/^/b.p /g" | ${wl-copy}''
|
||||
"$mainMod, R, exec, ${swww} img $(ls -d /synced/default/dinge/Bg/* | shuf -n 1)"
|
||||
"$mainMod, W, exec, ${swww} img ${config.stylix.image}"
|
||||
" , Print, exec, ${grim} -g \"$(${slurp} -d)\" - | ${wl-copy}"
|
||||
''
|
||||
$mainMod, Print, exec, ${grim} -g "$(${slurp} -d)" /tmp/$(date +'%s_grim.png')''
|
||||
''
|
||||
Shift_L, Print, exec, ${grim} -g "$(${slurp} -d)" ~/Pictures/$(date +'%s_grim.png')''
|
||||
"$mainMod, SPACE, exec, ${rofi} -modi drun -show drun -config ~/.config/rofi/rofidmenu.rasi"
|
||||
" , XF86MonBrightnessUp, exec, ${brightnessctl} s +5%"
|
||||
" , XF86MonBrightnessDown, exec, ${brightnessctl} s 5%-"
|
||||
" , XF86AudioPlay, exec, ${playerctl} play-pause"
|
||||
" , XF86AudioNext, exec, ${playerctl} next"
|
||||
" , XF86AudioPrev, exec, ${playerctl} previous"
|
||||
"$mainMod, P, pseudo" # dwindle
|
||||
"$mainMod, J, togglesplit" # dwindle
|
||||
# Move focus with mainMod + arrow keys
|
||||
"$mainMod, left, movefocus, l"
|
||||
"$mainMod, right, movefocus, r"
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
"$mainMod SHIFT, left, resizeactive, -30 0"
|
||||
"$mainMod SHIFT, right, resizeactive, 30 0"
|
||||
"$mainMod SHIFT, up, resizeactive, 0 -30"
|
||||
"$mainMod SHIFT, down, resizeactive, 0 30"
|
||||
bind =
|
||||
let
|
||||
rofi = "${pkgs.rofi-wayland}/bin/rofi";
|
||||
kitty = "${pkgs.kitty}/bin/kitty";
|
||||
#dolphin = "${pkgs.dolphin}/bin/dolphin";
|
||||
thunar = "${pkgs.xfce.thunar}/bin/thunar";
|
||||
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
||||
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||
grim = "${pkgs.grim}/bin/grim";
|
||||
slurp = "${pkgs.slurp}/bin/slurp";
|
||||
swww = "${pkgs.swww}/bin/swww";
|
||||
pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep";
|
||||
brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
|
||||
#swaylock = "${pkgs.swaylock}/bin/swaylock";
|
||||
hyprlock = "${pkgs.hyprlock}/bin/hyprlock";
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
in
|
||||
[
|
||||
"$mainMod, Q, exec, ${kitty}"
|
||||
"$mainMod, C, killactive"
|
||||
#"$mainMod, L, exec, ${swaylock} -f -c 000000"
|
||||
"$mainMod, L, exec, ${hyprlock}"
|
||||
"$mainMod, M, exit,"
|
||||
"$mainMod, E, exec, ${thunar}"
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod, V, togglefloating"
|
||||
"$mainMod, I, exec, ${rofi} -show drun -show-icons"
|
||||
''
|
||||
$mainMod, S, exec, cat ~/songs | shuf -n 1 | sed "s/^/b.p /g" | ${wl-copy}''
|
||||
"$mainMod, R, exec, ${swww} img $(ls -d /synced/default/dinge/Bg/* | shuf -n 1)"
|
||||
"$mainMod, W, exec, ${swww} img ${config.stylix.image}"
|
||||
" , Print, exec, ${grim} -g \"$(${slurp} -d)\" - | ${wl-copy}"
|
||||
''
|
||||
$mainMod, Print, exec, ${grim} -g "$(${slurp} -d)" /tmp/$(date +'%s_grim.png')''
|
||||
''
|
||||
Shift_L, Print, exec, ${grim} -g "$(${slurp} -d)" ~/Pictures/$(date +'%s_grim.png')''
|
||||
"$mainMod, SPACE, exec, ${rofi} -modi drun -show drun -config ~/.config/rofi/rofidmenu.rasi"
|
||||
" , XF86MonBrightnessUp, exec, ${brightnessctl} s +5%"
|
||||
" , XF86MonBrightnessDown, exec, ${brightnessctl} s 5%-"
|
||||
" , XF86AudioPlay, exec, ${playerctl} play-pause"
|
||||
" , XF86AudioNext, exec, ${playerctl} next"
|
||||
" , XF86AudioPrev, exec, ${playerctl} previous"
|
||||
"$mainMod, P, pseudo" # dwindle
|
||||
"$mainMod, J, togglesplit" # dwindle
|
||||
# Move focus with mainMod + arrow keys
|
||||
"$mainMod, left, movefocus, l"
|
||||
"$mainMod, right, movefocus, r"
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
"$mainMod SHIFT, left, resizeactive, -30 0"
|
||||
"$mainMod SHIFT, right, resizeactive, 30 0"
|
||||
"$mainMod SHIFT, up, resizeactive, 0 -30"
|
||||
"$mainMod SHIFT, down, resizeactive, 0 30"
|
||||
|
||||
|
||||
# Switch workspaces with mainMod + [0-9]
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
"$mainMod, 3, workspace, 3"
|
||||
"$mainMod, 4, workspace, 4"
|
||||
"$mainMod, 5, workspace, 5"
|
||||
"$mainMod, 6, workspace, 6"
|
||||
"$mainMod, 7, workspace, 7"
|
||||
"$mainMod, 8, workspace, 8"
|
||||
"$mainMod, 9, workspace, 9"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
# Switch workspaces with mainMod + [0-9]
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
"$mainMod, 3, workspace, 3"
|
||||
"$mainMod, 4, workspace, 4"
|
||||
"$mainMod, 5, workspace, 5"
|
||||
"$mainMod, 6, workspace, 6"
|
||||
"$mainMod, 7, workspace, 7"
|
||||
"$mainMod, 8, workspace, 8"
|
||||
"$mainMod, 9, workspace, 9"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
|
||||
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||
"$mainMod SHIFT, 1, movetoworkspace, 1"
|
||||
"$mainMod SHIFT, 2, movetoworkspace, 2"
|
||||
"$mainMod SHIFT, 3, movetoworkspace, 3"
|
||||
"$mainMod SHIFT, 4, movetoworkspace, 4"
|
||||
"$mainMod SHIFT, 5, movetoworkspace, 5"
|
||||
"$mainMod SHIFT, 6, movetoworkspace, 6"
|
||||
"$mainMod SHIFT, 7, movetoworkspace, 7"
|
||||
"$mainMod SHIFT, 8, movetoworkspace, 8"
|
||||
"$mainMod SHIFT, 9, movetoworkspace, 9"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||
"$mainMod SHIFT, 1, movetoworkspace, 1"
|
||||
"$mainMod SHIFT, 2, movetoworkspace, 2"
|
||||
"$mainMod SHIFT, 3, movetoworkspace, 3"
|
||||
"$mainMod SHIFT, 4, movetoworkspace, 4"
|
||||
"$mainMod SHIFT, 5, movetoworkspace, 5"
|
||||
"$mainMod SHIFT, 6, movetoworkspace, 6"
|
||||
"$mainMod SHIFT, 7, movetoworkspace, 7"
|
||||
"$mainMod SHIFT, 8, movetoworkspace, 8"
|
||||
"$mainMod SHIFT, 9, movetoworkspace, 9"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
|
||||
# Scroll through existing workspaces with mainMod + scroll
|
||||
"$mainMod, mouse_down, workspace, e+1"
|
||||
"$mainMod, mouse_up, workspace, e-1"
|
||||
# Scroll through existing workspaces with mainMod + scroll
|
||||
"$mainMod, mouse_down, workspace, e+1"
|
||||
"$mainMod, mouse_up, workspace, e-1"
|
||||
|
||||
# "ALT, Tab, cyclenext,"
|
||||
# "ALT, Tab, bringactivetotop,"
|
||||
];
|
||||
# "ALT, Tab, cyclenext,"
|
||||
# "ALT, Tab, bringactivetotop,"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||
@@ -318,44 +322,46 @@ in {
|
||||
"xrandr --monitor ${monitor1} --primary"
|
||||
];
|
||||
};
|
||||
extraConfig = let
|
||||
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
||||
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||
dunstify = "${pkgs.dunst}/bin/dunstify";
|
||||
dunstctl = "${pkgs.dunst}/bin/dunstctl";
|
||||
pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep --cache";
|
||||
path = "/synced/fh/os-hardening/**/slides";
|
||||
in ''
|
||||
bind = $mainMod, A, submap, notes
|
||||
extraConfig =
|
||||
let
|
||||
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
||||
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||
dunstify = "${pkgs.dunst}/bin/dunstify";
|
||||
dunstctl = "${pkgs.dunst}/bin/dunstctl";
|
||||
pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep --cache";
|
||||
path = "/synced/fh/os-hardening/**/slides";
|
||||
in
|
||||
''
|
||||
bind = $mainMod, A, submap, notes
|
||||
|
||||
submap = notes
|
||||
# below
|
||||
bind = $mainMod, B, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -B 15 -h -i "{}" ${path}/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
|
||||
# above
|
||||
bind = $mainMod, A, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -A 15 -h -i "{}" ${path}/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
|
||||
# context
|
||||
bind = $mainMod, C, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ${path}/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
|
||||
# trim
|
||||
bind = $mainMod, T, exec, ${wl-paste} | sed 's/[ \t]*$//' | sed 's/^[ \t]*//' | sed '/^[[:space:]]*$/d' | ${wl-copy}
|
||||
bind = $mainMod, N, exec, ${dunstify} "$(${wl-paste})"
|
||||
bind = $mainMod, D, exec, ${dunstctl} close-all
|
||||
# I win
|
||||
bind = $mainMod, P, exec, ${wl-paste} | sgpt --model="gpt-4o" "Respond with the correct answer to the following question." | ${wl-copy}
|
||||
# notes
|
||||
submap = notes
|
||||
# below
|
||||
bind = $mainMod, B, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -B 15 -h -i "{}" ${path}/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
|
||||
# above
|
||||
bind = $mainMod, A, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -A 15 -h -i "{}" ${path}/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
|
||||
# context
|
||||
bind = $mainMod, C, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ${path}/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
|
||||
# trim
|
||||
bind = $mainMod, T, exec, ${wl-paste} | sed 's/[ \t]*$//' | sed 's/^[ \t]*//' | sed '/^[[:space:]]*$/d' | ${wl-copy}
|
||||
bind = $mainMod, N, exec, ${dunstify} "$(${wl-paste})"
|
||||
bind = $mainMod, D, exec, ${dunstctl} close-all
|
||||
# I win
|
||||
bind = $mainMod, P, exec, ${wl-paste} | sgpt --model="gpt-4o" "Respond with the correct answer to the following question." | ${wl-copy}
|
||||
# notes
|
||||
|
||||
bind = $mainMod, 2, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 3, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 4, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 5, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 6, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 7, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 8, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 0, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 2, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 3, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 4, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 5, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 6, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 7, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 8, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
bind = $mainMod, 0, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
|
||||
|
||||
bind = , escape, submap, reset
|
||||
submap = reset
|
||||
bind = , escape, submap, reset
|
||||
submap = reset
|
||||
|
||||
'';
|
||||
'';
|
||||
#experimental:explicit_sync = true
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{ config, osConfig, pkgs, inputs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = osConfig.custom.graphical.hyprland.videobridge;
|
||||
cfg = osConfig.custom.graphical.hyprland.videobridge;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland.settings.windowrulev2 = [
|
||||
"opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
|
||||
"noanim,class:^(xwaylandvideobridge)$"
|
||||
"noinitialfocus,class:^(xwaylandvideobridge)$"
|
||||
"maxsize 1 1,class:^(xwaylandvideobridge)$"
|
||||
"noblur,class:^(xwaylandvideobridge)$"
|
||||
];
|
||||
wayland.windowManager.hyprland.settings.windowrulev2 = [
|
||||
"opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
|
||||
"noanim,class:^(xwaylandvideobridge)$"
|
||||
"noinitialfocus,class:^(xwaylandvideobridge)$"
|
||||
"maxsize 1 1,class:^(xwaylandvideobridge)$"
|
||||
"noblur,class:^(xwaylandvideobridge)$"
|
||||
];
|
||||
|
||||
systemd.user.services.xwaylandvideobridge = {
|
||||
Unit.Description = "XWaylandVideoBridge";
|
||||
Service.ExecStart = lib.getExe pkgs.unstable.xwaylandvideobridge;
|
||||
Install.WantedBy = ["graphical-session.target"];
|
||||
};
|
||||
systemd.user.services.xwaylandvideobridge = {
|
||||
Unit.Description = "XWaylandVideoBridge";
|
||||
Service.ExecStart = lib.getExe pkgs.unstable.xwaylandvideobridge;
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,239 +2,241 @@
|
||||
with lib;
|
||||
let cfg = osConfig.custom.graphical.hyprland;
|
||||
in {
|
||||
config = let
|
||||
# styles from https://github.com/khaneliman/khanelinix/blob/8375f8cfbe5bfd87565b4dc34c9d30630c17336d/modules/home/desktop/addons/waybar/default.nix
|
||||
base16 = config.stylix.base16Scheme;
|
||||
readAndReplace = path: replace: builtins.readFile (pkgs.replaceVars path replace);
|
||||
# base 1, 7, 0
|
||||
#theme = readAndReplace ./styles/theme.css { BASE="#5c4133"; BORDER="#fef1de"; TEXT="#dab353";};
|
||||
theme = builtins.readFile ./styles/theme.css;
|
||||
style = builtins.readFile ./styles/style.css;
|
||||
notificationsStyle = builtins.readFile ./styles/notifications.css;
|
||||
powerStyle = builtins.readFile ./styles/power.css;
|
||||
statsStyle = builtins.readFile ./styles/stats.css;
|
||||
workspacesStyle = builtins.readFile ./styles/workspaces.css;
|
||||
in lib.mkIf cfg.enable {
|
||||
config =
|
||||
let
|
||||
# styles from https://github.com/khaneliman/khanelinix/blob/8375f8cfbe5bfd87565b4dc34c9d30630c17336d/modules/home/desktop/addons/waybar/default.nix
|
||||
base16 = config.stylix.base16Scheme;
|
||||
readAndReplace = path: replace: builtins.readFile (pkgs.replaceVars path replace);
|
||||
# base 1, 7, 0
|
||||
#theme = readAndReplace ./styles/theme.css { BASE="#5c4133"; BORDER="#fef1de"; TEXT="#dab353";};
|
||||
theme = builtins.readFile ./styles/theme.css;
|
||||
style = builtins.readFile ./styles/style.css;
|
||||
notificationsStyle = builtins.readFile ./styles/notifications.css;
|
||||
powerStyle = builtins.readFile ./styles/power.css;
|
||||
statsStyle = builtins.readFile ./styles/stats.css;
|
||||
workspacesStyle = builtins.readFile ./styles/workspaces.css;
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
|
||||
home.file.".config/waybar" = {
|
||||
recursive = true;
|
||||
source = ../../.config/waybar;
|
||||
};
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
#systemd.enable = true;
|
||||
#systemd.target = "sway-session.target";
|
||||
settings.main = {
|
||||
layer = "top";
|
||||
position = "bottom";
|
||||
#output = lib.mapAttrsToList (n: v: v.monitor) outputs;
|
||||
height = 25;
|
||||
spacing = 4;
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
#"hyprland/window"
|
||||
];
|
||||
modules-center = [ ];
|
||||
modules-right = [ "group/stats" "group/other" ];
|
||||
"group/stats" = {
|
||||
"orientation" = "horizontal";
|
||||
"modules" = [ "network" "cpu" "memory" "temperature" ]
|
||||
home.file.".config/waybar" = {
|
||||
recursive = true;
|
||||
source = ../../.config/waybar;
|
||||
};
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
#systemd.enable = true;
|
||||
#systemd.target = "sway-session.target";
|
||||
settings.main = {
|
||||
layer = "top";
|
||||
position = "bottom";
|
||||
#output = lib.mapAttrsToList (n: v: v.monitor) outputs;
|
||||
height = 25;
|
||||
spacing = 4;
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
#"hyprland/window"
|
||||
];
|
||||
modules-center = [ ];
|
||||
modules-right = [ "group/stats" "group/other" ];
|
||||
"group/stats" = {
|
||||
"orientation" = "horizontal";
|
||||
"modules" = [ "network" "cpu" "memory" "temperature" ]
|
||||
++ lib.optionals osConfig.custom.hardware.nvidia.enable [ "custom/nvidia" ]
|
||||
++ lib.optionals osConfig.custom.hardware.amd-gpu.enable [ "custom/amd-gpu" ];
|
||||
};
|
||||
"group/other" = {
|
||||
"orientation" = "horizontal";
|
||||
"modules" =
|
||||
[ "tray" "backlight" "pulseaudio" "mpris" "battery" "clock" ];
|
||||
};
|
||||
"cpu" = {
|
||||
"format" = " {usage}%";
|
||||
"tooltip" = true;
|
||||
};
|
||||
"disk" = { "format" = " {percentage_used}%"; };
|
||||
"memory" = { "format" = " {}%"; };
|
||||
|
||||
"idle_inhibitor" = {
|
||||
"format" = "{icon} ";
|
||||
"format-icons" = {
|
||||
"activated" = "";
|
||||
"deactivated" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"keyboard-state" = {
|
||||
"numlock" = true;
|
||||
"capslock" = true;
|
||||
"format" = "{icon} {name}";
|
||||
"format-icons" = {
|
||||
"locked" = "";
|
||||
"unlocked" = "";
|
||||
"group/other" = {
|
||||
"orientation" = "horizontal";
|
||||
"modules" =
|
||||
[ "tray" "backlight" "pulseaudio" "mpris" "battery" "clock" ];
|
||||
};
|
||||
};
|
||||
|
||||
"network" = {
|
||||
"interval" = 2;
|
||||
"format-wifi" = " {bandwidthDownBytes} {bandwidthUpBytes}";
|
||||
"format-ethernet" = " {bandwidthDownBytes} {bandwidthUpBytes}";
|
||||
"tooltip-format" = " {ifname} via {gwaddr}";
|
||||
"format-linked" = " {ifname} (No IP)";
|
||||
"format-disconnected" = " Disconnected";
|
||||
"format-alt" = "{ifname}: {ipaddr}/{cidr}";
|
||||
};
|
||||
"pulseaudio" = {
|
||||
"format" = "{volume}% {icon}";
|
||||
"format-bluetooth" = "{volume}% {icon}";
|
||||
"format-muted" = "";
|
||||
"format-icons" = {
|
||||
"headphone" = " ";
|
||||
"hands-free" = " ";
|
||||
"headset" = " ";
|
||||
"phone" = "";
|
||||
"portable" = "";
|
||||
"car" = "";
|
||||
"default" = [ "" "" ];
|
||||
"cpu" = {
|
||||
"format" = " {usage}%";
|
||||
"tooltip" = true;
|
||||
};
|
||||
"scroll-step" = 1;
|
||||
"on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
|
||||
"ignored-sinks" = [ "Easy Effects Sink" ];
|
||||
};
|
||||
"disk" = { "format" = " {percentage_used}%"; };
|
||||
"memory" = { "format" = " {}%"; };
|
||||
|
||||
"pulseaudio/slider" = {
|
||||
"min" = 0;
|
||||
"max" = 100;
|
||||
"orientation" = "horizontal";
|
||||
};
|
||||
"temperature".critical-threshold = 80;
|
||||
"temperature".format = "{temperatureC}°C ";
|
||||
"temperature".interval = 5;
|
||||
"temperature".hwmon-path =
|
||||
lib.mkIf (osConfig.networking.hostName == "nix-laptop")
|
||||
"/sys/class/hwmon/hwmon6/temp1_input";
|
||||
"backlight".format = "{percent}% {icon}";
|
||||
"backlight".states = [ 0 50 ];
|
||||
"backlight".format-icons = [ "" "" ];
|
||||
"battery".states.good = 95;
|
||||
"battery".interval = 5;
|
||||
"battery".states.warning = 30;
|
||||
"battery".states.critical = 15;
|
||||
"battery".format = "{capacity}% / {power:.2}W {icon}";
|
||||
"battery".format-icons = [ "" "" "" "" "" ];
|
||||
"clock" = {
|
||||
format = "{:%F %H:%M}";
|
||||
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
||||
"calendar" = {
|
||||
"mode" = "year";
|
||||
"mode-mon-col" = 3;
|
||||
"weeks-pos" = "right";
|
||||
"on-scroll" = 1;
|
||||
"format" = {
|
||||
"months" = "<span color='#ffead3'><b>{}</b></span>";
|
||||
"days" = "<span color='#ecc6d9'><b>{}</b></span>";
|
||||
"weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
|
||||
"weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
|
||||
"today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
|
||||
"idle_inhibitor" = {
|
||||
"format" = "{icon} ";
|
||||
"format-icons" = {
|
||||
"activated" = "";
|
||||
"deactivated" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"keyboard-state" = {
|
||||
"numlock" = true;
|
||||
"capslock" = true;
|
||||
"format" = "{icon} {name}";
|
||||
"format-icons" = {
|
||||
"locked" = "";
|
||||
"unlocked" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"network" = {
|
||||
"interval" = 2;
|
||||
"format-wifi" = " {bandwidthDownBytes} {bandwidthUpBytes}";
|
||||
"format-ethernet" = " {bandwidthDownBytes} {bandwidthUpBytes}";
|
||||
"tooltip-format" = " {ifname} via {gwaddr}";
|
||||
"format-linked" = " {ifname} (No IP)";
|
||||
"format-disconnected" = " Disconnected";
|
||||
"format-alt" = "{ifname}: {ipaddr}/{cidr}";
|
||||
};
|
||||
"pulseaudio" = {
|
||||
"format" = "{volume}% {icon}";
|
||||
"format-bluetooth" = "{volume}% {icon}";
|
||||
"format-muted" = "";
|
||||
"format-icons" = {
|
||||
"headphone" = " ";
|
||||
"hands-free" = " ";
|
||||
"headset" = " ";
|
||||
"phone" = "";
|
||||
"portable" = "";
|
||||
"car" = "";
|
||||
"default" = [ "" "" ];
|
||||
};
|
||||
"scroll-step" = 1;
|
||||
"on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
|
||||
"ignored-sinks" = [ "Easy Effects Sink" ];
|
||||
};
|
||||
|
||||
"pulseaudio/slider" = {
|
||||
"min" = 0;
|
||||
"max" = 100;
|
||||
"orientation" = "horizontal";
|
||||
};
|
||||
"temperature".critical-threshold = 80;
|
||||
"temperature".format = "{temperatureC}°C ";
|
||||
"temperature".interval = 5;
|
||||
"temperature".hwmon-path =
|
||||
lib.mkIf (osConfig.networking.hostName == "nix-laptop")
|
||||
"/sys/class/hwmon/hwmon6/temp1_input";
|
||||
"backlight".format = "{percent}% {icon}";
|
||||
"backlight".states = [ 0 50 ];
|
||||
"backlight".format-icons = [ "" "" ];
|
||||
"battery".states.good = 95;
|
||||
"battery".interval = 5;
|
||||
"battery".states.warning = 30;
|
||||
"battery".states.critical = 15;
|
||||
"battery".format = "{capacity}% / {power:.2}W {icon}";
|
||||
"battery".format-icons = [ "" "" "" "" "" ];
|
||||
"clock" = {
|
||||
format = "{:%F %H:%M}";
|
||||
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
||||
"calendar" = {
|
||||
"mode" = "year";
|
||||
"mode-mon-col" = 3;
|
||||
"weeks-pos" = "right";
|
||||
"on-scroll" = 1;
|
||||
"format" = {
|
||||
"months" = "<span color='#ffead3'><b>{}</b></span>";
|
||||
"days" = "<span color='#ecc6d9'><b>{}</b></span>";
|
||||
"weeks" = "<span color='#99ffdd'><b>W{}</b></span>";
|
||||
"weekdays" = "<span color='#ffcc66'><b>{}</b></span>";
|
||||
"today" = "<span color='#ff6699'><b><u>{}</u></b></span>";
|
||||
};
|
||||
};
|
||||
};
|
||||
"mpris" = {
|
||||
"format" = "{player_icon} {dynamic}";
|
||||
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
||||
"title-len" = 35;
|
||||
"dynamic-len" = 35;
|
||||
"player-icons" = {
|
||||
"default" = "▶";
|
||||
"mpv" = "🎵";
|
||||
};
|
||||
"status-icons" = { "paused" = "⏸"; };
|
||||
};
|
||||
"custom/nvidia" = {
|
||||
"format" = "{}";
|
||||
"interval" = 5;
|
||||
"exec" = "~/.config/waybar/nvidia.sh";
|
||||
"exec-if" = "nvidia-smi";
|
||||
};
|
||||
"custom/amd-gpu" = {
|
||||
"format" = "{}";
|
||||
"interval" = 5;
|
||||
"exec" = "~/.config/waybar/amd-gpu.sh";
|
||||
};
|
||||
"tray".icon-size = 21;
|
||||
"tray".spacing = 10;
|
||||
"hyprland/window" = {
|
||||
"format" = "{}";
|
||||
"separate-outputs" = true;
|
||||
};
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
"disable-scroll" = true;
|
||||
"all-outputs" = false;
|
||||
"active-only" = false;
|
||||
"on-click" = "activate";
|
||||
"format" = "{icon} {windows}";
|
||||
"format-icons" = {
|
||||
"1" = "";
|
||||
"2" = "";
|
||||
"3" = "";
|
||||
"4" = "";
|
||||
"5" = "";
|
||||
"6" = "";
|
||||
"7" = "";
|
||||
"8" = "";
|
||||
"9" = "";
|
||||
"10" = "";
|
||||
"urgent" = "";
|
||||
"default" = "";
|
||||
"empty" = "";
|
||||
};
|
||||
# "format-window-separator" = "->";
|
||||
"window-rewrite-default" = "";
|
||||
"window-rewrite" = {
|
||||
"class<org.keepassxc.KeePassXC>" = "";
|
||||
"class<Caprine>" = "";
|
||||
"class<Github Desktop>" = "";
|
||||
"class<Godot>" = "";
|
||||
"class<Mysql-workbench-bin>" = "";
|
||||
"class<Slack>" = "";
|
||||
"class<code>" = "";
|
||||
"class<codium>" = "";
|
||||
"code-url-handler" = "";
|
||||
"class<discord>" = "";
|
||||
"class<firefox>" = "";
|
||||
"class<firefox-beta>" = "";
|
||||
"class<firefox-developer-edition>" = "";
|
||||
"class<firefox> title<.*github.*>" = "";
|
||||
"class<firefox> title<.*twitch|youtube|plex|tntdrama|bally sports.*>" =
|
||||
"";
|
||||
"class<kitty>" = "";
|
||||
"class<org.wezfurlong.wezterm>" = "";
|
||||
"class<mediainfo-gui>" = "";
|
||||
"class<org.kde.digikam>" = "";
|
||||
"class<org.telegram.desktop>" = "";
|
||||
"class<.pitivi-wrapped>" = "";
|
||||
"class<steam>" = "";
|
||||
"class<thunderbird>" = "";
|
||||
"class<virt-manager>" = "";
|
||||
"class<vlc>" = "";
|
||||
"class<thunar>" = "";
|
||||
"class<org.gnome.Nautilus>" = "";
|
||||
"class<Spotify>" = "";
|
||||
"title<Spotify Free>" = "";
|
||||
"class<libreoffice-draw>" = "";
|
||||
"class<libreoffice-writer>" = "";
|
||||
"class<libreoffice-calc>" = "";
|
||||
"class<libreoffice-impress>" = "";
|
||||
"class<teams-for-linux>" = "";
|
||||
"class<org.prismlauncher.PrismLauncher>" = "";
|
||||
"class<minecraft-launcher>" = "";
|
||||
"class<Postman>" = "";
|
||||
"class<jetbrains-idea>" = "";
|
||||
"class<Logseq>" = "";
|
||||
"class<brave-browser>" = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
"mpris" = {
|
||||
"format" = "{player_icon} {dynamic}";
|
||||
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
||||
"title-len" = 35;
|
||||
"dynamic-len" = 35;
|
||||
"player-icons" = {
|
||||
"default" = "▶";
|
||||
"mpv" = "🎵";
|
||||
};
|
||||
"status-icons" = { "paused" = "⏸"; };
|
||||
};
|
||||
"custom/nvidia" = {
|
||||
"format" = "{}";
|
||||
"interval" = 5;
|
||||
"exec" = "~/.config/waybar/nvidia.sh";
|
||||
"exec-if" = "nvidia-smi";
|
||||
};
|
||||
"custom/amd-gpu" = {
|
||||
"format" = "{}";
|
||||
"interval" = 5;
|
||||
"exec" = "~/.config/waybar/amd-gpu.sh";
|
||||
};
|
||||
"tray".icon-size = 21;
|
||||
"tray".spacing = 10;
|
||||
"hyprland/window" = {
|
||||
"format" = "{}";
|
||||
"separate-outputs" = true;
|
||||
};
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
"disable-scroll" = true;
|
||||
"all-outputs" = false;
|
||||
"active-only" = false;
|
||||
"on-click" = "activate";
|
||||
"format" = "{icon} {windows}";
|
||||
"format-icons" = {
|
||||
"1" = "";
|
||||
"2" = "";
|
||||
"3" = "";
|
||||
"4" = "";
|
||||
"5" = "";
|
||||
"6" = "";
|
||||
"7" = "";
|
||||
"8" = "";
|
||||
"9" = "";
|
||||
"10" = "";
|
||||
"urgent" = "";
|
||||
"default" = "";
|
||||
"empty" = "";
|
||||
};
|
||||
# "format-window-separator" = "->";
|
||||
"window-rewrite-default" = "";
|
||||
"window-rewrite" = {
|
||||
"class<org.keepassxc.KeePassXC>" = "";
|
||||
"class<Caprine>" = "";
|
||||
"class<Github Desktop>" = "";
|
||||
"class<Godot>" = "";
|
||||
"class<Mysql-workbench-bin>" = "";
|
||||
"class<Slack>" = "";
|
||||
"class<code>" = "";
|
||||
"class<codium>" = "";
|
||||
"code-url-handler" = "";
|
||||
"class<discord>" = "";
|
||||
"class<firefox>" = "";
|
||||
"class<firefox-beta>" = "";
|
||||
"class<firefox-developer-edition>" = "";
|
||||
"class<firefox> title<.*github.*>" = "";
|
||||
"class<firefox> title<.*twitch|youtube|plex|tntdrama|bally sports.*>" =
|
||||
"";
|
||||
"class<kitty>" = "";
|
||||
"class<org.wezfurlong.wezterm>" = "";
|
||||
"class<mediainfo-gui>" = "";
|
||||
"class<org.kde.digikam>" = "";
|
||||
"class<org.telegram.desktop>" = "";
|
||||
"class<.pitivi-wrapped>" = "";
|
||||
"class<steam>" = "";
|
||||
"class<thunderbird>" = "";
|
||||
"class<virt-manager>" = "";
|
||||
"class<vlc>" = "";
|
||||
"class<thunar>" = "";
|
||||
"class<org.gnome.Nautilus>" = "";
|
||||
"class<Spotify>" = "";
|
||||
"title<Spotify Free>" = "";
|
||||
"class<libreoffice-draw>" = "";
|
||||
"class<libreoffice-writer>" = "";
|
||||
"class<libreoffice-calc>" = "";
|
||||
"class<libreoffice-impress>" = "";
|
||||
"class<teams-for-linux>" = "";
|
||||
"class<org.prismlauncher.PrismLauncher>" = "";
|
||||
"class<minecraft-launcher>" = "";
|
||||
"class<Postman>" = "";
|
||||
"class<jetbrains-idea>" = "";
|
||||
"class<Logseq>" = "";
|
||||
"class<brave-browser>" = "";
|
||||
};
|
||||
};
|
||||
style =
|
||||
"${theme}${style}${notificationsStyle}${powerStyle}${statsStyle}${workspacesStyle}";
|
||||
};
|
||||
style =
|
||||
"${theme}${style}${notificationsStyle}${powerStyle}${statsStyle}${workspacesStyle}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,8 +56,8 @@ in {
|
||||
modules-left = "i3 xwindow";
|
||||
modules-center = "";
|
||||
modules-right = [ "music network memory cpu cpu-wattage cpu-temp" ]
|
||||
++ lib.optionals osConfig.custom.hardware.nvidia.enable [ "nvidia-gpu" ]
|
||||
++ lib.optionals osConfig.custom.hardware.amd-gpu.enable [ "amd-gpu" ]
|
||||
++ lib.optionals osConfig.custom.hardware.nvidia.enable [ "nvidia-gpu" ]
|
||||
++ lib.optionals osConfig.custom.hardware.amd-gpu.enable [ "amd-gpu" ]
|
||||
++ [ "pulseaudio date tray" ];
|
||||
cursor-click = "pointer";
|
||||
cursor-scroll = "ns-resize";
|
||||
@@ -68,33 +68,34 @@ in {
|
||||
# wm-restack = "i3";
|
||||
# override-redirect = true;
|
||||
};
|
||||
"module/i3" = let padding = 2;
|
||||
in {
|
||||
type = "internal/i3";
|
||||
pin-workspaces = true;
|
||||
show-urgent = true;
|
||||
strip-wsnumbers = true;
|
||||
index-sort = true;
|
||||
enable-click = true;
|
||||
wrapping-scroll = true;
|
||||
fuzzy-match = true;
|
||||
format = "<label-state> <label-mode>";
|
||||
label-focused = "%name%";
|
||||
label-focused-foreground = config.stylix.base16Scheme.base01;
|
||||
label-focused-background = config.stylix.base16Scheme.base05;
|
||||
label-focused-underline = config.stylix.base16Scheme.base03;
|
||||
label-focused-padding = padding;
|
||||
label-unfocused = "%name%";
|
||||
label-unfocused-padding = padding;
|
||||
label-visible = "%name%";
|
||||
label-visible-underline = config.stylix.base16Scheme.base01;
|
||||
label-visible-padding = padding;
|
||||
label-urgent = "%name%";
|
||||
label-urgent-foreground = config.stylix.base16Scheme.base00;
|
||||
label-urgent-background = config.stylix.base16Scheme.base08;
|
||||
label-urgent-underline = config.stylix.base16Scheme.base0F;
|
||||
label-urgent-padding = padding;
|
||||
};
|
||||
"module/i3" =
|
||||
let padding = 2;
|
||||
in {
|
||||
type = "internal/i3";
|
||||
pin-workspaces = true;
|
||||
show-urgent = true;
|
||||
strip-wsnumbers = true;
|
||||
index-sort = true;
|
||||
enable-click = true;
|
||||
wrapping-scroll = true;
|
||||
fuzzy-match = true;
|
||||
format = "<label-state> <label-mode>";
|
||||
label-focused = "%name%";
|
||||
label-focused-foreground = config.stylix.base16Scheme.base01;
|
||||
label-focused-background = config.stylix.base16Scheme.base05;
|
||||
label-focused-underline = config.stylix.base16Scheme.base03;
|
||||
label-focused-padding = padding;
|
||||
label-unfocused = "%name%";
|
||||
label-unfocused-padding = padding;
|
||||
label-visible = "%name%";
|
||||
label-visible-underline = config.stylix.base16Scheme.base01;
|
||||
label-visible-padding = padding;
|
||||
label-urgent = "%name%";
|
||||
label-urgent-foreground = config.stylix.base16Scheme.base00;
|
||||
label-urgent-background = config.stylix.base16Scheme.base08;
|
||||
label-urgent-underline = config.stylix.base16Scheme.base0F;
|
||||
label-urgent-padding = padding;
|
||||
};
|
||||
"module/xworkspaces" = {
|
||||
type = "internal/xworkspaces";
|
||||
label-active = "%name%";
|
||||
@@ -198,7 +199,7 @@ in {
|
||||
};
|
||||
"module/amd-gpu" = {
|
||||
type = "custom/script";
|
||||
format-foreground = "ed1c24";
|
||||
format-foreground = "ed1c24";
|
||||
label = "%output:0:35:...%";
|
||||
exec = "~/.config/polybar/amd-gpu.sh";
|
||||
interval = 3;
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
home.file."path.sh" = {
|
||||
enable = true;
|
||||
recursive = true;
|
||||
executable = true;
|
||||
text = ''
|
||||
#!/usr/bin/env sh
|
||||
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
||||
export MOZ_DBUS_REMOTE="1"
|
||||
export KITTY_ENABLE_WAYLAND="1"
|
||||
export _JAVA_AWT_WM_NONREPARENTING="1"
|
||||
export MOZ_ENABLE_WAYLAND="1"
|
||||
export WLR_NO_HARDWARE_CURSORS="1"
|
||||
export NIXOS_OZONE_WL="1"
|
||||
home.file."path.sh" = {
|
||||
enable = true;
|
||||
recursive = true;
|
||||
executable = true;
|
||||
text = ''
|
||||
#!/usr/bin/env sh
|
||||
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
||||
export MOZ_DBUS_REMOTE="1"
|
||||
export KITTY_ENABLE_WAYLAND="1"
|
||||
export _JAVA_AWT_WM_NONREPARENTING="1"
|
||||
export MOZ_ENABLE_WAYLAND="1"
|
||||
export WLR_NO_HARDWARE_CURSORS="1"
|
||||
export NIXOS_OZONE_WL="1"
|
||||
|
||||
export LIBVA_DRIVER_NAME="nvidia"
|
||||
export __GLX_VENDOR_LIBRARY_NAME="nvidia"
|
||||
export GBM_BACKEND="nvidia-drm"
|
||||
export LIBVA_DRIVER_NAME="nvidia"
|
||||
export __GLX_VENDOR_LIBRARY_NAME="nvidia"
|
||||
export GBM_BACKEND="nvidia-drm"
|
||||
|
||||
export XDG_SESSION_TYPE="wayland"
|
||||
export QT_QPA_PLATFORM="wayland;xcb"
|
||||
export ELECTRON_OZONE_PLATFORM_HINT="wayland"
|
||||
fi
|
||||
'';
|
||||
target = ".config/plasma-workspace/env/path.sh";
|
||||
};
|
||||
# home.file."path.desktop" = {
|
||||
# enable = true;
|
||||
# recursive = true;
|
||||
# executable = true;
|
||||
# text = ''
|
||||
# [Desktop Entry]
|
||||
# Type=Application
|
||||
# Exec=${config.xdg.configHome}/autostart/path.sh
|
||||
# Hidden=false
|
||||
# NoDisplay=false
|
||||
# X-GNOME-Autostart-enabled=true
|
||||
# Name[en_US]=Login Script
|
||||
# Name=Login Script
|
||||
# Comment[en_US]=Launches login script and sets environment variables
|
||||
# Comment=Launches login script and sets environment variables
|
||||
# '';
|
||||
# target = ".config/autostart/path.desktop";
|
||||
# };
|
||||
export XDG_SESSION_TYPE="wayland"
|
||||
export QT_QPA_PLATFORM="wayland;xcb"
|
||||
export ELECTRON_OZONE_PLATFORM_HINT="wayland"
|
||||
fi
|
||||
'';
|
||||
target = ".config/plasma-workspace/env/path.sh";
|
||||
};
|
||||
# home.file."path.desktop" = {
|
||||
# enable = true;
|
||||
# recursive = true;
|
||||
# executable = true;
|
||||
# text = ''
|
||||
# [Desktop Entry]
|
||||
# Type=Application
|
||||
# Exec=${config.xdg.configHome}/autostart/path.sh
|
||||
# Hidden=false
|
||||
# NoDisplay=false
|
||||
# X-GNOME-Autostart-enabled=true
|
||||
# Name[en_US]=Login Script
|
||||
# Name=Login Script
|
||||
# Comment[en_US]=Launches login script and sets environment variables
|
||||
# Comment=Launches login script and sets environment variables
|
||||
# '';
|
||||
# target = ".config/autostart/path.desktop";
|
||||
# };
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, lib, ...}:
|
||||
{ config, pkgs, inputs, lib, ... }:
|
||||
{
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ config, pkgs, inputs, ...}:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
programs.lf = {
|
||||
enable = true;
|
||||
previewer.source = pkgs.writeShellScript "pv.sh" ''
|
||||
#!/bin/sh
|
||||
case "$(${pkgs.file}/bin/file -Lb --mime-type -- "$1")" in
|
||||
#image/*|video/*) ${pkgs.chafa}/bin/chafa -f sixel -s "$2x$3" --animate false $1;;
|
||||
application/x-tar) tar tf "$1";;
|
||||
application/vnd.rar) ${pkgs.p7zip}/bin/7z l "$1";;
|
||||
application/x-7z-compressed) ${pkgs.p7zip}/bin/7z l "$1";;
|
||||
*) ${pkgs.ctpv}/bin/ctpv "$1";;
|
||||
esac
|
||||
'';
|
||||
};
|
||||
programs.lf = {
|
||||
enable = true;
|
||||
previewer.source = pkgs.writeShellScript "pv.sh" ''
|
||||
#!/bin/sh
|
||||
case "$(${pkgs.file}/bin/file -Lb --mime-type -- "$1")" in
|
||||
#image/*|video/*) ${pkgs.chafa}/bin/chafa -f sixel -s "$2x$3" --animate false $1;;
|
||||
application/x-tar) tar tf "$1";;
|
||||
application/vnd.rar) ${pkgs.p7zip}/bin/7z l "$1";;
|
||||
application/x-7z-compressed) ${pkgs.p7zip}/bin/7z l "$1";;
|
||||
*) ${pkgs.ctpv}/bin/ctpv "$1";;
|
||||
esac
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ...}:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
plugins.nvim-autopairs = { enable = true; };
|
||||
{
|
||||
plugins.nvim-autopairs = { enable = true; };
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{lib, pkgs, ...}:
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
|
||||
@@ -30,7 +30,8 @@ let
|
||||
];
|
||||
merged =
|
||||
builtins.foldl' (acc: elem: lib.recursiveUpdate acc elem) { } configs;
|
||||
in {
|
||||
in
|
||||
{
|
||||
home.sessionVariables = { EDITOR = "nvim"; };
|
||||
programs.nixvim = merged;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
plugins = {
|
||||
image.enable = true;
|
||||
|
||||
@@ -1,19 +1,28 @@
|
||||
{pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
plugins = {
|
||||
otter = { # provide lsp functionality for code embedded in other languages
|
||||
otter = {
|
||||
# provide lsp functionality for code embedded in other languages
|
||||
enable = true;
|
||||
settings.handle_leading_whitespace = true;
|
||||
};
|
||||
lsp = {
|
||||
enable = true;
|
||||
inlayHints = true;
|
||||
servers = {
|
||||
bashls.enable = true;
|
||||
#ccls.enable = true;
|
||||
clangd.enable = true;
|
||||
cssls.enable = true;
|
||||
gopls.enable = true;
|
||||
nixd.enable = true;
|
||||
nixd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
nixpkgs.expr = ''import <nixpkgs> { }'';
|
||||
formatting.command = [ "nixpkgs-fmt" ];
|
||||
options.nixos.expr = ''(builtins.getFlake ("/home/kopatz/projects/github/nix-config")).nixosConfigurations.kop-pc.options'';
|
||||
};
|
||||
};
|
||||
html.enable = true;
|
||||
dartls.enable = true;
|
||||
ts_ls.enable = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
fantomas.enable = true;
|
||||
gofmt.enable = true;
|
||||
goimports.enable = true;
|
||||
nixfmt.enable = true;
|
||||
#nixfmt.enable = true;
|
||||
markdownlint.enable = true;
|
||||
shellharden.enable = true;
|
||||
shfmt.enable = true;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
{
|
||||
opts = {
|
||||
timeoutlen = 500;
|
||||
};
|
||||
plugins.which-key = { enable = true; }; }
|
||||
plugins.which-key = { enable = true; };
|
||||
}
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{ config, pkgs, inputs, ...}:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
home.file.".config/nvim" = {
|
||||
enable = true;
|
||||
recursive = true;
|
||||
source = ../.config/nvim;
|
||||
target = ".config/nvim";
|
||||
};
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
extraPackages = with pkgs; [
|
||||
gcc
|
||||
ripgrep
|
||||
fd
|
||||
cmake
|
||||
pyright
|
||||
nodePackages.eslint
|
||||
ccls
|
||||
nodejs_22
|
||||
go
|
||||
];
|
||||
};
|
||||
home.file.".config/nvim" = {
|
||||
enable = true;
|
||||
recursive = true;
|
||||
source = ../.config/nvim;
|
||||
target = ".config/nvim";
|
||||
};
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
extraPackages = with pkgs; [
|
||||
gcc
|
||||
ripgrep
|
||||
fd
|
||||
cmake
|
||||
pyright
|
||||
nodePackages.eslint
|
||||
ccls
|
||||
nodejs_22
|
||||
go
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,8 @@ let
|
||||
r = c."${color}-rgb-r";
|
||||
g = c."${color}-rgb-g";
|
||||
b = c."${color}-rgb-b";
|
||||
in "rgba ( ${r}, ${g}, ${b}, ${opacity} % )";
|
||||
in
|
||||
"rgba ( ${r}, ${g}, ${b}, ${opacity} % )";
|
||||
mkRgb = mkRgba "100";
|
||||
rofiOpacity =
|
||||
builtins.toString (builtins.ceil (config.stylix.opacity.popups * 100));
|
||||
@@ -55,7 +56,8 @@ let
|
||||
alternate-active-text = mkRgb "base0D";
|
||||
alternate-urgent-text = mkRgb "base08";
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
home.file.".config/rofi" = {
|
||||
enable = true;
|
||||
recursive = true;
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{ osConfig, pkgs, config, lib, ... }:
|
||||
let cfg = osConfig.custom.graphical.stylix;
|
||||
let
|
||||
cfg = osConfig.custom.graphical.stylix;
|
||||
base16 = config.stylix.base16Scheme;
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
stylix = {
|
||||
enable = true;
|
||||
@@ -17,7 +19,7 @@ in {
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings = lib.mkIf osConfig.custom.graphical.hyprland.enable {
|
||||
env = ["GTK_THEME,adw-gtk3"];
|
||||
env = [ "GTK_THEME,adw-gtk3" ];
|
||||
general."col.active_border" = lib.mkForce "rgb(${base16.base07}) rgb(${base16.base04}) 45deg";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ...}:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
home = {
|
||||
pointerCursor = {
|
||||
@@ -10,7 +10,7 @@
|
||||
};
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
theme = {
|
||||
name = "Tokyonight-Dark-BL";
|
||||
package = pkgs.tokyo-night-gtk;
|
||||
};
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{
|
||||
slug = "yorha";
|
||||
name = "yorha";
|
||||
author = "flick0 (https://github.com/flick0)";
|
||||
palette = {
|
||||
base00 = "#1e1d1c";
|
||||
base01 = "#A39D8F";
|
||||
base02 = "#AFA899";
|
||||
base03 = "#BBB4A5";
|
||||
base04 = "#C3BCAB";
|
||||
base05 = "#D2CCB9";
|
||||
base06 = "#DBD5C2";
|
||||
base07 = "#e8e5da";
|
||||
base08 = "#a2a098";
|
||||
base09 = "#A39D8F";
|
||||
base10 = "#AFA899";
|
||||
base11 = "#BBB4A5";
|
||||
base12 = "#C3BCAB";
|
||||
base13 = "#D2CCB9";
|
||||
base14 = "#DBD5C2";
|
||||
base15 = "#e8e5da";
|
||||
};
|
||||
slug = "yorha";
|
||||
name = "yorha";
|
||||
author = "flick0 (https://github.com/flick0)";
|
||||
palette = {
|
||||
base00 = "#1e1d1c";
|
||||
base01 = "#A39D8F";
|
||||
base02 = "#AFA899";
|
||||
base03 = "#BBB4A5";
|
||||
base04 = "#C3BCAB";
|
||||
base05 = "#D2CCB9";
|
||||
base06 = "#DBD5C2";
|
||||
base07 = "#e8e5da";
|
||||
base08 = "#a2a098";
|
||||
base09 = "#A39D8F";
|
||||
base10 = "#AFA899";
|
||||
base11 = "#BBB4A5";
|
||||
base12 = "#C3BCAB";
|
||||
base13 = "#D2CCB9";
|
||||
base14 = "#DBD5C2";
|
||||
base15 = "#e8e5da";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user