diff --git a/Droidnix/README.html b/Droidnix/README.html index 41fdb35b5..b33278574 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- +generated/modules/traveldroid/apps/packages.nixgenerated/assets/packages.confgenerated/modules/traveldroid/apps/kitty.nix.config/kitty/Catppuccin-Mocha.conf.config/kitty/kitty.confgenerated/modules/traveldroid/apps/starship.nix.config/starship.tomlgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nix.config/wofi/config.config/wofi/style.cssgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/modules/traveldroid/apps/packages.nixgenerated/assets/packages.confgenerated/modules/traveldroid/apps/kitty.nix.config/kitty/Catppuccin-Mocha.conf.config/kitty/kitty.confgenerated/modules/traveldroid/apps/starship.nix.config/starship.tomlgenerated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/wofi.nix.config/wofi/config.config/wofi/style.cssgenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/.config/emacs/early-init.elgenerated/.config/emacs/init.elgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nix.config/hypr/animations.conf.config/hypr/behaviour.conf.config/hypr/bindings.conf.config/hypr/exec-once.conf.config/hypr/hypridle.conf.config/hypr/hyprland.conf.config/hypr/hyprlock.conf.config/hypr/layer-rules.conf.config/hypr/layout.conf.config/hypr/monitor-rules.conf.config/hypr/scripts/layout-selector.sh.config/hypr/theming.css.config/hypr/window-rules.conf.config/hypr/workspace-rules.confgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/stylix.nix.config/stylix/stylix.conf.config/stylix/palette.json.config/stylix/palette.htmlgenerated/modules/traveldroid/desktop/waybar.nix.config/waybar/config.config/waybar/style.css.config/waypaper/config.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/hyprland.nix.config/hypr/animations.conf.config/hypr/behaviour.conf.config/hypr/bindings.conf.config/hypr/exec-once.conf.config/hypr/hypridle.conf.config/hypr/hyprland.conf.config/hypr/hyprlock.conf.config/hypr/layer-rules.conf.config/hypr/layout.conf.config/hypr/monitor-rules.conf.config/hypr/scripts/layout-selector.sh.config/hypr/theming.css.config/hypr/window-rules.conf.config/hypr/workspace-rules.confgenerated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/stylix.nix.config/stylix/stylix.conf.config/stylix/palette.json.config/stylix/palette.htmlgenerated/modules/traveldroid/desktop/waybar.nix.config/waybar/config.config/waybar/style.css.config/waypaper/config.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/nix.nixIntroduction The Assets Folder @@ -327,26 +327,26 @@
Droidnix is a modular, declarative NixOS + Home Manager configuration system. It allows users to choose between Hyprland and Mangowc as their window manager, with shared and WM-specific configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.
This project uses a modular NixOS configuration with Hyprland and MangoWC support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -359,9 +359,9 @@ The Droidnix repository is organized into two main parts:
flake.nix is the entry point and imports:
The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.
./setup_droid..assets/ folder contains all static files, such as configs, scr
This section contains the Org blocks for tangling Nix code into the generated folders.
flake.nixflake.nixThe Nix flake definition for Droidnix.
@@ -478,9 +478,9 @@ The Nix flake definition for Droidnix.generated/hosts/traveldroid/host.nixgenerated/hosts/traveldroid/host.nix{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
@@ -536,9 +536,9 @@ in
generated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/hardware-configuration.nixgenerated/hosts/traveldroid/boot.nixgenerated/hosts/traveldroid/boot.nix{ config, pkgs, lib, flakeRoot, ... }:
@@ -650,17 +650,17 @@ in
generated/modules/traveldroid/apps/packages.nixgenerated/modules/traveldroid/apps/packages.nixThis installs a list of apps
@@ -724,9 +724,9 @@ in {generated/assets/packages.confgenerated/assets/packages.confThis is a list of additional apps to install
@@ -787,9 +787,9 @@ vlcgenerated/modules/traveldroid/apps/kitty.nixgenerated/modules/traveldroid/apps/kitty.nixThis file sets up Kitty terminal
@@ -851,9 +851,9 @@ in.config/kitty/Catppuccin-Mocha.conf.config/kitty/Catppuccin-Mocha.confThese are config files for .config/kitty
@@ -944,9 +944,9 @@ color15 #a6adc8.config/kitty/kitty.conf.config/kitty/kitty.confThese are config files for .config/kitty
@@ -968,9 +968,9 @@ font_size 10.0generated/modules/traveldroid/apps/starship.nixgenerated/modules/traveldroid/apps/starship.nixThis file sets up starship prompt
@@ -1010,9 +1010,9 @@ in.config/starship.toml.config/starship.tomlThese are config files for .config
@@ -1301,9 +1301,9 @@ crust = "#181926"generated/modules/traveldroid/apps/thunar.nixgenerated/modules/traveldroid/apps/thunar.nixThis is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
@@ -1343,9 +1343,9 @@ ingenerated/modules/traveldroid/apps/wofi.nixgenerated/modules/traveldroid/apps/wofi.nixThis is the install for Wofi, the launcher
@@ -1378,9 +1378,9 @@ in.config/wofi/config.config/wofi/configThese are config files for .config/wofi
@@ -1427,9 +1427,9 @@ prompt = >.config/wofi/style.css.config/wofi/style.cssThese are config files for .config/wofi
@@ -1518,9 +1518,9 @@ These are config files for .config/wofigenerated/modules/traveldroid/apps/zenbrowser.nixgenerated/modules/traveldroid/apps/zenbrowser.nixThis installs zen browser
@@ -1540,9 +1540,9 @@ ingenerated/modules/traveldroid/apps/zsh.nixgenerated/modules/traveldroid/apps/zsh.nixThis sets up the zsh in the terminal
@@ -1598,9 +1598,9 @@ inThis sets up the zsh in the terminal
@@ -1635,9 +1635,9 @@ figenerated/modules/traveldroid/apps/emacs/emacs.nixgenerated/modules/traveldroid/apps/emacs/emacs.nixThis installs emacs
@@ -1733,9 +1733,9 @@ ingenerated/.config/emacs/early-init.elgenerated/.config/emacs/early-init.elThis contaions emacs
@@ -1836,9 +1836,9 @@ package-archive-priorities '(("gnu" . 99)generated/.config/emacs/init.elgenerated/.config/emacs/init.elThis contaions emacs
@@ -2249,13 +2249,13 @@ the top of the file."generated/modules/traveldroid/desktop/fonts.nixgenerated/modules/traveldroid/desktop/fonts.nixThis file installs and configures fonts
@@ -2273,9 +2273,9 @@ This file installs and configures fontsgenerated/modules/traveldroid/desktop/gtk.nixgenerated/modules/traveldroid/desktop/gtk.nixSetting up GTK
@@ -2301,9 +2301,9 @@ ingenerated/modules/traveldroid/desktop/hyprland.nixgenerated/modules/traveldroid/desktop/hyprland.nixSetting up Hyprland
@@ -2350,9 +2350,9 @@ in.config/hypr/animations.conf.config/hypr/animations.confThese are config files for .config/hypr
@@ -2373,9 +2373,9 @@ animations {.config/hypr/behaviour.conf.config/hypr/behaviour.confThese are config files for .config/hypr
@@ -2417,9 +2417,9 @@ misc {.config/hypr/bindings.conf.config/hypr/bindings.confThese are config files for .config/hypr
@@ -2582,9 +2582,9 @@ bind = $mainMod, W, exec, zen.config/hypr/exec-once.conf.config/hypr/exec-once.confThese are config files for .config/hypr
@@ -2598,9 +2598,9 @@ exec-once = bash -c "sleep 5 && waybar".config/hypr/hypridle.conf.config/hypr/hypridle.confThese are config files for .config/hypr
@@ -2625,9 +2625,9 @@ listener {.config/hypr/hyprland.conf.config/hypr/hyprland.confThese are config files for .config/hypr
@@ -2674,9 +2674,9 @@ misc {.config/hypr/hyprlock.conf.config/hypr/hyprlock.confThese are config files for .config/hypr
@@ -2717,9 +2717,9 @@ label {.config/hypr/layer-rules.conf.config/hypr/layer-rules.confThese are config files for .config/hypr
@@ -2734,9 +2734,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window.config/hypr/layout.conf.config/hypr/layout.confThese are config files for .config/hypr
@@ -2746,9 +2746,9 @@ These are config files for .config/hypr.config/hypr/monitor-rules.conf.config/hypr/monitor-rules.confThese are config files for .config/hypr
@@ -2759,9 +2759,9 @@ monitor=DP-1,3840x1080@144,1920x0,1.config/hypr/scripts/layout-selector.sh.config/hypr/scripts/layout-selector.shThese are config files for .config/hypr/scripts
@@ -2804,9 +2804,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000.config/hypr/theming.css.config/hypr/theming.cssThese are config files for .config/hypr
@@ -2855,9 +2855,9 @@ decoration {.config/hypr/window-rules.conf.config/hypr/window-rules.confThese are config files for .config/hypr
@@ -2881,9 +2881,9 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15.config/hypr/workspace-rules.conf.config/hypr/workspace-rules.confThese are config files for .config/hypr
@@ -2931,24 +2931,25 @@ workspace {generated/modules/traveldroid/desktop/wallpaper.nixgenerated/modules/traveldroid/desktop/wallpaper.nixSetting up wallpaper engine + wallpaper gui
{ config, pkgs, flakeRoot, ... }:
+{ config, pkgs, lib, flakeRoot, ... }:
let
- username = config.defaultUser or "henrov";
- homeDir = "/home/${username}";
- scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
- socketFile = "/run/user/${config.users.users.${username}.uid or 1000}/wayland-1-swww-daemon.1.sock";
+ username = config.users.users."traveldroid".name or "traveldroid";
+ homeDir = "/home/${username}";
+ wallpaperSrc = "${flakeRoot}/assets/Wallpapers";
+ wallpaperDst = "${homeDir}/Wallpapers";
+ scriptFile = "${wallpaperDst}/set-wallpapers-at-logon.sh";
in
{
############################
- # System-wide packages
+ # Systemwide packages
############################
environment.systemPackages = with pkgs; [
swww
@@ -2958,77 +2959,51 @@ in
];
############################
- # swww daemon for the user
+ # Ensure swww daemon runs
############################
- systemd.user.services.swwwDaemon = {
- description = "swww wallpaper daemon";
- after = [ "graphical-session.target" ];
- wantedBy = [ "default.target" ];
- serviceConfig = {
- ExecStart = "${pkgs.swww}/bin/swww daemon";
- Restart = "always";
- Type = "simple";
- };
- };
+ services.swww.enable = true;
############################
- # Run the wallpaper script at login
- ############################
- systemd.user.services.wallpaperSyncLogin = {
- description = "Run wallpaper script at login";
- wantedBy = [ "default.target" ];
- after = [ "swwwDaemon.service" ];
- requires = [ "swwwDaemon.service" ];
- serviceConfig = {
- Type = "oneshot";
- Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
- # Wait for the swww socket
- ExecStartPre = ''
- for i in $(seq 1 10); do
- [ -S ${socketFile} ] && exit 0
- sleep 0.5
- done
- echo "swww daemon socket not found, aborting"
- exit 1
- '';
- ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
- Restart = "on-failure";
- };
- };
-
- ############################
- # Timer: run service every 15 minutes
- ############################
- systemd.user.timers.wallpaperSyncTimer = {
- description = "Run wallpaperSync service every 15 minutes";
- wantedBy = [ "timers.target" ];
- timerConfig.OnUnitActiveSec = "15min";
- timerConfig.Persistent = true;
- };
-
- ############################
- # Run the script every 15 min
+ # User systemd service to sync wallpapers and run script
############################
systemd.user.services.wallpaperSync = {
- description = "Run wallpaper script periodically";
- wantedBy = [ "default.target" ];
- after = [ "swwwDaemon.service" ];
- requires = [ "swwwDaemon.service" ];
- serviceConfig = {
- Type = "oneshot";
- Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
- ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
- Restart = "on-failure";
- };
+ description = "Sync Wallpapers and run set-wallpapers-at-logon.sh";
+ wants = [ "graphical-session.target" ];
+ after = [ "graphical-session.target" ];
+
+ serviceConfig.Type = "oneshot";
+ serviceConfig.ExecStart = ''
+ # Ensure destination exists
+ mkdir -p ${wallpaperDst}
+
+ # Copy wallpapers: overwrite newer files, do not delete existing files
+ rsync -au --ignore-existing ${wallpaperSrc}/ ${wallpaperDst}/
+ rsync -au ${wallpaperSrc}/ ${wallpaperDst}/
+
+ # Execute the logon wallpaper script
+ ${scriptFile}
+ '';
+ serviceConfig.Restart = "on-failure";
+ };
+
+ ############################
+ # Timer to run the service every 15 minutes
+ ############################
+ systemd.user.timers.wallpaperSyncTimer = {
+ description = "Run wallpaperSync service every 15 minutes";
+ wantedBy = [ "timers.target" ];
+ timerConfig.OnBootSec = "1min"; # run soon after login
+ timerConfig.OnUnitActiveSec = "15min";
+ timerConfig.Persistent = true;
};
}
generated/modules/traveldroid/desktop/stylix.nixgenerated/modules/traveldroid/desktop/stylix.nix{ lib, config, pkgs, flakeRoot, stylix, ... }:
@@ -3120,9 +3095,9 @@ in
.config/stylix/stylix.conf.config/stylix/stylix.confThese are config files for .config/stylix
@@ -3159,9 +3134,9 @@ icons = {.config/stylix/palette.json.config/stylix/palette.jsonThese are config files for .config/stylix
@@ -3191,9 +3166,9 @@ These are config files for .config/stylix.config/stylix/palette.html.config/stylix/palette.htmlThese are config files for .config/stylix
@@ -3271,9 +3246,9 @@ These are config files for .config/stylixgenerated/modules/traveldroid/desktop/waybar.nixgenerated/modules/traveldroid/desktop/waybar.nixThis file installs and configures waybar
@@ -3324,9 +3299,9 @@ in.config/waybar/config.config/waybar/configThese are config files for waybar
@@ -3449,9 +3424,9 @@ These are config files for waybar.config/waybar/style.css.config/waybar/style.cssThese are config files for waybar
@@ -3686,9 +3661,9 @@ window#waybar {.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for waypaper
@@ -3725,9 +3700,9 @@ keybindings = ~/.config/waypaper/keybindings.inigenerated/modules/traveldroid/desktop/wayland.nixgenerated/modules/traveldroid/desktop/wayland.nix{ lib, config, pkgs, ... }:
@@ -3757,9 +3732,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
generated/modules/traveldroid/desktop/xdg.nixgenerated/modules/traveldroid/desktop/xdg.nixThis sets the XDG implementation
@@ -3812,13 +3787,13 @@ ingenerated/modules/traveldroid/system/bluetooth.nixgenerated/modules/traveldroid/system/bluetooth.nix{ lib, config, pkgs, flakeRoot, home-manager, ... }:
@@ -3859,9 +3834,9 @@ in
generated/modules/traveldroid/system/dbus.nixgenerated/modules/traveldroid/system/dbus.nixThis sets the dbus implementation
@@ -3888,9 +3863,9 @@ This sets the dbus implementationgenerated/modules/traveldroid/system/login-tuigreet.nixgenerated/modules/traveldroid/system/login-tuigreet.nixThis sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for
@@ -3944,9 +3919,9 @@ ingenerated/modules/traveldroid/system/networking.nixgenerated/modules/traveldroid/system/networking.nixThis sets the networking.
@@ -4010,9 +3985,9 @@ This sets the networking.generated/modules/traveldroid/system/nix.nixgenerated/modules/traveldroid/system/nix.nix{ lib, config, ... }:
@@ -4029,13 +4004,13 @@ This sets the networking.
generated/parked/users/copy_config_2_config.nixgenerated/parked/users/copy_config_2_config.nixThis copies stuff to the user home-folder
@@ -4086,9 +4061,9 @@ ingenerated/users/henrov.nixgenerated/users/henrov.nixThis is the default user, just search and replace henrov another name if you want to change
@@ -4143,9 +4118,9 @@ in.config/waybar/style.css.config/waybar/style.cssThese are config files for .config/waybar
@@ -4379,9 +4354,9 @@ window#waybar {.config/waypaper/config.ini.config/waypaper/config.iniThese are config files for .config/waypaper
@@ -4418,9 +4393,9 @@ keybindings = ~/.config/waypaper/keybindings.ini.config/zed/settings.json.config/zed/settings.jsonThese are config files for .config/zed
@@ -4460,7 +4435,7 @@ These are config files for .config/zed