pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add swayfx version of sway, switch to using for consistent setup across devices

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-06-20 07:05:13 +01:00
parent a482eb86ec
commit 80a5b82038
5 changed files with 42 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
home/desktop/sway.nix
View file

@ -9,7 +9,6 @@
in { in {
imports = [ imports = [
./swaylock.nix ./swaylock.nix
# ./eww.nix
./waybar.nix ./waybar.nix
./gtk.nix ./gtk.nix
./dunst.nix ./dunst.nix
@ -20,7 +19,6 @@ in {
wireplumber wireplumber
wl-clipboard wl-clipboard
swayimg swayimg
hyprpaper
brightnessctl brightnessctl
]; ];
programs.rofi.package = pkgs.rofi-wayland; programs.rofi.package = pkgs.rofi-wayland;
@ -39,7 +37,7 @@ in {
}; };
bars = []; bars = [];
startup = [{command = "dunst";} {command = "waybar";}]; startup = [{command = "dunst";} {command = "waybar";}];
modifier = lib.mkDefault "Mod4"; modifier = lib.mkDefault "Mod1";
terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm"; terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
keybindings = lib.mkOptionDefault { keybindings = lib.mkOptionDefault {
"${modifier}+Return" = "exec ${term}"; "${modifier}+Return" = "exec ${term}";
@ -48,7 +46,7 @@ in {
"${modifier}+p" = "exec powermenu"; "${modifier}+p" = "exec powermenu";
"${modifier}+v" = "floating toggle"; "${modifier}+v" = "floating toggle";
"${modifier}+space" = "exec ${pkgs.rofi}/bin/rofi -show drun"; "${modifier}+space" = "exec ${pkgs.rofi}/bin/rofi -show drun";
# "${modifier}+F1" = "exec ${pkgs.swaylock}/bin/swaylock"; "${modifier}+F1" = "exec ${pkgs.swaylock}/bin/swaylock";
"${modifier}+w" = "exec ${pkgs.firefox}/bin/firefox"; "${modifier}+w" = "exec ${pkgs.firefox}/bin/firefox";
"${modifier}+f" = "exec ${pkgs.xfce.thunar}/bin/thunar"; "${modifier}+f" = "exec ${pkgs.xfce.thunar}/bin/thunar";
"${modifier}+m" = "fullscreen toggle"; "${modifier}+m" = "fullscreen toggle";

16
home/desktop/swayfx.nix Normal file
View file

@ -0,0 +1,16 @@
{pkgs, ...}: {
imports = [./sway.nix];
wayland.windowManager.sway = {
package = pkgs.swayfx;
extraConfig = ''
corner_radius 10
blur enable
blur_xray disable
blur_passes 3
blur_radius 5
shadows enable
shadow_blur_radius 4
scratchpad_minimize disable
'';
};
}

2
machines/N0245/default.nix
View file

@ -28,7 +28,7 @@
enable = true; enable = true;
settings = rec { settings = rec {
initial_session = { initial_session = {
command = "Hyprland"; command = "sway";
user = "elitherl"; user = "elitherl";
}; };
default_session = initial_session; default_session = initial_session;

33
machines/N0245/elitherl.nix
View file

@ -2,7 +2,7 @@
imports = [ imports = [
../../home/work.nix ../../home/work.nix
../../home/gui ../../home/gui
../../home/desktop/hyprland.nix ../../home/desktop/swayfx.nix
]; ];
home.username = "elitherl"; home.username = "elitherl";
home.homeDirectory = "/home/elitherl"; home.homeDirectory = "/home/elitherl";
@ -16,23 +16,24 @@
]; ];
programs.firefox.package = pkgs.firefox-wayland; programs.firefox.package = pkgs.firefox-wayland;
wayland.windowManager.hyprland.extraConfig = '' # wayland.windowManager.hyprland.extraConfig = ''
source=./common.conf # source=./common.conf
monitor=eDP-1,preferred,auto,auto # monitor=eDP-1,preferred,auto,auto
monitor=DP-3,preferred,auto,auto # monitor=DP-3,preferred,auto,auto
monitor=DP-4,preferred,auto,auto,transform,1 # monitor=DP-4,preferred,auto,auto,transform,1
windowrule = float, title:^([Zz]oom).*$ # windowrule = float, title:^([Zz]oom).*$
windowrule = center, title:^([Zz]oom).*$ # windowrule = center, title:^([Zz]oom).*$
windowrule = float, ^(Nxplayer.bin)$ # windowrule = float, ^(Nxplayer.bin)$
windowrule = center, ^(Nxplayer.bin)$ # windowrule = center, ^(Nxplayer.bin)$
windowrule = workspace 3, title:^([Zz]oom).*$ # windowrule = workspace 3, title:^([Zz]oom).*$
windowrule = workspace 4, ^(Nxplayer.bin)$ # windowrule = workspace 4, ^(Nxplayer.bin)$
''; # '';
wayland.windowManager.sway.config.output.eDP-2.scale = "1.5";
programs.waybar.settings = { programs.waybar.settings = {
main = { main = {
"output" = "DP-3"; "output" = "DP-3";
"modules-left" = [ "modules-left" = [
"wlr/workspaces" "sway/workspaces"
"cpu" "cpu"
"memory" "memory"
"temperature" "temperature"
@ -54,7 +55,7 @@
]; ];
"output" = "eDP-1"; "output" = "eDP-1";
"modules-left" = [ "modules-left" = [
"wlr/workspaces" "sway/workspaces"
"cpu" "cpu"
"memory" "memory"
"temperature" "temperature"
@ -75,7 +76,7 @@
"~/.config/waybar/layout.json" "~/.config/waybar/layout.json"
]; ];
"output" = "DP-4"; "output" = "DP-4";
"modules-left" = ["wlr/workspaces"]; "modules-left" = ["sway/workspaces"];
"modules-center" = ["clock#compact"]; "modules-center" = ["clock#compact"];
"modules-right" = ["tray"]; "modules-right" = ["tray"];
}; };

10
machines/Vanguard/xenia.nix
View file

@ -2,7 +2,7 @@
imports = [ imports = [
../../home/personal.nix ../../home/personal.nix
../../home/gui ../../home/gui
../../home/desktop/sway.nix ../../home/desktop/swayfx.nix
]; ];
home.username = "xenia"; home.username = "xenia";
home.homeDirectory = "/home/xenia"; home.homeDirectory = "/home/xenia";
@ -17,12 +17,14 @@
startup = [{command = "steam";}]; startup = [{command = "steam";}];
}; };
programs.waybar.settings.main = { programs.waybar.settings.main = {
"modules-left" = ["sway/workspaces"]; "modules-left" = [
"modules-center" = ["clock"]; "sway/workspaces"
"modules-right" = [
"cpu" "cpu"
"memory" "memory"
"temperature" "temperature"
];
"modules-center" = ["clock"];
"modules-right" = [
"pulseaudio" "pulseaudio"
"bluetooth" "bluetooth"
"network" "network"