diff --git a/README.md b/README.md index a4c943f..bbcd67d 100644 --- a/README.md +++ b/README.md @@ -15,5 +15,5 @@ nixos-rebuild switch --flake 'git+https://git.sense-t.eu.org/NixOS/gpd-configura - [ ] waybar 微调 - [ ] 使用 pipewire - [ ] 电源选项 -- [ ] hyprland 微调 +- [x] hyprland 微调 - [ ] nwg-launchers 微调+配置 diff --git a/configuration.nix b/configuration.nix index 9d30cc9..823342b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -16,11 +16,18 @@ #boot.loader.systemd-boot.configurationLimit = 2; boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; + #boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.grub = { + version = 2; configurationLimit = 2; efiSupport = true; device = "nodev"; + mirroredBoots = [ + { + devices = [ "nodev" ]; + path = "/boot"; + } + ]; }; # Use xanmod kernel diff --git a/global/stateless-configuration.nix b/global/stateless-configuration.nix index 8c4bb4e..aac97cc 100644 --- a/global/stateless-configuration.nix +++ b/global/stateless-configuration.nix @@ -9,7 +9,6 @@ "/etc/NetworkManager/system-connections" "/root" "/var" - "/boot" ]; files = [ diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 467e769..12f1c68 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -19,7 +19,7 @@ options = [ "relatime" "mode=755" ]; }; - fileSystems."/boot/efi" = { + fileSystems."/boot" = { device = "/dev/disk/by-uuid/8095-BE1B"; fsType = "vfat"; }; diff --git a/home/user/files/hyprland.conf b/home/user/files/hyprland.conf index c24be12..b8545ba 100644 --- a/home/user/files/hyprland.conf +++ b/home/user/files/hyprland.conf @@ -8,7 +8,7 @@ # # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto +monitor=,preferred,auto,auto,transform,1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more diff --git a/home/user/home.nix b/home/user/home.nix index 4a3ceae..9708e6e 100644 --- a/home/user/home.nix +++ b/home/user/home.nix @@ -35,7 +35,7 @@ ".config/hypr/hyprland.conf".source = ./files/hyprland.conf; # Use flatseal to change permissions. - ".local/share/fonts".source = /run/current-system/sw/share/X11/fonts; + #".local/share/fonts".source = /run/current-system/sw/share/X11/fonts; # Fix flatpak fonts ".local/share/flatpak/overrides/global".text = ''