tidied home/desktop

This commit is contained in:
serenity-F 2024-12-11 23:52:14 +10:00
parent 328a4cae69
commit af089383d6
4 changed files with 0 additions and 703 deletions

View file

@ -1,128 +0,0 @@
{
pkgs,
variables,
xkb,
}:
with variables.base32Theme;
''
########################################
##### devices
########################################
input type:touchpad {
tap enabled
natural_scroll enabled
tap_button_map lrm
middle_emulation enabled
drag enabled
}
output eDP-1 {
pos 0 0
}
output DP-1 {
pos 0 1080
}
input 1:1:AT_Translated_Set_2_keyboard {
xkb_layout ${xkb.layout},us
xkb_variant ${xkb.variant},
}
''
+ ''
########################################
##### colors & theme
########################################
# <colorclass> <border> <background> <text> <indicator> <child_border>
client.background #${base00-hex}
client.focused #${variables.accent-hex} #${base00-hex} #${base05-hex} #${variables.accent-hex} #${variables.accent-hex}
client.focused_inactive #${base00-hex} #${base00-hex} #${base04-hex} #${base00-hex} #${base00-hex}
client.placeholder #${base00-hex} #${base00-hex} #${base04-hex} #${base00-hex} #${base00-hex}
client.unfocused #${base00-hex} #${base00-hex} #${base04-hex} #${base00-hex} #${base00-hex}
client.urgent #${base0F-hex} #${base00-hex} #${base05-hex} #${base0F-hex} #${base0F-hex}
# font
font pango:sans-serif ${toString variables.font.sans-serif.size}
# gaps
gaps outer 0
gaps inner ${toString variables.gaps}
# border
default_border pixel ${toString variables.border-width}
for_window [class=".+"] border pixel ${toString variables.border-width}
hide_edge_borders none
corner_radius ${toString variables.border-radius}
''
+ ''
########################################
##### window rules
########################################
# inhibit idle when fullscreen
for_window [app_id=".*"] inhibit_idle fullscreen
for_window [class=".*"] inhibit_idle fullscreen
# various floaters
for_window [window_role="Preferences"] floating enable
for_window [window_role="bubble"] floating enable
for_window [window_role="pop-up"] floating enable
for_window [window_role="task_dialog"] floating enable
for_window [window_type="dialog"] floating enable
for_window [window_type="menu"] floating enable
# apps
for_window [app_id="flameshot"] border pixel 0, floating enable, fullscreen disable, move absolute position 0 0
for_window [app_id="org.keepassxc.KeePassXC"] floating enable, sticky enable
''
+ ''
########################################
##### Bar config
########################################
bar {
status_command ${pkgs.i3status-rust}/bin/i3status-rs /etc/xdg/sway/i3status-rust.toml
colors {
background #00000000
focused_workspace #00000000 #${variables.accent-hex} #${base05-hex}
active_workspace #00000000 #${variables.accent-bg-hex} #${base05-hex}
inactive_workspace #00000000 #00000000 #${base05-hex}
urgent_workspace #00000000 #${base0F-hex} #${base05-hex}
}
bindsym button2 exec ${pkgs.rofi}/bin/rofi -show drun
bindsym button5 exec ${pkgs.writeShellScript "nextworkspace" ''
swaymsg workspace "$(
swaymsg -t get_workspaces | jq ".[] | select(.focused == true) | (.num + 1)"
)"
''}
}
''
+ ''
########################################
##### autostart
########################################
exec --no-startup-id ${pkgs.wpaperd}/bin/wpaperd
exec --no-startup-id ${pkgs.keepassxc}/bin/keepassxc
# start sway target (!!)
exec_always --no-startup-id ${pkgs.writeShellScript "systemd-sway" ''
${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY I3SOCK SWAYSOCK XDG_CURRENT_DESKTOP PATH
${pkgs.systemd}/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY I3SOCK SWAYSOCK XDG_CURRENT_DESKTOP PATH
${pkgs.systemd}/bin/systemctl --user start sway.target
''}
exec_always --no-startup-id ${
pkgs.writeShellScript "configure-gtk" (
with variables;
''
export XDG_DATA_DIRS=${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:$XDG_DATA_DIRS
gsettings set org.gnome.desktop.interface color-scheme "prefer-${theme-type}"
gsettings set org.gnome.desktop.interface cursor-size ${toString theme-cursor-size}
gsettings set org.gnome.desktop.interface cursor-theme "${theme-cursor}"
gsettings set org.gnome.desktop.interface font-name "sans-serif ${toString font.sans-serif.size}"
gsettings set org.gnome.desktop.interface gtk-theme "${theme-gtk}"
gsettings set org.gnome.desktop.interface icon-theme "${theme-icon}"
gsettings set org.gnome.desktop.interface monospace-font-name "monospace ${toString font.monospace.size}"
gsettings set org.gnome.desktop.wm.preferences button-layout "icon:"
''
)
}
''

View file

@ -1,345 +0,0 @@
{ lib, pkgs, config, options, ... }:
with lib;
with pkgs;
let
rofi-menu = pkgs.writeShellScript "rofi-menu.sh" ''
monitor="$(swaymsg -t get_outputs | jq '.[] | select(.focused) | .name' -r)"
${pkgs.g-rofi}/bin/rofi -show drun -modi drun -monitor "$monitor" $@
'';
left = "h";
down = "j";
up = "k";
right = "l";
bg-color = "#424242";
inactive-bg-color = "#424242";
text-color = "#4f97d7";
inactive-text-color = "#676E7D";
urgent-bg-color = "#E53935";
colorSchemeDark = rec {
primary = {
normal = {
background = "181818";
foreground = "b9b9b9";
};
bright = {
background = bright.black;
foreground = bright.white;
};
};
normal = {
black = "252525";
gray = "5b5b5b";
red = "ed4a46";
green = "70b433";
yellow = "dbb32d";
blue = "368aeb";
magenta = "eb6eb7";
cyan = "3fc5b7";
white = "777777";
};
bright = {
black = "3b3b3b";
gray = "7b7b7b";
red = "ff5e56";
green = "83c746";
yellow = "efc541";
blue = "4f9cfe";
magenta = "ff81ca";
cyan = "56d8c9";
white = "dedede";
};
};
colorScheme = colorSchemeDark;
font = "Roboto";
bgColor = colorScheme.primary.normal.background;
fgColor = colorScheme.primary.bright.foreground;
acColor = colorScheme.normal.red;
acColor2 = colorScheme.normal.yellow;
monospaced = text: ''<span font_family="RobotoMono">'' + text + "</span>";
in
{
imports = [ ./git.nix ./common.nix ./dunst.nix ];
home.packages = with pkgs; [
wl-clipboard
wlr-randr
];
home.sessionVariables = {
MOZ_ENABLE_WAYLAND = "1";
MOZ_USE_XINPUT2 = "1";
XDG_SESSION_TYPE = "wayland";
XDG_CURRENT_DESKTOP = "sway";
XKB_DEFAULT_OPTIONS = "terminate:ctrl_alt_bksp,caps:escape,altwin:swap_alt_win";
SDL_VIDEODRIVER = "wayland";
# needs qt5.qtwayland in systemPackages
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
# Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly:
_JAVA_AWT_WM_NONREPARENTING = 1;
# gtk applications on wayland
# export GDK_BACKEND=wayland
};
wayland.windowManager.sway = {
extraSessionCommands = ''
unset __NIXOS_SET_ENVIRONMENT_DONE
'';
extraConfig = ''
input "type:keyboard" {
xkb_layout us,de
xkb_options terminate:ctrl_alt_bksp,caps:escape,altwin:swap_alt_win
}
#output HDMI-A-1 {
# mode 1920x1080@74.973Hz
# pos 0 0
# scale 0.75
# scale_filter nearest
# adaptive_sync on
#}
#output HDMI-A-1 disable
set $soundbar 'Harris Corporation JBL Bar 2.x 0x01010101'
output $soundbar resolution 640x480@60Hz pos -10000 0
workspace "99999" output $soundbar
for_window [workspace="^99999$"] move container to output $monitor_center; focus output $monitor_center
output DP-2 {
mode 3840x1600@143.998001Hz
#pos 2560 0
}
input * {
repeat_delay 250
repeat_rate 35
}
exec wl-paste -t text --watch ${pkgs.clipman} store
'';
enable = true;
config = {
#input = {
#"*" = {
#"repeat_delay" = "230";
#"repeat_rate" = "23";
#};
#};
modifier = "Mod4";
floating.modifier = "Mod4";
floating.border = 0;
window.border = 0;
focus.forceWrapping = false;
focus.followMouse = false;
fonts = {
names = [ "RobotoMono" ];
size = 9.0;
};
terminal = "${pkgs.g-alacritty}/bin/alacritty";
startup = [
#{ command = "waybar"; always = true; notification = false; }
];
colors.focused = {
border = bg-color;
childBorder = bg-color;
background = bg-color;
text = text-color;
indicator = "#00ff00";
};
colors.unfocused = {
border = inactive-bg-color;
childBorder = inactive-bg-color;
background = inactive-bg-color;
text = inactive-text-color;
indicator = "#00ff00";
};
colors.focusedInactive = {
border = inactive-bg-color;
childBorder = inactive-bg-color;
background = inactive-bg-color;
text = inactive-text-color;
indicator = "#00ff00";
};
colors.urgent = {
border = urgent-bg-color;
childBorder = urgent-bg-color;
background = urgent-bg-color;
text = text-color;
indicator = "#00ff00";
};
menu = "${rofi-menu}";
modes.resize = {
Escape = "mode default";
Return = "mode default";
"${down}" = "resize grow height 10 px or 10 ppt";
"${left}" = "resize shrink width 10 px or 10 ppt";
"${right}" = "resize grow width 10 px or 10 ppt";
"${up}" = "resize shrink height 10 px or 10 ppt";
};
# bars = mkForce [ ];
bars = [{
"command" = "${waybar}/bin/waybar";
}];
keybindings = mkOptionDefault (import ./keybindings.nix { inherit pkgs; });
};
};
programs.waybar =
let
swayEnabled = config.wayland.windowManager.sway.enable;
in
{
enable = config.wayland.windowManager.sway.enable || config.wayland.windowManager.hikari.enable;
settings = [{
layer = "top";
position = "top";
modules-left = if swayEnabled then [ "sway/workspaces" ] else [ ];
modules-center = if swayEnabled then [ "sway/window" ] else [ ];
modules-right =
[ "pulseaudio" "cpu" "memory" "temperature" "clock" "tray" ];
clock.format = "{:%Y-%m-%d %H:%M}";
"tray" = { spacing = 8; };
"cpu" = { format = "cpu {usage}"; };
"memory" = { format = "mem {}"; };
"temperature" = {
hwmon-path = "/sys/class/hwmon/hwmon1/temp2_input";
format = "tmp {temperatureC}C";
};
"pulseaudio" = {
format = "vol {volume} {format_source}";
format-bluetooth = "volb {volume} {format_source}";
format-bluetooth-muted = "volb {format_source}";
format-muted = "vol {format_source}";
format-source = "mic {volume}";
format-source-muted = "mic";
};
}];
style =
let
makeBorder = color: "border-bottom: 3px solid #${color};";
makeInfo = color: ''
color: #${color};
${makeBorder color}
'';
clockColor = colorScheme.bright.magenta;
cpuColor = colorScheme.bright.green;
memColor = colorScheme.bright.blue;
pulseColor = {
normal = colorScheme.bright.cyan;
muted = colorScheme.bright.gray;
};
tmpColor = {
normal = colorScheme.bright.yellow;
critical = colorScheme.bright.red;
};
in
''
* {
border: none;
border-radius: 0;
/* `otf-font-awesome` is required to be installed for icons */
font-family: ${font};
font-size: 13px;
min-height: 0;
}
window#waybar {
background-color: #${bgColor};
/* border-bottom: 0px solid rgba(100, 114, 125, 0.5); */
color: #${fgColor};
transition-property: background-color;
transition-duration: .5s;
}
#workspaces button {
padding: 0 5px;
background-color: transparent;
color: #${fgColor};
border-bottom: 3px solid transparent;
}
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
#workspaces button:hover {
background: rgba(0, 0, 0, 0.2);
box-shadow: inherit;
border-bottom: 3px solid #ffffff;
}
#workspaces button.focused {
border-bottom: 3px solid #${acColor};
}
#workspaces button.urgent {
background-color: #${acColor};
color: #${bgColor};
}
#mode {
background-color: #64727D;
border-bottom: 3px solid #ffffff;
}
#clock,
#battery,
#cpu,
#memory,
#temperature,
#backlight,
#network,
#pulseaudio,
#custom-media,
#tray,
#mode,
#idle_inhibitor,
#mpd {
padding: 0 10px;
margin: 0 4px;
background-color: transparent;
${makeInfo fgColor}
}
label:focus {
color: #000000;
}
#clock {
${makeInfo clockColor}
}
#cpu {
${makeInfo cpuColor}
}
#memory {
${makeInfo memColor}
}
#pulseaudio {
${makeInfo pulseColor.normal}
}
#pulseaudio.muted {
${makeInfo pulseColor.muted}
}
#temperature {
${makeInfo tmpColor.normal}
}
#temperature.critical {
${makeInfo tmpColor.critical}
}
'';
};
xdg.configFile."xdg-desktop-portal-wlr/config".text = ''
[screencast]
output_name=
max_fps=30
chooser_cmd=${pkgs.slurp}/bin/slurp -f %o -or
chooser_type=simple
'';
}

