diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/bootloader.nix | 90 | ||||
| -rw-r--r-- | nixos/configuration.nix | 2 | ||||
| -rw-r--r-- | nixos/fonts.nix | 2 | ||||
| -rw-r--r-- | nixos/grub.nix | 64 | ||||
| -rw-r--r-- | nixos/nvidia.nix | 2 |
5 files changed, 94 insertions, 66 deletions
diff --git a/nixos/bootloader.nix b/nixos/bootloader.nix new file mode 100644 index 0000000..e534ec7 --- /dev/null +++ b/nixos/bootloader.nix @@ -0,0 +1,90 @@ +{ + config, + pkgs, + ... +}: let + distro-grub-themes = pkgs.stdenv.mkDerivation { + pname = "distro-grub-themes"; + version = "3.1"; + src = pkgs.fetchFromGitHub { + owner = "AdisonCavani"; + repo = "distro-grub-themes"; + rev = "v3.1"; + hash = "sha256-ZcoGbbOMDDwjLhsvs77C7G7vINQnprdfI37a9ccrmPs="; + }; + installPhase = "cp -r customize/nixos $out"; + }; + xenlism-grub-themes = pkgs.stdenv.mkDerivation { + pname = "xenlism-grub-themes"; + version = "1.0"; + src = pkgs.fetchFromGitHub { + owner = "xenlism"; + repo = "Grub-themes"; + rev = "40ac048df9aacfc053c515b97fcd24af1a06762f"; + hash = "sha256-ProTKsFocIxWAFbYgQ46A+GVZ7mUHXxZrvdiPJqZJ6I="; + }; + installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out"; + }; +in { + environment.systemPackages = with pkgs; [hack-font]; + #fileSystems."/mnt/winsys" = { + # device = "/dev/nvme0n1p5"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000" ]; + #}; + #fileSystems."/mnt/windata" = { + # device = "/dev/nvme0n1p3"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000" ]; + #}; + boot = { + plymouth = { + enable = true; + theme = "rings"; + themePackages = with pkgs; [ + # By default we would install all themes + (adi1090x-plymouth-themes.override {selected_themes = ["rings"];}) + ]; + }; + + # Enable "Silent Boot" + 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" + ]; + # Hide the OS choice for bootloaders. + # It's still possible to open the bootloader list by pressing any key + # It will just not appear on screen unless a key is pressed + supportedFilesystems = ["ntfs"]; + loader = { + #timeout = 0; + efi = {canTouchEfiVariables = true;}; + grub = { + enable = true; + efiSupport = true; + device = "nodev"; + fsIdentifier = "label"; + devices = ["nodev"]; + extraEntries = '' + menuentry "Reboot" { + reboot + } + menuentry "Poweroff" { + halt + } + ''; + useOSProber = true; + configurationLimit = 10; + fontSize = 32; + theme = xenlism-grub-themes; + }; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a53fabd..7de01f9 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -10,7 +10,7 @@ imports = [ ../common/variables.nix ./greetd.nix - ./grub.nix + ./bootloader.nix ./nvidia.nix ./fonts.nix ./services/laptop.preset.nix diff --git a/nixos/fonts.nix b/nixos/fonts.nix index 64d065b..7182094 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -11,6 +11,7 @@ liberation_ttf mplus-outline-fonts.githubRelease dina-font + #proggyfonts #glasstty-ttf ( @@ -22,6 +23,7 @@ "CascadiaMono" "CommitMono" "JetBrainsMono" + "ProggyClean" ]; } ) diff --git a/nixos/grub.nix b/nixos/grub.nix deleted file mode 100644 index 5af6773..0000000 --- a/nixos/grub.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - config, - pkgs, - ... -}: let - distro-grub-themes = pkgs.stdenv.mkDerivation { - pname = "distro-grub-themes"; - version = "3.1"; - src = pkgs.fetchFromGitHub { - owner = "AdisonCavani"; - repo = "distro-grub-themes"; - rev = "v3.1"; - hash = "sha256-ZcoGbbOMDDwjLhsvs77C7G7vINQnprdfI37a9ccrmPs="; - }; - installPhase = "cp -r customize/nixos $out"; - }; - xenlism-grub-themes = pkgs.stdenv.mkDerivation { - pname = "xenlism-grub-themes"; - version = "1.0"; - src = pkgs.fetchFromGitHub { - owner = "xenlism"; - repo = "Grub-themes"; - rev = "40ac048df9aacfc053c515b97fcd24af1a06762f"; - hash = "sha256-ProTKsFocIxWAFbYgQ46A+GVZ7mUHXxZrvdiPJqZJ6I="; - }; - installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out"; - }; -in { - environment.systemPackages = with pkgs; [hack-font]; - boot.supportedFilesystems = ["ntfs"]; - #fileSystems."/mnt/winsys" = { - # device = "/dev/nvme0n1p5"; - # fsType = "ntfs-3g"; - # options = [ "rw" "uid=1000" ]; - #}; - #fileSystems."/mnt/windata" = { - # device = "/dev/nvme0n1p3"; - # fsType = "ntfs-3g"; - # options = [ "rw" "uid=1000" ]; - #}; - boot.loader = { - efi = { - canTouchEfiVariables = true; - }; - grub = { - enable = true; - efiSupport = true; - device = "nodev"; - fsIdentifier = "label"; - devices = ["nodev"]; - extraEntries = '' - menuentry "Reboot" { - reboot - } - menuentry "Poweroff" { - halt - } - ''; - useOSProber = true; - configurationLimit = 10; - theme = xenlism-grub-themes; - }; - }; -} diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix index efc198f..72df31b 100644 --- a/nixos/nvidia.nix +++ b/nixos/nvidia.nix @@ -34,7 +34,7 @@ }; forceFullCompositionPipeline = true; modesetting.enable = true; - # open = true; + open = true; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.beta; }; |