diff --git a/home/desktop.nix b/home/desktop.nix index 4af0c5a..80a5573 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -3,7 +3,6 @@ config, ... }: - { imports = [ # Enviroments ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -90,6 +89,9 @@ home.sessionVariables.EDITOR = "nvim"; home.sessionVariables.PASSWORD_STORE_TYPE = "basic"; + home.sessionVariables.background-light = "${config.home.homeDirectory}/.local/share/wallpapers/aesthetic-wallpapers/images/gruvbox_room.png"; + home.sessionVariables.background-dark = "${config.home.homeDirectory}/.local/share/wallpapers/aesthetic-wallpapers/images/purple-girl.png"; + services.kdeconnect.enable = true; services.owncloud-client.enable = true; services.tailscale-systray.enable = true; @@ -98,8 +100,6 @@ Unit.Description = "Swap wallpaper based on time"; Service = { ExecStart = pkgs.writeShellScript "swap-wall" '' - export LIGHTMODE="${config.home.homeDirectory}/.local/share/wallpapers/aesthetic-wallpapers/images/gruvbox_room.png" - export DARKMODE="${config.home.homeDirectory}/.local/share/wallpapers/aesthetic-wallpapers/images/purple-girl.png" mkdir -p /home/mar/.local/share/wallpapers/slideshow if [ ! -d "/home/mar/.local/share/wallpapers/aesthetic-wallpapers" ]; then git clone https://github.com/D3Ext/aesthetic-wallpapers.git /home/mar/.local/share/wallpapers/aesthetic-wallpapers @@ -116,23 +116,23 @@ # Night time: 19:00 to 07:59 echo "Good night!"; # Fake slideshow! - cp --update=all $DARKMODE /home/mar/.local/share/wallpapers/slideshow/1 - cp --update=all $DARKMODE /home/mar/.local/share/wallpapers/slideshow/2 - cp --update=all $DARKMODE /home/mar/.local/share/wallpapers/slideshow/3 + cp --update=all ${config.home.sessionVariables.background-dark} /home/mar/.local/share/wallpapers/slideshow/1 + cp --update=all ${config.home.sessionVariables.background-dark} /home/mar/.local/share/wallpapers/slideshow/2 + cp --update=all ${config.home.sessionVariables.background-dark} /home/mar/.local/share/wallpapers/slideshow/3 # But we can just set it manually much better. - ${pkgs.awww}/bin/awww img $DARKMODE - ${pkgs.kdePackages.plasma-workspace}/bin/plasma-apply-wallpaperimage $DARKMODE + ${pkgs.awww}/bin/awww img ${config.home.sessionVariables.background-dark} + ${pkgs.kdePackages.plasma-workspace}/bin/plasma-apply-wallpaperimage ${config.home.sessionVariables.background-dark} else # Day time echo "Good day~!"; ln -sf /home/mar/.local/share/wallpapers/aesthetic-wallpapers/images/pixel_big_city.png /home/mar/.local/share/wallpapers/current_wallpaper.png # Here too - cp --update=all $LIGHTMODE /home/mar/.local/share/wallpapers/slideshow/1 - cp --update=all $LIGHTMODE /home/mar/.local/share/wallpapers/slideshow/2 - cp --update=all $LIGHTMODE /home/mar/.local/share/wallpapers/slideshow/3 + cp --update=all ${config.home.sessionVariables.background-light} /home/mar/.local/share/wallpapers/slideshow/1 + cp --update=all ${config.home.sessionVariables.background-light} /home/mar/.local/share/wallpapers/slideshow/2 + cp --update=all ${config.home.sessionVariables.background-light} /home/mar/.local/share/wallpapers/slideshow/3 # But we can just set it manually much better. - ${pkgs.awww}/bin/awww img $LIGHTMODE - ${pkgs.kdePackages.plasma-workspace}/bin/plasma-apply-wallpaperimage $LIGHTMODE + ${pkgs.awww}/bin/awww img ${config.home.sessionVariables.background-light} + ${pkgs.kdePackages.plasma-workspace}/bin/plasma-apply-wallpaperimage ${config.home.sessionVariables.background-light} fi ''; }; diff --git a/home/modules/conversation.nix b/home/modules/conversation.nix index 5ff069e..15b0dc5 100644 --- a/home/modules/conversation.nix +++ b/home/modules/conversation.nix @@ -2,7 +2,8 @@ { home.packages = with pkgs; [ - # cinny-desktop <- Seems browser works better, can't copy/paste and stuff - fluffychat + # I'll still use Fluffy from the browser, but since it seems to want to break very much, + # locally I'll have element... + element-desktop ]; } diff --git a/home/modules/gnome.nix b/home/modules/gnome.nix index 3cb42da..22c5b51 100644 --- a/home/modules/gnome.nix +++ b/home/modules/gnome.nix @@ -2,6 +2,7 @@ pkgs, lib, hostname, + config, ... }: @@ -26,6 +27,7 @@ "vivaldi-stable.desktop" "org.wezfurlong.wezterm.desktop" "obsidian.desktop" + "element.desktop" ] ++ ( if hostname == "Fennekin" then @@ -57,13 +59,13 @@ show-thrash = false; }; "org/gnome/desktop/background" = { - picture-uri = "file:///home/mar/.local/share/wallpapers/current_wallpaper.png"; + picture-uri = "file://${config.home.sessionVariables.background-light}"; # Hoping my systemd service works for gnome too - picture-uri-dark = "file:///home/mar/.local/share/wallpapers/current_wallpaper.png"; + picture-uri-dark = "file://${config.home.sessionVariables.background-dark}"; picture-options = "zoom"; # "zoom", "centered", "scaled", etc. }; "org/gnome/desktop/screensaver" = { - picture-uri = "file:///home/mar/.local/share/wallpapers/aesthetic-wallpapers/images/wallhaven-9mjw78.png"; + picture-uri = "file://${config.home.sessionVariables.background-light}"; }; "org/gnome/desktop/interface" = { # color-scheme = "prefer-light"; # Handled by daynight plugin diff --git a/hosts/Fennekin/configuration.nix b/hosts/Fennekin/configuration.nix index 1feae7b..c67e3db 100644 --- a/hosts/Fennekin/configuration.nix +++ b/hosts/Fennekin/configuration.nix @@ -55,6 +55,9 @@ # Default session Plasma. services.displayManager.defaultSession = "plasma"; + # But I miss GNOME sometimes + services.desktopManager.gnome.enable = true; + # Configure keymap in X11 # services.xserver.xkb = { layout = "us"; variant = "euro"; }; @@ -86,11 +89,8 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - galaxy-buds-client grc - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget ]; # Some programs need SUID wrappers, can be configured further or are