mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2025-04-25 16:08:30 +02:00
systemd 254 arrived, switched back to sway
This commit is contained in:
parent
e7cb531d8b
commit
b81a7a669a
14 changed files with 96 additions and 36 deletions
|
@ -5,7 +5,7 @@
|
|||
users.users.rouven = {
|
||||
description = "Rouven Seifert";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "video" "libvirtd" "tss" ];
|
||||
extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" ];
|
||||
initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
|
||||
};
|
||||
home-manager.useUserPackages = true;
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
hcloud
|
||||
jq
|
||||
logseq
|
||||
xournalpp
|
||||
|
||||
# programming languages
|
||||
cargo
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
# ./sway.nix
|
||||
./sway.nix
|
||||
./breaktimer.nix
|
||||
./river.nix
|
||||
./waybar.nix
|
||||
./shikane.nix
|
||||
];
|
||||
|
@ -15,6 +14,7 @@
|
|||
swaynotificationcenter
|
||||
playerctl
|
||||
wdisplays
|
||||
(libinput.override { eventGUISupport = true; })
|
||||
];
|
||||
|
||||
services.swayidle = {
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad drag enabled
|
||||
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled
|
||||
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad accel-profile adaptive
|
||||
|
||||
|
||||
riverctl spawn "${pkgs.swaybg}/bin/swaybg -i ${../../../../images/wallpaper.png} -m fill"
|
||||
|
||||
|
|
|
@ -33,6 +33,37 @@
|
|||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
# TODO home vertical
|
||||
name = "home-vertical";
|
||||
output = [
|
||||
{
|
||||
match = "eDP-1";
|
||||
enable = true;
|
||||
position = {
|
||||
x = 1080;
|
||||
y = 0;
|
||||
};
|
||||
}
|
||||
{
|
||||
match = "DP-3";
|
||||
enable = true;
|
||||
position = {
|
||||
x = 0;
|
||||
y = 0;
|
||||
};
|
||||
transform = "270";
|
||||
}
|
||||
{
|
||||
match = "HDMI-A-1";
|
||||
enable = true;
|
||||
position = {
|
||||
x = 3000;
|
||||
y = 0;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "external-monitor-default";
|
||||
output = [
|
||||
|
|
|
@ -7,10 +7,13 @@
|
|||
config = rec {
|
||||
startup = [
|
||||
{
|
||||
command = "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png}";
|
||||
command = "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png} -m fill";
|
||||
}
|
||||
{
|
||||
command = lib.getExe pkgs.autotiling-rs;
|
||||
command = "${pkgs.autotiling-rs}/bin/autotiling-rs";
|
||||
}
|
||||
{
|
||||
command = ''swaymsg -t subscribe -m "['workspace']" | jq --unbuffered -r 'select(.change == "focus") | .current.output' | xargs -L1 swaymsg input 1386:884:Wacom_Intuos_S_Pen map_to_output'';
|
||||
}
|
||||
];
|
||||
modifier = "Mod4";
|
||||
|
@ -30,6 +33,7 @@
|
|||
tap = "enabled";
|
||||
drag = "enabled";
|
||||
middle_emulation = "enabled";
|
||||
accel_profile = "adaptive";
|
||||
};
|
||||
};
|
||||
keybindings =
|
||||
|
@ -38,7 +42,7 @@
|
|||
"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
|
||||
"XF86Launch2" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${lib.getExe pkgs.swappy} -f -";
|
||||
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 10";
|
||||
"XF86MonBrightnessDown" = "exec ${kgs.light}/bin/light -U 10";
|
||||
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 10";
|
||||
"XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
|
@ -56,3 +60,4 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -10,8 +10,7 @@
|
|||
layer = "top";
|
||||
position = "top";
|
||||
height = 26;
|
||||
# modules-left = [ "wlr/workspaces" "custom/spotifytitle" "hyprland/window" ];
|
||||
modules-left = [ "river/tags" "custom/spotifytitle" "river/window" ];
|
||||
modules-left = [ "sway/workspaces" "custom/spotifytitle" "sway/window" ];
|
||||
modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
|
||||
network = {
|
||||
format-wifi = " {essid} ({signalStrength}%)";
|
||||
|
@ -21,11 +20,11 @@
|
|||
format-disconnected = "Disconnected ⚠";
|
||||
format-alt = "{ifname}: {ipaddr}/{cidr}";
|
||||
};
|
||||
"river/tags" = {
|
||||
"sway/workspaces" = {
|
||||
format = "{icon}";
|
||||
on-click = "activate";
|
||||
};
|
||||
"river/window" = {
|
||||
"sway/window" = {
|
||||
format = " {}";
|
||||
# separate-outputs = true;
|
||||
};
|
||||
|
@ -114,22 +113,18 @@
|
|||
background-color: transparent;
|
||||
}
|
||||
|
||||
#tags button {
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
background-color: transparent;
|
||||
color: #${config.colorScheme.colors.base05};
|
||||
}
|
||||
|
||||
#tags button.occupied {
|
||||
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
|
||||
}
|
||||
|
||||
#tags button.focused {
|
||||
#workspaces button.focused {
|
||||
background-color: #${config.colorScheme.colors.base04};
|
||||
box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
|
||||
}
|
||||
|
||||
#tags button.urgent {
|
||||
#workspaces button.urgent {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue