From 6e34ca8bda9cddcce1ea73f73b883a3ec8358678 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 14 Oct 2022 18:01:11 +0200 Subject: Reformat nix files --- system/settings/programs/shell.nix | 9 ++--- system/settings/programs/window-manager.nix | 53 +++++++++++++++-------------- 2 files changed, 32 insertions(+), 30 deletions(-) (limited to 'system/settings/programs') diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix index edc39d0e..bf8fc3aa 100644 --- a/system/settings/programs/shell.nix +++ b/system/settings/programs/shell.nix @@ -1,10 +1,11 @@ { config, pkgs, ... }: -{ programs.zsh = { +{ + programs.zsh = { enable = true; promptInit = ""; -} // (if pkgs.stdenv.isDarwin then {} else { - enableGlobalCompInit = false; -}); + } // (if pkgs.stdenv.isDarwin then {} else { + enableGlobalCompInit = false; + }); programs.bash.enableCompletion = true; } diff --git a/system/settings/programs/window-manager.nix b/system/settings/programs/window-manager.nix index c3e89709..b2d94929 100644 --- a/system/settings/programs/window-manager.nix +++ b/system/settings/programs/window-manager.nix @@ -1,27 +1,28 @@ { config, pkgs, ... }: -{ services.xserver = { - desktopManager.xterm.enable = false; +{ + services.xserver = { + desktopManager.xterm.enable = false; - displayManager = { - autoLogin = { - user = "alan"; - enable = false; - }; - lightdm = { - enable = true; - greeter.enable = true; - greeters.mini = { - enable = false; - user = "alan"; - }; - }; - sessionCommands = '' - ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.xresources/main - ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c' - ${pkgs.networkmanagerapplet}/bin/nm-applet & - ''; - }; + displayManager = { + autoLogin = { + user = "alan"; + enable = false; + }; + lightdm = { + enable = true; + greeter.enable = true; + greeters.mini = { + enable = false; + user = "alan"; + }; + }; + sessionCommands = '' + ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.xresources/main + ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c' + ${pkgs.networkmanagerapplet}/bin/nm-applet & + ''; + }; xautolock = { enable = true; locker = "${pkgs.i3lock}/bin/i3lock -n"; @@ -33,11 +34,11 @@ services.xserver.displayManager.setupCommands = '' ${pkgs.redshift}/bin/redshift \ - -l ${toString config.location.latitude}:${toString config.location.longitude} \ - -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \ - -b 1:1 \ - -o \ - -r + -l ${toString config.location.latitude}:${toString config.location.longitude} \ + -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \ + -b 1:1 \ + -o \ + -r ''; environment.systemPackages = with pkgs; [ -- cgit 1.4.1