diff --git a/reference/hosts/adrastea/configuration.nix b/reference/hosts/adrastea/configuration.nix index 6beac24..2a86964 100755 --- a/reference/hosts/adrastea/configuration.nix +++ b/reference/hosts/adrastea/configuration.nix @@ -12,6 +12,11 @@ networking.hostName = "adrastea"; + services.mullvad-vpn = { + enable = true; + package = pkgs.mullvad-vpn; + }; + liminalOS = { flakeLocation = "/home/youwen/.config/liminalOS"; config.allowUnfree = true; @@ -64,23 +69,24 @@ powerManagement.cpuFreqGovernor = "performance"; - time.timeZone = "America/Los_Angeles"; + # time.timeZone = "America/Los_Angeles"; + time.timeZone = "Asia/Shanghai"; hardware.nvidia = { - # modesetting.enable = true; - # powerManagement.enable = true; - # powerManagement.finegrained = false; + modesetting.enable = true; + powerManagement.enable = true; + powerManagement.finegrained = false; # nvidiaSettings = true; - # open = true; - prime = { - amdgpuBusId = "PCI:4:0:0"; - nvidiaBusId = "PCI:1:0:0"; - # offload = { - # enable = true; - # enableOffloadCmd = true; - # }; - sync.enable = true; - }; + open = true; + # prime = { + # amdgpuBusId = "PCI:4:0:0"; + # nvidiaBusId = "PCI:1:0:0"; + # # offload = { + # # enable = true; + # # enableOffloadCmd = true; + # # }; + # sync.enable = true; + # }; }; services.keyd = { @@ -91,10 +97,8 @@ settings = { main = { capslock = "esc"; - leftmeta = "leftcontrol"; - leftalt = "leftmeta"; + leftalt = "leftcontrol"; leftcontrol = "leftalt"; - rightmeta = "leftalt"; rightalt = "layer(rightalt)"; }; rightalt = { diff --git a/reference/hosts/adrastea/home.nix b/reference/hosts/adrastea/home.nix index 93e3608..0c57b5e 100644 --- a/reference/hosts/adrastea/home.nix +++ b/reference/hosts/adrastea/home.nix @@ -7,22 +7,23 @@ home.stateVersion = "24.05"; wayland.windowManager.hyprland.settings.monitor = lib.mkForce [ - "eDP-1,2560x1440@165,0x0,1.6" - # "eDP-1, disable" + # "eDP-1,2560x1440@165,0x0,1.6" + "eDP-1, disable" # "HDMI-A-1,2560x1440@144,0x0,1.0" + "HDMI-A-1,1920x1080@60,0x0,1.0" ]; # since we are using this as a "desktop" of sorts, we have no need to save # power by using optimus. poor performance on external display, so we add # this line to force hyprland to use the nvidia GPU only for rendering. can # be removed if only using internal display - # wayland.windowManager.hyprland.settings.env = [ - # "AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0" - # ]; + wayland.windowManager.hyprland.settings.env = [ + "AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0" + ]; - # programs.waybar.settings.mainBar.output = "HDMI-A-1"; - programs.waybar.settings.mainBar.output = "eDP-1"; + programs.waybar.settings.mainBar.output = "HDMI-A-1"; + # programs.waybar.settings.mainBar.output = "eDP-1"; - # liminalOS.desktop.hyprland.screenlocker.monitor = "HDMI-A-1"; - liminalOS.desktop.hyprland.screenlocker.monitor = "eDP-1"; + liminalOS.desktop.hyprland.screenlocker.monitor = "HDMI-A-1"; + # liminalOS.desktop.hyprland.screenlocker.monitor = "eDP-1"; }