diff --git a/modules/graphical/stylix.nix b/modules/graphical/stylix.nix index b2a5348..d7d0ac8 100644 --- a/modules/graphical/stylix.nix +++ b/modules/graphical/stylix.nix @@ -68,6 +68,9 @@ in { popups = 0.85; }; #targets.hyprland.enable = false; does not exist in the MR version yet + targets = { + grub.enable = false; + }; fonts = { serif = config.stylix.fonts.sansSerif; sansSerif = { diff --git a/pkgs/default.nix b/pkgs/default.nix index 191bab4..4cc0692 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -15,4 +15,5 @@ gpu-screen-recorder-ui = pkgs.callPackage ./gpu-screen-recorder-ui/default.nix { }; gpu-screen-recorder-notification = pkgs.callPackage ./gpu-screen-recorder-notification/default.nix { }; kavita-old = pkgs.callPackage ./kavita-old/default.nix { }; + hollow-grub = pkgs.callPackage ./hollow-grub/default.nix { }; } diff --git a/pkgs/hollow-grub/default.nix b/pkgs/hollow-grub/default.nix new file mode 100644 index 0000000..323d5de --- /dev/null +++ b/pkgs/hollow-grub/default.nix @@ -0,0 +1,14 @@ +{ pkgs }: +pkgs.stdenv.mkDerivation { + name = "hollow-grub-theme"; + src = pkgs.fetchFromGitHub { + owner = "sergoncano"; + repo = "hollow-knight-grub-theme"; + hash = "sha256-SUy2bQIeUWb/UdQip1ZhBTvXSHJ/LaHhpeK9DGQht6w="; + rev = "7cef3a2ea25fc2c7ac66d4c9ec1b6a96ca1fd643"; + }; + installPhase = '' + mkdir -p $out/grub/theme/ + cp -r ./hollow-grub/* $out/grub/theme/ + ''; +} diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index e727cc0..986e6f7 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -104,7 +104,7 @@ }; services.jenkins.enable = false; virtualisation.waydroid.enable = false; - + services.postgresql = { enable = true; extensions = with pkgs.postgresql14Packages; [ pg_libversion ]; @@ -115,20 +115,20 @@ ''; }; - systemd.user.services.scheibnkleister-presence = { - description = "scheibnkleister-presence"; - wantedBy = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = - "${pkgs.scheibnkleister-presence}/bin/scheibnkleister-presence"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; + ##systemd.user.services.scheibnkleister-presence = { + ## description = "scheibnkleister-presence"; + ## wantedBy = [ "graphical-session.target" ]; + ## wants = [ "graphical-session.target" ]; + ## after = [ "graphical-session.target" ]; + ## serviceConfig = { + ## Type = "simple"; + ## ExecStart = + ## "${pkgs.scheibnkleister-presence}/bin/scheibnkleister-presence"; + ## Restart = "on-failure"; + ## RestartSec = 1; + ## TimeoutStopSec = 10; + ## }; + ##}; # apple shit @@ -155,8 +155,18 @@ ''; # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + efi = { + canTouchEfiVariables = true; + }; + #systemd-boot.enable = true; + grub = { + enable = true; + efiSupport = true; + device = "nodev"; + theme = "${pkgs.hollow-grub}/grub/theme"; + }; + }; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; networking.hostName = "kop-pc"; # Define your hostname.