noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-22 22:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks for i3 and common

Browse Source
This commit is contained in:
Noah Masur 2022-10-28 23:58:33 -04:00
parent bf09e166a9
commit e16674c817
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common.nix
View File

@ -23,7 +23,7 @@
}; };
identityFile = lib.mkOption { identityFile = lib.mkOption {
type = lib.types.str; type = lib.types.str;
description = "Path to existing identity file."; description = "Path to existing private key file.";
default = "/etc/ssh/ssh_host_ed25519_key"; default = "/etc/ssh/ssh_host_ed25519_key";
}; };
gui = { gui = {

1
hosts/desktop/default.nix
View File

@ -14,7 +14,6 @@ nixpkgs.lib.nixosSystem {
nix.registry.nixpkgs.flake = nixpkgs; nix.registry.nixpkgs.flake = nixpkgs;
identityFile = "/home/${globals.user}/.ssh/id_ed25519"; identityFile = "/home/${globals.user}/.ssh/id_ed25519";
gaming.steam = true; gaming.steam = true;
gaming.leagueoflegends = true;
gaming.legendary = true; gaming.legendary = true;
gui = { gui = {
enable = true; enable = true;

14
modules/graphical/i3.nix
View File

@ -9,11 +9,11 @@ let
in { in {
config = lib.mkIf config.services.xserver.enable { config = {
services.xserver.windowManager = { services.xserver.windowManager = {
i3 = { i3 = {
enable = true; enable = config.services.xserver.enable;
package = pkgs.i3-gaps; package = pkgs.i3-gaps;
}; };
}; };
@ -25,7 +25,7 @@ in {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = true; enable = config.services.xserver.enable;
package = pkgs.i3-gaps; package = pkgs.i3-gaps;
config = let config = let
modifier = "Mod4"; # Super key modifier = "Mod4"; # Super key
@ -238,7 +238,7 @@ in {
}; };
programs.fish.functions = { programs.fish.functions = {
update-lock-screen = { update-lock-screen = lib.mkIf config.services.xserver.enable {
description = "Update lockscreen with wallpaper"; description = "Update lockscreen with wallpaper";
body = lockUpdate; body = lockUpdate;
}; };
@ -247,17 +247,19 @@ in {
# Update lock screen cache only if cache is empty # Update lock screen cache only if cache is empty
home.activation.updateLockScreenCache = home.activation.updateLockScreenCache =
let cacheDir = "${config.homePath}/.cache/betterlockscreen/current"; let cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
in config.home-manager.users.${config.user}.lib.dag.entryAfter in lib.mkIf config.services.xserver.enable
(config.home-manager.users.${config.user}.lib.dag.entryAfter
[ "writeBoundary" ] '' [ "writeBoundary" ] ''
if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
$DRY_RUN_CMD ${lockUpdate} $DRY_RUN_CMD ${lockUpdate}
fi fi
''; '');
}; };
# Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service # Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service
systemd.services.lock = { systemd.services.lock = {
enable = config.services.xserver.enable;
description = "Lock the screen on resume from suspend"; description = "Lock the screen on resume from suspend";
before = [ "sleep.target" "suspend.target" ]; before = [ "sleep.target" "suspend.target" ];
serviceConfig = { serviceConfig = {