[sway] Move config and use
This commit is contained in:
parent
65ef0adf6d
commit
8f97a8c719
16 changed files with 530 additions and 498 deletions
|
|
@ -1,110 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
# bash script to let dbus know about important env variables and
|
||||
# propagate them to relevent services run at the end of sway config
|
||||
# see
|
||||
# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
|
||||
# note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts
|
||||
# some user services to make sure they have the correct environment variables
|
||||
dbus-sway-environment = pkgs.writeTextFile {
|
||||
name = "dbus-sway-environment";
|
||||
destination = "/bin/dbus-sway-environment";
|
||||
executable = true;
|
||||
|
||||
text = ''
|
||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||
systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
'';
|
||||
};
|
||||
|
||||
# currently, there is some friction between sway and gtk:
|
||||
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
|
||||
# the suggested way to set gtk settings is with gsettings
|
||||
# for gsettings to work, we need to tell it where the schemas are
|
||||
# using the XDG_DATA_DIR environment variable
|
||||
# run at the end of sway config
|
||||
configure-gtk = pkgs.writeTextFile {
|
||||
name = "configure-gtk";
|
||||
destination = "/bin/configure-gtk";
|
||||
executable = true;
|
||||
text = let
|
||||
schema = pkgs.gsettings-desktop-schemas;
|
||||
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
|
||||
in ''
|
||||
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
|
||||
gnome_schema=org.gnome.desktop.interface
|
||||
gsettings set $gnome_schema gtk-theme 'Dracula'
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
|
||||
displayManager.lightdm.enable = true;
|
||||
|
||||
excludePackages = with pkgs; [
|
||||
xterm
|
||||
];
|
||||
};
|
||||
|
||||
security.polkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
services.dbus.enable = true;
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
};
|
||||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
};
|
||||
|
||||
home-manager.users.tdpeuter = { pkgs, ... }: {
|
||||
home = {
|
||||
username = "tdpeuter";
|
||||
homeDirectory = "/home/tdpeuter";
|
||||
|
||||
file = {
|
||||
".config/sway".source = ../../../../stow/sway/.config/sway;
|
||||
".config/waybar".source = ../../../../stow/waybar/.config/waybar;
|
||||
".config/dunst".source = ../../../../stow/dunst/.config/dunst;
|
||||
# TODO Fix scripts, I don't like it this way
|
||||
".scripts".source = ../../../../stow/_scripts/.scripts;
|
||||
};
|
||||
|
||||
packages = with pkgs; [
|
||||
brightnessctl
|
||||
dunst
|
||||
font-awesome
|
||||
pamixer
|
||||
pavucontrol
|
||||
playerctl
|
||||
swayidle
|
||||
swaylock-effects
|
||||
waybar
|
||||
wmname
|
||||
];
|
||||
# };
|
||||
#
|
||||
# wayland.windowManager.sway = {
|
||||
# enable = true;
|
||||
# package = pkgs.sway-unwrapped;
|
||||
# config = rec {
|
||||
# terminal = "alacritty";
|
||||
# startup = [
|
||||
# {command = "alacritty";}
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
./desktop
|
||||
./hardware
|
||||
./networking
|
||||
./nix
|
||||
./programs
|
||||
./services
|
||||
./virtualisation
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
imports = [
|
||||
./gnome
|
||||
./plasma
|
||||
./sway
|
||||
];
|
||||
}
|
||||
|
|
|
|||
128
nixos/modules/desktop/sway/default.nix
Normal file
128
nixos/modules/desktop/sway/default.nix
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.sisyphus.desktop.sway;
|
||||
|
||||
# bash script to let dbus know about important env variables and
|
||||
# propagate them to relevent services run at the end of sway config
|
||||
# see
|
||||
# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
|
||||
# note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts
|
||||
# some user services to make sure they have the correct environment variables
|
||||
dbus-sway-environment = pkgs.writeTextFile {
|
||||
name = "dbus-sway-environment";
|
||||
destination = "/bin/dbus-sway-environment";
|
||||
executable = true;
|
||||
|
||||
text = ''
|
||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||
systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
'';
|
||||
};
|
||||
|
||||
# currently, there is some friction between sway and gtk:
|
||||
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
|
||||
# the suggested way to set gtk settings is with gsettings
|
||||
# for gsettings to work, we need to tell it where the schemas are
|
||||
# using the XDG_DATA_DIR environment variable
|
||||
# run at the end of sway config
|
||||
configure-gtk = pkgs.writeTextFile {
|
||||
name = "configure-gtk";
|
||||
destination = "/bin/configure-gtk";
|
||||
executable = true;
|
||||
text = let
|
||||
schema = pkgs.gsettings-desktop-schemas;
|
||||
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
|
||||
in ''
|
||||
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
|
||||
gnome_schema=org.gnome.desktop.interface
|
||||
# gsettings set $gnome_schema gtk-theme 'Dracula'
|
||||
'';
|
||||
};
|
||||
in {
|
||||
options.sisyphus.desktop.sway.enable = lib.mkEnableOption "Sway";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = (with pkgs; [
|
||||
dbus-sway-environment
|
||||
configure-gtk
|
||||
wayland
|
||||
xdg-utils # Open with default program
|
||||
glib # gsettings
|
||||
wl-clipboard
|
||||
wdisplays # Tool to configure displays
|
||||
|
||||
brightnessctl
|
||||
dunst
|
||||
libnotify
|
||||
playerctl
|
||||
swaybg
|
||||
swaylock-effects
|
||||
waybar
|
||||
wlsunset
|
||||
|
||||
# TODO Turn into own module/package?
|
||||
jq
|
||||
j4-dmenu-desktop
|
||||
rofi
|
||||
]) ++ (with pkgs.sway-contrib; [
|
||||
grimshot
|
||||
]);
|
||||
|
||||
environment.sessionVariables = {
|
||||
SCRIPT_DIR = ../../../../scripts;
|
||||
};
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
dejavu_fonts
|
||||
font-awesome
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-emoji
|
||||
source-han-sans
|
||||
source-han-sans-japanese
|
||||
source-han-serif-japanese
|
||||
];
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
services = {
|
||||
atd.enable = true; # Required by sunset.sh
|
||||
dbus.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
power-profiles-daemon.enable = true;
|
||||
|
||||
xserver.displayManager.session = [{
|
||||
manage = "window";
|
||||
name = "Sway";
|
||||
start = ''
|
||||
${pkgs.sway}/bin/sway --unsupported-gpu &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
};
|
||||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
};
|
||||
|
||||
sisyphus.users.wantedGroups = [
|
||||
config.users.groups.video.name # Brightnessctl
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -45,7 +45,7 @@ in {
|
|||
];
|
||||
|
||||
sisyphus = {
|
||||
desktop.gnome.enable = true;
|
||||
desktop.sway.enable = true;
|
||||
programs.spotify-adblock.enable = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,18 @@ in {
|
|||
source = ../../../stow/openrgb/.config/OpenRGB;
|
||||
recursive = true;
|
||||
};
|
||||
".config/sway" = {
|
||||
enable = config.sisyphus.desktop.sway.enable;
|
||||
source = ../../../stow/sway/.config/sway;
|
||||
};
|
||||
".config/swayidle" = {
|
||||
enable = (builtins.elem pkgs.swayidle installedPkgs);
|
||||
source = ../../../stow/swayidle/.config/swayidle;
|
||||
};
|
||||
".config/swaylock" = {
|
||||
enable = config.sisyphus.desktop.sway.enable;
|
||||
source = ../../../stow/swaylock/.config/swaylock;
|
||||
};
|
||||
".config/vifm" = {
|
||||
enable = (builtins.elem pkgs.vifm installedPkgs);
|
||||
source = ../../../stow/vifm/.config/vifm;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue