refactor(desktop): Split out desktop configuration
* move desktop configuration to own nix file * remove old clone-wallpapers service * use wallpapers nix package for randomly setting wallpaper
This commit is contained in:
parent
296ae9f1fd
commit
4327d0e0b9
3 changed files with 52 additions and 57 deletions
|
@ -10,7 +10,7 @@
|
|||
./hardware-configuration.nix
|
||||
./local-configuration.nix
|
||||
./packages.nix
|
||||
./wallpapers.nix
|
||||
./desktop.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
|
@ -22,21 +22,6 @@
|
|||
# Set your time zone.
|
||||
time.timeZone = "Europe/Oslo";
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
services.xserver.layout = "us,no";
|
||||
services.xserver.xkbOptions = "caps:super, grp:shifts_toggle";
|
||||
|
||||
# Configure i3 & compositor
|
||||
services.xserver.windowManager.i3.enable = true;
|
||||
services.compton.enable = true;
|
||||
services.compton.backend = "xrender";
|
||||
|
||||
# Configure Redshift for Oslo
|
||||
services.redshift.enable = true;
|
||||
services.redshift.latitude = "59.911491";
|
||||
services.redshift.longitude = "10.757933";
|
||||
|
||||
# Configure shell environment
|
||||
programs.fish.enable = true;
|
||||
programs.ssh.startAgent = true;
|
||||
|
@ -46,13 +31,6 @@
|
|||
# Configure other random applications:
|
||||
programs.java.enable = true;
|
||||
|
||||
# Configure fonts
|
||||
fonts = {
|
||||
fonts = with pkgs; [
|
||||
input-fonts
|
||||
];
|
||||
};
|
||||
|
||||
# Configure user account
|
||||
users.defaultUserShell = pkgs.fish;
|
||||
users.extraUsers.vincent = {
|
||||
|
|
51
desktop.nix
Normal file
51
desktop.nix
Normal file
|
@ -0,0 +1,51 @@
|
|||
# Configuration for the desktop environment
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let wallpapers = import ./pkgs/wallpapers.nix;
|
||||
in {
|
||||
# Configure basic X-server stuff:
|
||||
services.xserver.enable = true;
|
||||
services.xserver.layout = "us,no";
|
||||
services.xserver.xkbOptions = "caps:super, grp:shifts_toggle";
|
||||
|
||||
# configure desktop environment:
|
||||
services.xserver.windowManager.i3.enable = true;
|
||||
services.compton.enable = true;
|
||||
services.compton.backend = "xrender"; # this should be the default!
|
||||
|
||||
# Configure Redshift for Oslo
|
||||
services.redshift.enable = true;
|
||||
services.redshift.latitude = "59.911491";
|
||||
services.redshift.longitude = "10.757933";
|
||||
|
||||
# Configure fonts
|
||||
fonts = {
|
||||
fonts = with pkgs; [
|
||||
input-fonts
|
||||
];
|
||||
};
|
||||
|
||||
# Ensure wallpapers are "installed"
|
||||
environment.systemPackages = [ wallpapers ];
|
||||
|
||||
# Configure random setting of wallpapers
|
||||
systemd.user.services.feh-wp = {
|
||||
description = "Randomly set wallpaper via feh";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = "${wallpapers}/share/wallpapers";
|
||||
ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.fd}/bin/fd -atf | shuf | head -n1 | ${pkgs.findutils}/bin/xargs ${pkgs.feh}/bin/feh --bg-fill'";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.timers.feh-wp = {
|
||||
description = "Set a random wallpaper every hour";
|
||||
wantedBy = [ "timers.target" ];
|
||||
|
||||
timerConfig = {
|
||||
OnActiveSec = "3second";
|
||||
OnUnitActiveSec = "1hour";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,34 +0,0 @@
|
|||
# Configuration for randomly setting wallpapers.
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Configure random setting of wallpapers
|
||||
systemd.user.services.clone-wallpapers = {
|
||||
description = "Clone wallpaper repository";
|
||||
enable = true;
|
||||
before = [ "feh-wp.service" "feh-wp.timer" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.fish}/bin/fish -c '${pkgs.coreutils}/bin/stat %h/wallpapers; or ${pkgs.git}/bin/git clone https://git.tazj.in/tazjin/wallpapers.git %h/wallpapers'";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.feh-wp = {
|
||||
description = "Randomly set wallpaper via feh";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = "%h/wallpapers";
|
||||
ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.fd}/bin/fd -atf | shuf | head -n1 | ${pkgs.findutils}/bin/xargs ${pkgs.feh}/bin/feh --bg-fill'";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.timers.feh-wp = {
|
||||
description = "Set a random wallpaper every hour";
|
||||
wantedBy = [ "timers.target" ];
|
||||
|
||||
timerConfig = {
|
||||
OnActiveSec = "3second";
|
||||
OnUnitActiveSec = "1hour";
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue