diff --git a/users/gandalf/modules/default.nix b/users/gandalf/modules/default.nix index 9fb887b..d804c12 100644 --- a/users/gandalf/modules/default.nix +++ b/users/gandalf/modules/default.nix @@ -6,6 +6,7 @@ ./git.nix ./gnupg.nix ./keyd.nix + ./lsd ./neovim ./packages.nix ./scripts diff --git a/users/gandalf/modules/gui/gtk.nix b/users/gandalf/modules/gui/gtk.nix index 7edf22d..af90475 100644 --- a/users/gandalf/modules/gui/gtk.nix +++ b/users/gandalf/modules/gui/gtk.nix @@ -3,10 +3,10 @@ gtk = { enable = true; gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; + gtk-application-prefer-dark-theme = 0; }; gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; + gtk-application-prefer-dark-theme = 0; }; }; diff --git a/users/gandalf/modules/gui/hyprland/default.nix b/users/gandalf/modules/gui/hyprland/default.nix index c7ced6d..f95d1d1 100644 --- a/users/gandalf/modules/gui/hyprland/default.nix +++ b/users/gandalf/modules/gui/hyprland/default.nix @@ -65,11 +65,32 @@ in plugins = [ hy3.packages.x86_64-linux.hy3 ]; settings = { env = with lib; with nixosConfig.bchmnn; optionals nvidia.enable [ + "CLUTTER_BACKEND,wayland" + "GDK_BACKEND,wayland" + "GDK_DPI_SCALE,1" + "NIXOS_OZONE_WL,1" + "MOZ_ENABLE_WAYLAND,1" + "MOZ_USE_XINPUT2,1" + "XDG_SESSION_TYPE,wayland" + + # nvidia "LIBVA_DRIVER_NAME,nvidia" - "env = XDG_SESSION_TYPE,wayland" + "XDG_SESSION_TYPE,wayland" "GBM_BACKEND,nvidia-drm" "__GLX_VENDOR_LIBRARY_NAME,nvidia" "WLR_NO_HARDWARE_CURSORS,1" + + # sdl + "SDL_VIDEODRIVER,wayland" + + # qt + "QT_QPA_PLATFORM,wayland-egl" + # "QT_QPA_PLATFORM,wayland" + "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + + # java + "_JAVA_AWT_WM_NONREPARENTING,1" + "_JAVA_OPTIONS,\"-Dawt.useSystemAAFontSettings=on\"" ]; "exec-once" = with pkgs; [ "${swaybg}/bin/swaybg -m fill -i ${common.wallpaper}" diff --git a/users/gandalf/modules/gui/programs/alacritty.nix b/users/gandalf/modules/gui/programs/alacritty.nix index 3e92d01..53b0b4b 100644 --- a/users/gandalf/modules/gui/programs/alacritty.nix +++ b/users/gandalf/modules/gui/programs/alacritty.nix @@ -3,11 +3,15 @@ let common = (import ../common.nix) { pkgs = pkgs; lib = lib; }; in { - # alacritty - a cross-platform, GPU-accelerated terminal emulator programs.alacritty = { enable = true; - # custom settings settings = { + import = [ + # Available themes: + # https://github.com/alacritty/alacritty-theme + + "${pkgs.alacritty-theme}/atom_one_light.toml" + ]; env.TERM = "xterm-256color"; font = { size = 12; diff --git a/users/gandalf/modules/gui/programs/vscode.nix b/users/gandalf/modules/gui/programs/vscode.nix index b92dd1c..0a2f9bd 100644 --- a/users/gandalf/modules/gui/programs/vscode.nix +++ b/users/gandalf/modules/gui/programs/vscode.nix @@ -27,6 +27,7 @@ in "window.titleBarStyle" = "custom"; "window.menuBarVisibility" = "toggle"; + "workbench.colorTheme" = "Default Light Modern"; "workbench.iconTheme" = "material-icon-theme"; "extensions.ignoreRecommendations" = true; diff --git a/users/gandalf/modules/lsd/dark.yaml b/users/gandalf/modules/lsd/dark.yaml new file mode 100644 index 0000000..59d781e --- /dev/null +++ b/users/gandalf/modules/lsd/dark.yaml @@ -0,0 +1,41 @@ +# Color codes: +# https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg + +user: 230 +group: 187 +permission: + read: dark_green + write: dark_yellow + exec: dark_red + exec-sticky: 5 + no-access: 245 + octal: 6 + acl: dark_cyan + context: cyan +date: + hour-old: 40 + day-old: 42 + older: 36 +size: + none: 245 + small: 229 + medium: 216 + large: 172 +inode: + valid: 13 + invalid: 245 +links: + valid: 13 + invalid: 245 +tree-edge: 245 +git-status: + default: 245 + unmodified: 245 + ignored: 245 + new-in-index: dark_green + new-in-workdir: dark_green + typechange: dark_yellow + deleted: dark_red + renamed: dark_green + modified: dark_yellow + conflicted: dark_red diff --git a/users/gandalf/modules/lsd/default.nix b/users/gandalf/modules/lsd/default.nix new file mode 100644 index 0000000..ccde556 --- /dev/null +++ b/users/gandalf/modules/lsd/default.nix @@ -0,0 +1,16 @@ +{ ... }: { + + xdg.configFile."lsd/colors.yaml" = { + source = ./light.yaml; + }; + + programs.lsd = { + enable = true; + settings = { + color = { + theme = "custom"; + }; + }; + }; + +} diff --git a/users/gandalf/modules/lsd/light.yaml b/users/gandalf/modules/lsd/light.yaml new file mode 100644 index 0000000..9b7246d --- /dev/null +++ b/users/gandalf/modules/lsd/light.yaml @@ -0,0 +1,41 @@ +# Color codes: +# https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg + +user: 70 +group: 58 +permission: + read: dark_green + write: dark_yellow + exec: dark_red + exec-sticky: 5 + no-access: 245 + octal: 6 + acl: dark_cyan + context: cyan +date: + hour-old: 40 + day-old: 42 + older: 36 +size: + none: 245 + small: 70 + medium: 214 + large: 166 +inode: + valid: 13 + invalid: 245 +links: + valid: 13 + invalid: 245 +tree-edge: 245 +git-status: + default: 245 + unmodified: 245 + ignored: 245 + new-in-index: dark_green + new-in-workdir: dark_green + typechange: dark_yellow + deleted: dark_red + renamed: dark_green + modified: dark_yellow + conflicted: dark_red