diff --git a/modules/default.nix b/modules/default.nix index 6e17cc5..690dc1a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -8,5 +8,6 @@ ./software ./security ./services + ./ricing ]; } diff --git a/modules/hardware/boot.nix b/modules/hardware/boot.nix index 4b9f030..a40ab06 100644 --- a/modules/hardware/boot.nix +++ b/modules/hardware/boot.nix @@ -1,8 +1,27 @@ { - config.boot.loader = { - systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; + config = { + boot = { + loader = { + systemd-boot.enable = true; + efi = { + canTouchEfiVariables = true; + }; + # Can press any key to get the generation list, otherwise just load the first one cause it's probably what you want + timeout = 0; + }; + + # Silent Booting + consoleLogLevel = 0; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + ]; }; }; } diff --git a/modules/options.nix b/modules/options.nix index 0282ff6..84f5bc1 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -47,7 +47,8 @@ }; ricing = { - basic.enable = lib.mkEnableOption "enable basic ricing"; + basic.enable = lib.mkEnableOption "enable basic ricing"; + wasteland.enable = lib.mkEnableOptin "post-collapse themed rice"; }; }; @@ -96,7 +97,8 @@ }; ricing = { - basic.enable = lib.mkDefault true; + basic.enable = lib.mkDefault true; + wasteland.enable = lib.mkDefault false; }; }; } diff --git a/modules/ricing/default.nix b/modules/ricing/default.nix new file mode 100644 index 0000000..9afbecf --- /dev/null +++ b/modules/ricing/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./plymouth.nix + ]; +} diff --git a/modules/ricing/plymouth.nix b/modules/ricing/plymouth.nix new file mode 100644 index 0000000..ea53e11 --- /dev/null +++ b/modules/ricing/plymouth.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... +}: let + basic = { + theme = "breeze"; + logo = "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; + font = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; + extraConfig = ""; + }; +in { + boot.plymouth = { + theme = + if config.ricing.basic.enable + then basic.theme + else null; + logo = + if config.ricing.basic.enable + then basic.logo + else null; + font = + if config.ricing.basic.enable + then basic.font + else null; + extraConfig = + if config.ricing.basic.enable + then basic.extraConfig + else null; + }; +} diff --git a/modules/users/crow/configs/git.nix b/modules/users/crow/configs/git.nix index 9afe501..3b8b5d0 100644 --- a/modules/users/crow/configs/git.nix +++ b/modules/users/crow/configs/git.nix @@ -1,8 +1,7 @@ { - - programs.git = { - enable = true; - userName = "TheWanderingCrow"; - userEmail = "contact@wanderingcrow.net"; - }; + programs.git = { + enable = true; + userName = "TheWanderingCrow"; + userEmail = "contact@wanderingcrow.net"; + }; } diff --git a/modules/users/crow/configs/tmux.nix b/modules/users/crow/configs/tmux.nix index 7584946..101e0ff 100644 --- a/modules/users/crow/configs/tmux.nix +++ b/modules/users/crow/configs/tmux.nix @@ -1,17 +1,17 @@ { - programs.tmux = { - enable = true; - keyMode = "vi"; - extraConfig = '' - bind | split-window -h - bind - split-window -v - unbind '"' - unbind % + programs.tmux = { + enable = true; + keyMode = "vi"; + extraConfig = '' + bind | split-window -h + bind - split-window -v + unbind '"' + unbind % - bind -n M-Left select-pane -L - bind -n M-Right select-pane -R - bind -n M-Up select-pane -U - bind -n M-Down select-pane -D - ''; - }; + bind -n M-Left select-pane -L + bind -n M-Right select-pane -R + bind -n M-Up select-pane -U + bind -n M-Down select-pane -D + ''; + }; } diff --git a/modules/users/crow/configs/waybar.nix b/modules/users/crow/configs/waybar.nix index 5d29d69..300ba87 100644 --- a/modules/users/crow/configs/waybar.nix +++ b/modules/users/crow/configs/waybar.nix @@ -223,7 +223,13 @@ in { programs.waybar = { enable = true; - settings = if osConfig.ricing.basic.enable then og_waybar.jsonc else {}; - style = if osConfig.ricing.basic.enable then og_waybar.style else ""; + settings = + if osConfig.ricing.basic.enable + then og_waybar.jsonc + else {}; + style = + if osConfig.ricing.basic.enable + then og_waybar.style + else ""; }; } diff --git a/modules/users/crow/default.nix b/modules/users/crow/default.nix deleted file mode 100644 index bc8c704..0000000 --- a/modules/users/crow/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - lib, - config, - ... -}: { - imports = [ - ./user.nix - ]; -}