james/nil
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

misc changes

Browse Source
This commit is contained in:
James Patrick 2022-02-09 23:13:06 -05:00
parent 62c4721d0a
commit 0d7b9f78a5
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -118,7 +118,7 @@ remove:
swapoff /dev/partitions/swap >/dev/null || true swapoff /dev/partitions/swap >/dev/null || true
umount /mnt/home >/dev/null || true umount /mnt/home >/dev/null || true
umount /mnt/boot >/dev/null || true umount /mnt/boot >/dev/null || true
umount /mnt/rpool >/dev/null || true umount /mnt/rpool >/dev/null || true
umount /mnt >/dev/null || true umount /mnt >/dev/null || true
yes | lvremove /dev/partitions/* >/dev/null || true yes | lvremove /dev/partitions/* >/dev/null || true
cryptsetup close root >/dev/null || true cryptsetup close root >/dev/null || true

36
modules/applications/sway/mako.nix
View File

@ -14,8 +14,8 @@ in with lib; {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.james = { home-manager.users.james = {
systemd.user.startServices = true;
programs.mako = { programs.mako = {
enable = true; enable = true;
width = 450; width = 450;
@ -50,22 +50,34 @@ in with lib; {
home.packages = with pkgs; [ libnotify ]; home.packages = with pkgs; [ libnotify ];
}; };
systemd.user.services.mako = { systemd.user.services.mako = {
enable = true; enable = true;
description = "Mako - Notificaitons for Wayland"; description = "Mako foo";
documentation = [ "man:mako(5)" ]; wantedBy = [ "graphical-session.target" ];
partOf = [ "sway-session.target" ]; partOf = [ "graphical-session.target" ];
bindsTo = [ "sway-session.target" ];
environment.PATH = lib.mkForce null;
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.mako}/bin/mako"; ExecStart = ''
Restart = "on-failure"; ${pkgs.mako}/bin/mako
RestartSec = 1; '';
TimeoutStopSec = 10; RestartSec = 5;
Type = "simple"; Restart = "always";
}; };
}; };
# systemd.user.services.mako = {
# enable = true;
# description = "Mako - Notificaitons for Wayland";
# documentation = [ "man:mako(5)" ];
# partOf = [ "sway-session.target" ];
# bindsTo = [ "sway-session.target" ];
# environment.PATH = lib.mkForce null;
# serviceConfig = {
# ExecStart = "${pkgs.mako}/bin/mako";
# Restart = "on-failure";
# RestartSec = 1;
# TimeoutStopSec = 10;
# Type = "simple";
# };
# };
}; };
} }

4
modules/applications/sway/sway.nix
View File

@ -72,15 +72,15 @@ in with lib; {
# systemctl --user import-environment in startsway # systemctl --user import-environment in startsway
environment.PATH = lib.mkForce null; environment.PATH = lib.mkForce null;
serviceConfig = { serviceConfig = {
Type = "simple";
ExecStart = ExecStart =
"${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway --debug"; "${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway --debug";
ExecStopPost = ExecStopPost =
"/usr/bin/systemctl --user unset-environment SWAYSOCK DISPLAY I3SOCK WAYLAND_DISPLAY"; "/usr/bin/env systemctl --user unset-environment SWAYSOCK DISPLAY I3SOCK WAYLAND_DISPLAY";
NotifyAccess = "all"; NotifyAccess = "all";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 1; RestartSec = 1;
TimeoutStopSec = 10; TimeoutStopSec = 10;
Type = "simple";
}; };
}; };