diff --git a/curacao/os.nix b/curacao/os.nix index f7b7312..9b66fd8 100644 --- a/curacao/os.nix +++ b/curacao/os.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, lib, config, ... }: { imports = [ ./options.nix @@ -9,7 +9,6 @@ networking.hostName = "curacao"; boot = { - initrd.luks.reusePassphrases = true; loader = { efi.efiSysMountPoint = "/efi"; }; diff --git a/flake.nix b/flake.nix index cf0b4fc..d0d78dc 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,7 @@ ./os disko.nixosModules.disko home-manager.nixosModules.home-manager + stylix.nixosModules.stylix ]; }; nixOnDroidModules.dotfiles = { diff --git a/hm/theme/default.nix b/hm/theme/default.nix index e9122f4..b85b992 100644 --- a/hm/theme/default.nix +++ b/hm/theme/default.nix @@ -11,6 +11,7 @@ in stylix = { base16Scheme = "${pkgs.base16-schemes}/share/themes/${basetheme}-${config.frogeye.polarity}.yaml"; + polarity = config.frogeye.polarity; fonts = { monospace = { package = pkgs.nerdfonts.override { diff --git a/os/default.nix b/os/default.nix index 6cfe943..1b40690 100644 --- a/os/default.nix +++ b/os/default.nix @@ -8,6 +8,7 @@ ./desktop.nix ./gaming ./geoffrey.nix + ./style ./wireless.nix ]; } diff --git a/os/style/bg.svg b/os/style/bg.svg new file mode 100644 index 0000000..db83be1 --- /dev/null +++ b/os/style/bg.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/os/style/default.nix b/os/style/default.nix new file mode 100644 index 0000000..bc441a3 --- /dev/null +++ b/os/style/default.nix @@ -0,0 +1,24 @@ +{ pkgs, lib, config, ... }: +{ + config = { + boot = { + plymouth.enable = true; + initrd.systemd.enable = true; + }; + stylix = { + base16Scheme = "${pkgs.base16-schemes}/share/themes/solarized-${config.stylix.polarity}.yaml"; + image = builtins.fetchurl { + url = "https://get.wallhere.com/photo/sunlight-abstract-minimalism-green-simple-circle-light-leaf-wave-material-line-wing-computer-wallpaper-font-close-up-macro-photography-124350.png"; + sha256 = "sha256:1zfq3f3v34i45mi72pkfqphm8kbhczsg260xjfl6dbydy91d7y93"; + }; + homeManagerIntegration.autoImport = false; # Makes config reuse easier + polarity = "dark"; + targets.plymouth.logo = pkgs.runCommand "flower.png" { } "${pkgs.inkscape}/bin/inkscape ${pkgs.substituteAll { + src = ./flower.svg; + color = config.lib.stylix.colors.withHashtag.base07; + }} -w 256 -o $out"; + # UPST Default grub font is sansSerif, which doesn't work. + # Maybe because people patch mono with nerdfonts and that isn't compatible? + }; + }; +} diff --git a/os/style/flower.svg b/os/style/flower.svg new file mode 100644 index 0000000..e95bf57 --- /dev/null +++ b/os/style/flower.svg @@ -0,0 +1,8 @@ + + + + + + + +