View file

@ -1,14 +0,0 @@
{ self, inputs, outputs, lib, config, pkgs, ... }:
{
imports = [
./sway.nix
];
home = {
packages = with pkgs; [
];
};
}

View file

@ -1,216 +0,0 @@
wayland.windowManager.hyprland = {
enable = true;
package = inputs.hyprland.packages."${pkgs.system}".hyprland;
systemd = {
enable = true;
variables = [
"--all"
];
};
xwayland.enable = true;
plugins = [
#inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus
#inputs.hyprland-plugins.packages."${pkgs.system}".hyprbars
];
#monitor = desc:Acer Technologies Acer XR341CK 0x5457BEF2, preferred, 0x0, 1
#monitor = desc:BNQ BenQ G2400W 83805696SL0, preferred, 3440x180, 1
extraConfig = ''
monitor = , preferred, auto, auto
'';
settings = {
"$mod" = "SUPER";
"$shiftMod" = "SUPER_SHIFT";
exec-once = [
"startup"
#"otd-gui"
#"${pkgs.udiskie}/bin/udiskie"
#"${pkgs.hypridle}/bin/hypridle"
#"${pkgs.swww}/bin/swww swww init"
"${pkgs.kitty}/bin/kitty --class floating"
"${pkgs.kitty}/bin/kitty btop"
#"${pkgs.kitty}/bin/kitty --class yazi yazi"
#"${pkgs.steam}/bin/steam"
#"${pkgs.helvum}/bin/helvum"
#"${pkgs.spotify}/bin/spotify"
#"${pkgs.vesktop}/bin/vesktop"
#"${pkgs.easyeffects}/bin/easyeffects --class floating"
];
bind = [
"$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty"
"$shiftMod, RETURN, exec, ${pkgs.kitty}/bin/kitty --class floating"
"$mod, E, exec, ${pkgs.kitty}/bin/kitty yazi"
"$mod, B, exec, ${pkgs.firefox}/bin/firefox"
"$mod, C, exec, ${pkgs.kitty}/bin/kitty --class peaclock peaclock"
"$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
"$mod, X, exec, powermenu"
"$mod, SPACE, exec, menu"
# Windows control
#"$mod, TAB, layoutmsg, togglesplit"
"$mod, A, layoutmsg, swapwithmaster master"
"$mod, Z, layoutmsg, cyclenext"
"$shiftMod, Z, layoutmsg, rollnext"
"$mod, Q, killactive,"
"$mod, T, togglefloating,"
"$mod, F, fullscreen"
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
# Screenshots
"$shiftMod, PRINT, exec, screenshot window"
", PRINT, exec, screenshot monitor"
"$mod, PRINT, exec, screenshot region"
"ALT, PRINT, exec, screenshot region swappy"
# Night Shift
"$mod, F2, exec, night-shift-off"
"$mod, F3, exec, night-shift-on"
# Sound output
"$mod, F5, exec, ${pkgs.kitty}/bin/kitty --class floating fish -c sound-output"
"$mod, F6, exec, ${pkgs.kitty}/bin/kitty --class floating fish -c sound-output"
"$mod, F7, exec, ${pkgs.kitty}/bin/kitty --class floating fish -c sound-output"
] ++ (builtins.concatLists (builtins.genList (i:
let ws = i + 1;
in [
"$mod, code:1${toString i}, workspace, ${toString ws}"
"$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
]) 9));
bindm = [ "$mod, R, movewindow" "$shiftMod, R, resizewindow" ];
bindl = [
",XF86AudioMute, exec, sound-toggle"
",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock"
];
bindle = [
", XF86AudioRaiseVolume, exec, sound-up"
", XF86AudioLowerVolume, exec, sound-down"
", XF86MonBrightnessUp, exec, brightness-up"
", XF86MonBrightnessDown, exec, brightness-down"
];
env = [
"XDG_CURRENT_DESKTOP,Hyprland"
"XDG_SESSION_TYPE,wayland"
"XDG_SESSION_DESKTOP,Hyprland"
"GDK_BACKEND,wayland,x11,*"
"NIXOS_OZONE_WL,1" # disable if you(g.)'re having issues w/ firefox
"OZONE_PLATFORM,wayland"
"SDL_VIDEODRIVER,wayland,x11"
"WLR_RENDERER_ALLOW_SOFTWARE,1"
"QT_AUTO_SCREEN_SCALE_FACTOR,1"
"QT_QPA_PLATFORM,wayland;xcb"
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
"QT_QPA_PLATFORMTHEME,qt6ct"
"GTK_THEME,adwaita-dark"
#"HYPRCURSOR_THEME,rose-pine"
#"HYPRCURSOR_SIZE,16"
#"XCURSOR_THEME,rose-pine"
#"XCURSOR_SIZE,16"
"NIXPKGS_ALLOW_UNFREE,1"
];
general = {
resize_on_border = true;
gaps_in = config.theme.gaps-in;
gaps_out = config.theme.gaps-out;
border_size = config.theme.border-size;
"col.active_border" = "rgba(${config.theme.colors.primary-bg}ff)";
"col.inactive_border" = "rgba(00000055)";
border_part_of_window = true;
layout = "dwindle";
};
decoration = {
rounding = config.theme.rounding;
shadow = {
enabled = true;
range = 25;
render_power = 3;
color = "rgba(00000055)";
};
blur = { enabled = true; };
};
dwindle = {
pseudotile = true;
preserve_split = true;
force_split = 2;
};
gestures = { workspace_swipe = true; };
misc = {
disable_hyprland_logo = false;
disable_splash_rendering = true;
focus_on_activate = true;
new_window_takes_over_fullscreen = 2;
};
input = {
kb_layout = "us";
kb_options = "caps:escape";
follow_mouse = 1;
sensitivity = 0.1;
repeat_delay = 350;
repeat_rate = 40;
numlock_by_default = true;
touchpad = {
natural_scroll = true;
clickfinger_behavior = true;
};
};
windowrulev2 = [
"float, class:peaclock"
"move 2% 78%, class:peaclock"
"size 30% 20%, class:peaclock"
"float, class:floating"
"size 40% 40%, class:floating"
"move 30% 30%, class:floating"
"float, title:Bluetooth Devices"
"move 20% 20%, title:Bluetooth Devices"
"size 60% 60%, title:Bluetooth Devices"
];
animations = {
enabled = true;
bezier = [
"linear, 0, 0, 1, 1"
"md3_standard, 0.2, 0, 0, 1"
"md3_decel, 0.05, 0.7, 0.1, 1"
"md3_accel, 0.3, 0, 0.8, 0.15"
"overshot, 0.05, 0.9, 0.1, 1.1"
"crazyshot, 0.1, 1.5, 0.76, 0.92 "
"hyprnostretch, 0.05, 0.9, 0.1, 1.0"
"fluent_decel, 0.1, 1, 0, 1"
"easeInOutCirc, 0.85, 0, 0.15, 1"
"easeOutCirc, 0, 0.55, 0.45, 1"
"easeOutExpo, 0.16, 1, 0.3, 1"
];
animation = [
"windows, 1, 3, md3_decel, popin 60%"
"border, 1, 10, default"
"fade, 1, 2.5, md3_decel"
"workspaces, 1, 3.5, easeOutExpo, slide"
"specialWorkspace, 1, 3, md3_decel, slidevert"
];
};
};
};
}