diff --git a/flake.nix b/flake.nix index 5548d101..40d9fdb2 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,8 @@ email = "librephoenix@protonmail.com"; dotfilesDir = "~/dotfiles"; theme = "dracula"; + backgroundUrl = "https://w.wallhaven.cc/full/6d/wallhaven-6d5k6x.jpg"; + backgroundSha256 = "+xl4H3UiVmMRNvMhIlaLdVTYYqnSyCTSX2UOTGsDQ8c="; pkgs = import nixpkgs { inherit system; @@ -51,6 +53,8 @@ myNixConfigurationFilePath = dotfilesDir+"/system/configuration.nix"; myHomeManagerFilePath = dotfilesDir+"/user/home.nix"; myTheme = theme; + myBackgroundUrl = backgroundUrl; + myBackgroundSha256 = backgroundSha256; inherit (inputs) eaf; inherit (inputs) eaf-browser; }; @@ -63,9 +67,11 @@ ./system/configuration.nix # stylix.nixosModules.stylix # complains that home-manager is not defined ]; - # specialArgs = { - # myTheme = theme; - # }; + specialArgs = { + myTheme = theme; + myBackgroundUrl = backgroundUrl; + myBackgroundSha256 = backgroundSha256; + }; }; }; }; diff --git a/system/configuration.nix b/system/configuration.nix index 6ca25847..5e681935 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, myTheme, ... }: +{ config, pkgs, myTheme, myBackgroundUrl, myBackgroundSha256, ... }: { imports = @@ -96,9 +96,10 @@ defaultSession = "none+xmonad"; lightdm.greeters.slick.enable = true; lightdm.background = pkgs.fetchurl { - url = "https://w.wallhaven.cc/full/6d/wallhaven-6d5k6x.jpg"; - sha256 = "+xl4H3UiVmMRNvMhIlaLdVTYYqnSyCTSX2UOTGsDQ8c="; + url = myBackgroundUrl; + sha256 = myBackgroundSha256; }; + lightdm.greeters.slick.theme.name = "Adwaita-dark"; }; }; diff --git a/user/style/stylix.nix b/user/style/stylix.nix index bbf6f0ba..1c9d57de 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -1,16 +1,15 @@ -{ config, pkgs, myTheme, ... }: +{ config, pkgs, myTheme, myBackgroundUrl, myBackgroundSha256, ... }: let myFont = "Inconsolata"; myFontPkg = pkgs.inconsolata; - in { stylix.autoEnable = false; stylix.polarity = "dark"; stylix.image = pkgs.fetchurl { - url = "https://w.wallhaven.cc/full/6d/wallhaven-6d5k6x.jpg"; - sha256 = "+xl4H3UiVmMRNvMhIlaLdVTYYqnSyCTSX2UOTGsDQ8c="; + url = myBackgroundUrl; + sha256 = myBackgroundSha256; }; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/"+myTheme+".yaml"; @@ -46,4 +45,13 @@ in programs.rofi.enable = true; stylix.targets.feh.enable = true; programs.feh.enable = true; + home.file.".fehbg-stylix".text = '' + #!/bin/sh + feh --no-fehbg --bg-fill ''+ + pkgs.fetchurl { + url = myBackgroundUrl; + sha256 = myBackgroundSha256; + }+''; + ''; + home.file.".fehbg-stylix".executable = true; } diff --git a/user/wm/xmonad/startup.sh b/user/wm/xmonad/startup.sh index 8106e93b..3868b19e 100755 --- a/user/wm/xmonad/startup.sh +++ b/user/wm/xmonad/startup.sh @@ -21,7 +21,7 @@ emacs --daemon & picom --animations --animation-window-mass 1 --animation-for-open-window zoom --animation-stiffness 200 --experimental-backends && # requires picom-pijulius xset r rate 350 50 & setxkbmap -option caps:escape & -~/.fehbg & +~/.fehbg-stylix & twmnd & alttab -w 1 -t 240x160 -i 64x64 -sc 1 -bg $colorBg -fg $colorFg -frame $colorSecondary -inact $colorFg & autokey-gtk & diff --git a/user/wm/xmonad/xmonad.org b/user/wm/xmonad/xmonad.org index 5c3c1756..6b3b794e 100644 --- a/user/wm/xmonad/xmonad.org +++ b/user/wm/xmonad/xmonad.org @@ -653,7 +653,7 @@ emacs --daemon & picom --animations --animation-window-mass 1 --animation-for-open-window zoom --animation-stiffness 200 --experimental-backends && # requires picom-pijulius xset r rate 350 50 & setxkbmap -option caps:escape & -~/.fehbg & +~/.fehbg-stylix & twmnd & alttab -w 1 -t 240x160 -i 64x64 -sc 1 -bg $colorBg -fg $colorFg -frame $colorSecondary -inact $colorFg & autokey-gtk &