clean up sway after exit

This commit is contained in:
wieerwill 2024-11-15 20:04:00 +01:00
parent f62f70d258
commit 8b846b1811
2 changed files with 26 additions and 16 deletions

34
configuration.nix Executable file → Normal file
View File

@ -8,13 +8,13 @@
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
(
let revision = "e74e57a37de55ecfdc62f49fe5a7463b2a52499a"; in
builtins.fetchTarball {
url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz";
sha256 = "sha256:184zvpfcxzspai0mjmq5wfh9n6gjzx0430ygq5r1z1b9j59fhd5r";
} + "/modules"
)
(
let revision = "e74e57a37de55ecfdc62f49fe5a7463b2a52499a"; in
builtins.fetchTarball {
url = "https://github.com/Jovian-Experiments/Jovian-NixOS/archive/${revision}.tar.gz";
sha256 = "sha256:184zvpfcxzspai0mjmq5wfh9n6gjzx0430ygq5r1z1b9j59fhd5r";
} + "/modules"
)
];
jovian = {
@ -35,6 +35,7 @@
user = "wieerwill";
};
};
programs.xwayland.enable = true;
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
@ -47,7 +48,10 @@
networking.hostName = "decky"; # Define your hostname.
networking.networkmanager.enable = true;
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Set your time zone.
time.timeZone = "Europe/Berlin";
@ -72,6 +76,10 @@
security.polkit.enable = true;
environment.systemPackages = with pkgs; [
xwayland
(writers.writeDashBin "sway-logout" ''
${systemd}/bin/systemctl --user unset-environment WAYLAND_DISPLAY SWAYSOCK
${sway}/bin/swaymsg exit
'')
];
# Enable the gnome-keyring secrets vault.
# Will be exposed through DBus to programs willing to store secrets.
@ -102,15 +110,16 @@
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
services.libinput.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.groups.steamos.gid = 1000;
users.users.wieerwill = {
isNormalUser = true;
description = "WieErWill";
group = "steamos";
description = "wieerwill";
#groups = "steamos";
extraGroups = [ "networkmanager" "wheel" "users" "video" "audio" "input"];
packages = with pkgs; [];
};
# Allow unfree packages
@ -144,12 +153,14 @@
allowedTCPPorts = [22 80 443];
allowedUDPPorts = [];
};
services.fail2ban = {
enable = true;
maxretry = 5;
bantime = "1m";
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
@ -159,4 +170,3 @@
system.stateVersion = "24.05"; # Did you read the comment?
}

View File

@ -14,18 +14,18 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/4765b74a-6eb0-41f1-bf69-3e0cb30e14cf";
{ device = "/dev/disk/by-uuid/ceb735f5-6728-4fb6-9d25-3bbf7d198b49";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8D22-F1B8";
{ device = "/dev/disk/by-uuid/E8E8-9A4B";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/8e67c9ae-4b38-4104-b0f5-fcecaeeb1438"; }
[ { device = "/dev/disk/by-uuid/d1808b85-6f98-40f3-a06a-62836aee3809"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking