diff --git a/flakes/common/hm_modules/git.nix b/flakes/common/hm_modules/git.nix index 377c9341..aebc5418 100644 --- a/flakes/common/hm_modules/git.nix +++ b/flakes/common/hm_modules/git.nix @@ -16,7 +16,7 @@ name = "RingOfStorms (Joshua Bell)"; }; core.pager = "bat"; - core.editor = "nano"; + core.editor = "vi"; pull.rebase = false; diff --git a/flakes/de_plasma/de_plasma.nix b/flakes/de_plasma/de_plasma.nix index 87958a8b..01fd3b99 100644 --- a/flakes/de_plasma/de_plasma.nix +++ b/flakes/de_plasma/de_plasma.nix @@ -45,6 +45,15 @@ in description = "Enable Breeze Dark, GTK Breeze-Dark, and dark cursors."; }; + wallpapers = mkOption { + type = types.listOf types.path; + default = [ + ../../hosts/_shared_assets/wallpapers/pixel_neon.png + ../../hosts/_shared_assets/wallpapers/pixel_neon_v.png + ]; + description = "List of wallpaper paths to set system-wide for immediate loading."; + }; + sddm.autologinUser = mkOption { type = types.nullOr types.str; default = null; @@ -197,6 +206,17 @@ in ''; }) + (mkIf ((length cfg.wallpapers) > 0) { + environment.etc."xdg/plasma-org.kde.plasma.desktop-appletsrc".text = + let + wallpaperPath = builtins.head cfg.wallpapers; + in + '' + [Containments][1][Wallpaper][org.kde.image][General] + Image=file://${wallpaperPath} + ''; + }) + # GPU blocks (mkIf cfg.gpu.amd.enable { services.xserver.videoDrivers = [ "amdgpu" ]; diff --git a/flakes/de_plasma/home_manager/default.nix b/flakes/de_plasma/home_manager/default.nix index 69c0f902..e1d674d2 100644 --- a/flakes/de_plasma/home_manager/default.nix +++ b/flakes/de_plasma/home_manager/default.nix @@ -294,10 +294,6 @@ in lookAndFeel = "org.kde.breezedark.desktop"; theme = "breeze-dark"; cursor.theme = "breeze_cursors"; - wallpaper = [ - ../../../hosts/_shared_assets/wallpapers/pixel_neon.png - ../../../hosts/_shared_assets/wallpapers/pixel_neon_v.png - ]; }; configFile = { diff --git a/hosts/juni/flake.lock b/hosts/juni/flake.lock index 673ca4d4..1d9d13d8 100644 --- a/hosts/juni/flake.lock +++ b/hosts/juni/flake.lock @@ -39,11 +39,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1768000280, - "narHash": "sha256-JegPSldfsBcANqnV53mEAQOx/Fv22hUd0G2VTZGUR8Y=", + "lastModified": 1768255305, + "narHash": "sha256-XcXl5M0WNYhCCqE9qc9Aj2/2Jb/T0NHZnu2ZuVBvlHw=", "ref": "refs/heads/master", - "rev": "a4e2cc00d86d2f3401918cfdf9f0643939871a42", - "revCount": 1115, + "rev": "15769eda748f6fcc6fdab04f79f14ed9b1ffc548", + "revCount": 1125, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -59,11 +59,11 @@ }, "locked": { "dir": "flakes/de_plasma", - "lastModified": 1768000280, - "narHash": "sha256-JegPSldfsBcANqnV53mEAQOx/Fv22hUd0G2VTZGUR8Y=", + "lastModified": 1768255305, + "narHash": "sha256-XcXl5M0WNYhCCqE9qc9Aj2/2Jb/T0NHZnu2ZuVBvlHw=", "ref": "refs/heads/master", - "rev": "a4e2cc00d86d2f3401918cfdf9f0643939871a42", - "revCount": 1115, + "rev": "15769eda748f6fcc6fdab04f79f14ed9b1ffc548", + "revCount": 1125, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/juni/flake.nix b/hosts/juni/flake.nix index b2ef8c17..52bbb47b 100644 --- a/hosts/juni/flake.nix +++ b/hosts/juni/flake.nix @@ -62,6 +62,10 @@ enable = true; gpu.intel.enable = true; sddm.autologinUser = "josh"; + wallpapers = [ + ../../_shared_assets/wallpapers/pixel_neon.png + ../../_shared_assets/wallpapers/pixel_neon_v.png + ]; }; }) inputs.common.nixosModules.jetbrains_font diff --git a/hosts/juni/impermanence.nix b/hosts/juni/impermanence.nix index 04059801..91536cad 100644 --- a/hosts/juni/impermanence.nix +++ b/hosts/juni/impermanence.nix @@ -32,6 +32,9 @@ files = [ "/machine-key.json" "/etc/machine-id" + "/etc/localtime" + "/etc/timezone" + "/etc/adjtime" # NOTE: if you want mutable passwords across reboots, persist these, # but you must do a one-time migration (see notes in chat). # "/etc/shadow"