feat: upgrade system.stateVersion

feat: autologin - hyprland / i3
feat: 256color for console tty
This commit is contained in:
Ryan Yin
2023-12-17 00:26:15 +08:00
parent 1cf34add85
commit 7d03e63bdd
15 changed files with 86 additions and 69 deletions

View File

@@ -3,12 +3,16 @@
config,
...
}: {
# If your themes for mouse cursor, icons or windows dont load correctly,
# try setting them with home.pointerCursor and gtk.theme,
# which enable a bunch of compatibility options that should make the themes load in all situations.
home.pointerCursor = {
gtk.enable = true;
x11.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
gtk.enable = true;
x11.enable = true;
};
# set dpi for 4k monitor
@@ -27,8 +31,9 @@
enable = true;
font = {
name = "Roboto";
package = pkgs.roboto;
name = "Noto Sans";
package = pkgs.noto-fonts;
size = 11;
};
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";

View File

@@ -1,23 +1,25 @@
{pkgs, hyprland, catppuccin-hyprland, ...}: {
{
catppuccin-hyprland,
...
}: {
imports = [
# hyprland.homeManagerModules.default
./anyrun.nix
./wayland-apps.nix
];
# wayland.windowManager.hyprland.enable = true;
# hyprland configs, based on https://github.com/notwidow/hyprland
home.file.".config/hypr" = {
xdg.configFile."hypr" = {
source = ./hypr-conf;
# copy the scripts directory recursively
recursive = true;
};
home.file.".config/hypr/themes".source = "${catppuccin-hyprland}/themes";
xdg.configFile."hypr/themes" = {
source = "${catppuccin-hyprland}/themes";
recursive = true;
};
# music player - mpd
home.file.".config/mpd" = {
xdg.configFile."mpd" = {
source = ./mpd;
recursive = true;
};
@@ -38,5 +40,4 @@
"WLR_NO_HARDWARE_CURSORS" = "1";
"WLR_EGL_NO_MODIFIRES" = "1";
};
}

View File

@@ -218,7 +218,15 @@ exec-once = hyprctl setcursor "Bibata-Modern-Ice" 24
# 相比较一开始的方案输入法字体大小也正确了.唯一有点问题的可能是 xwayland 窗口下的鼠标指针大小不对
exec-once = xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2
exec-once = xrdb -merge ~/.Xresources
# env = GDK_SCALE,2
env = XCURSOR_SIZE,48
env = XCURSOR_THEME,"Bibata-Modern-Ice"
-- Fix HiDPI - xwayland
# change monitor to high resolution, the last argument is the scale factor
monitor=,highres,auto,2
# unscale XWayland
xwayland {
force_zero_scaling = true
}
# toolkit-specific scale
env = GDK_SCALE,2
env = XCURSOR_SIZE,32

View File

@@ -16,7 +16,7 @@
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = "23.05";
stateVersion = "23.11";
};
# Let Home Manager install and manage itself.