diff --git a/darwin/main.nix b/darwin/main.nix index 959e1a8..1259670 100644 --- a/darwin/main.nix +++ b/darwin/main.nix @@ -37,13 +37,13 @@ enableScriptingAddition = true; config = { layout = "bsp"; - + mouse_modifier = "fn"; - + # very broken on slow cpu #focus_follows_mouse = "autoraise"; #mouse_follows_focus = "on"; - + top_padding = 10; bottom_padding = 10; left_padding = 10; @@ -72,11 +72,11 @@ }; system.defaults = { - # Apple... Do I really have to change literally + # Apple... Do I really have to change literally # every setting in macOS to make it actually usable. - # + # # Through this... you will see why I say macOS is a terriable mess. - # + # # NOTE: default of those options is `null` (unmanaged) # https://github.com/mathiasbynens/dotfiles/blob/main/.macos for references finder = { @@ -86,7 +86,7 @@ CreateDesktop = false; FXDefaultSearchScope = "SCcf"; # "SCcf" = Current folder FXEnableExtensionChangeWarning = false; - FXPreferredViewStyle = "Nlsv"; # "icnv" = Icon view, "Nlsv" = List view, "clmv" = Column View, "Flwv" = Gallery View + FXPreferredViewStyle = "Nlsv"; # "icnv" = Icon view, "Nlsv" = List view, "clmv" = Column View, "Flwv" = Gallery View QuitMenuItem = true; ShowPathbar = true; ShowStatusBar = false; @@ -128,7 +128,7 @@ #AppleShowAllExtensions = true; # Dupelicate? #AppleShowAllFiles = true; AppleShowScrollBars = "Always"; - AppleTemperatureUnit = "Celsius"; # "null or one of "Celsius", "Fahrenheit"" + AppleTemperatureUnit = "Celsius"; # "null or one of "Celsius", "Fahrenheit"" #AppleWindowTabbingMode # ? InitialKeyRepeat = 32; KeyRepeat = 2; diff --git a/darwin/networking/dns.nix b/darwin/networking/dns.nix index 7f77695..2d303ba 100644 --- a/darwin/networking/dns.nix +++ b/darwin/networking/dns.nix @@ -4,9 +4,9 @@ # please configure `networking.knownNetworkServices` in ../hosts/your-machine.nix networking.dns = [ "223.5.5.5" - "223.6.6.6" - "2400:3200::1" - "2400:3200:baba::1" + "223.6.6.6" + "2400:3200::1" + "2400:3200:baba::1" #"223.5.5.5#dns.alidns.com" #"223.6.6.6#dns.alidns.com" #"2400:3200::1#dns.alidns.com" diff --git a/machines/nixos/hardware/gpu/nvidia.nix b/machines/nixos/hardware/gpu/nvidia.nix index 3a119d9..4aaea5c 100755 --- a/machines/nixos/hardware/gpu/nvidia.nix +++ b/machines/nixos/hardware/gpu/nvidia.nix @@ -9,7 +9,7 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; open = false; modesetting.enable = true; - #dynamicboost.enable = true; + #dynamicboost.enable = true; powerManagement = { enable = true; # experimental power management feature #finegrained = true; diff --git a/machines/nixos/hardware/misc/opengl.nix b/machines/nixos/hardware/misc/opengl.nix index c14a8a8..90944c6 100755 --- a/machines/nixos/hardware/misc/opengl.nix +++ b/machines/nixos/hardware/misc/opengl.nix @@ -1,7 +1,7 @@ { ... }: # OpenGL -{ +{ hardware = { opengl = { enable = true; diff --git a/nixos/boot/default.nix b/nixos/boot/default.nix index 1b681b2..b926494 100644 --- a/nixos/boot/default.nix +++ b/nixos/boot/default.nix @@ -1,7 +1,7 @@ { ... }: { - imports = [ + imports = [ ./boot.nix ./kernel.nix ]; diff --git a/nixos/networking/dns/dns.nix b/nixos/networking/dns/dns.nix index 52da467..8f4c315 100644 --- a/nixos/networking/dns/dns.nix +++ b/nixos/networking/dns/dns.nix @@ -4,9 +4,9 @@ networking = { nameservers = [ "223.5.5.5" - "223.6.6.6" - "2400:3200::1" - "2400:3200:baba::1" + "223.6.6.6" + "2400:3200::1" + "2400:3200:baba::1" #"223.5.5.5#dns.alidns.com" #"223.6.6.6#dns.alidns.com" #"2400:3200::1#dns.alidns.com" diff --git a/nixos/networking/firewall.nix b/nixos/networking/firewall.nix index 0da9c15..f2ff23d 100644 --- a/nixos/networking/firewall.nix +++ b/nixos/networking/firewall.nix @@ -5,6 +5,6 @@ enable = true; # Open ports in the firewall. #allowedTCPPorts = [ ... ]; - #allowedUDPPorts = [ ... ]; + #allowedUDPPorts = [ ... ]; }; } diff --git a/nixos/nix/nix.nix b/nixos/nix/nix.nix index 37708db..5651e21 100755 --- a/nixos/nix/nix.nix +++ b/nixos/nix/nix.nix @@ -37,7 +37,7 @@ # accidentally delete configuration.nix. # Does not work with flake based configurations - #copySystemConfiguration = true; + #copySystemConfiguration = true; # This value determines the NixOS release from which the default diff --git a/nixos/packages/graphical/display-server/input.nix b/nixos/packages/graphical/display-server/input.nix index b64c8df..7bc36e9 100755 --- a/nixos/packages/graphical/display-server/input.nix +++ b/nixos/packages/graphical/display-server/input.nix @@ -1,7 +1,7 @@ { ... }: { - services.xserver = { + services.xserver = { layout = "us"; # keymap in x11 libinput = { enable = true; diff --git a/nixos/power-management/tlp.nix b/nixos/power-management/tlp.nix index 198ae2a..c86255b 100644 --- a/nixos/power-management/tlp.nix +++ b/nixos/power-management/tlp.nix @@ -6,10 +6,10 @@ settings = { CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; - + CPU_MIN_PERF_ON_AC = 0; CPU_MAX_PERF_ON_AC = 100; CPU_MIN_PERF_ON_BAT = 0; diff --git a/users/guanranwang/home-manager/common/dotfiles/.xinitrc b/users/guanranwang/home-manager/common/dotfiles/.xinitrc index 9b82f2f..c0a3434 100644 --- a/users/guanranwang/home-manager/common/dotfiles/.xinitrc +++ b/users/guanranwang/home-manager/common/dotfiles/.xinitrc @@ -16,7 +16,7 @@ export XMODIFIERS=@im=@fcitx export SDL_IM_MOODULE=fcitx export GLFW_IM_MODULE=ibus -export MOZ_ENABLE_XINPUT2=1 +export MOZ_ENABLE_XINPUT2=1 #export QT_STYLE_OVERWRITE=Adwaita-dark #export GAMEMODERUNEXEC="env __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia __VK_LAYER_NV_optimus=NVIDIA_ONLY" diff --git a/users/guanranwang/home-manager/common/dotfiles/bin/batterynotify b/users/guanranwang/home-manager/common/dotfiles/bin/batterynotify index 5117e99..0713f45 100755 --- a/users/guanranwang/home-manager/common/dotfiles/bin/batterynotify +++ b/users/guanranwang/home-manager/common/dotfiles/bin/batterynotify @@ -1,6 +1,6 @@ #!/bin/sh -# Send a notification if the laptop battery is either low +# Send a notification if the laptop battery is either low # or is fully charged. export DISPLAY=:0 diff --git a/users/guanranwang/home-manager/common/dotfiles/config/dunst/dunstrc b/users/guanranwang/home-manager/common/dotfiles/config/dunst/dunstrc index 04b671f..7643da0 100755 --- a/users/guanranwang/home-manager/common/dotfiles/config/dunst/dunstrc +++ b/users/guanranwang/home-manager/common/dotfiles/config/dunst/dunstrc @@ -1,5 +1,5 @@ # -# Dunst config +# Dunst config # ~/.config/dunst/dunstrc # modified from https://github.com/end-4/dots-hyprland/blob/main/.config/dunst/dunstrc # diff --git a/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf b/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf index 6ea4cee..a8a8212 100644 --- a/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf +++ b/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf @@ -232,8 +232,8 @@ Nimbus Sans Helvetica Lucida Sans Unicode - BPG Glaho International - Tahoma + BPG Glaho International + Tahoma diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf index eec1d7b..a120cde 100644 --- a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf +++ b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf @@ -6,7 +6,7 @@ #exec-once = $HOME/.local/share/hyprload/hyprload.sh # hyprload #exec-once = /usr/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -#exec-once = dbus-update-activation-environment --all +#exec-once = dbus-update-activation-environment --all #exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # authentication prompt #exec-once = gnome-keyring-daemon --start --components=secrets # keyring exec-once = swww init # wallpaper (not working on nixos somehow) diff --git a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf index 2085df6..84298b6 100644 --- a/users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf +++ b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf @@ -7,7 +7,7 @@ monitor = ,preferred, auto, 1 #monitor= ,addreserved, 28, 0, 0, 0 # eww bar monitor = eDP-1, 1920x1080@60, 0x0, 1.25 # laptop screen eDP-1 -# Multi GPU +# Multi GPU #env = WLR_DRM_DEVICES, /dev/dri/card1:/dev/dri/card0 # General settings general { diff --git a/users/guanranwang/home-manager/common/dotfiles/config/mpv/mpv.conf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/mpv.conf index c1223d3..cefef0d 100644 --- a/users/guanranwang/home-manager/common/dotfiles/config/mpv/mpv.conf +++ b/users/guanranwang/home-manager/common/dotfiles/config/mpv/mpv.conf @@ -50,7 +50,7 @@ gpu-shader-cache-dir='~~/shaders/cache' # https://mpv.io/manual/stable/# # nnedi3 # use nns128 instead of nns256 if you notice dropped frames -# glsl-shader="~~/shaders/nnedi3-nns256-win8x4.hook" # Luma upscaler +# glsl-shader="~~/shaders/nnedi3-nns256-win8x4.hook" # Luma upscaler # glsl-shader="~~/shaders/nnedi3-nns128-win8x4.hook" # Luma upscaler # no-scaler-resizes-only # Fixing the pixel shift https://mpv.io/manual/stable/#options-scaler-resizes-only @@ -76,7 +76,7 @@ gpu-shader-cache-dir='~~/shaders/cache' # https://mpv.io/manual/stable/# # ========== DEBANDING ========== -# Banding is a visual artifact, visual artifacts should never be in a video. +# Banding is a visual artifact, visual artifacts should never be in a video. # Example of banding: https://imgur.com/32d77H0 # Debanding is the process of removing said banding. # 6 minute explanation of what causes banding: https://www.youtube.com/watch?v=h9j89L8eQQk @@ -97,7 +97,7 @@ osc=no # Allows for custom OSC to be us border=no # Optional for modern OSC, but recommended cursor-autohide-fs-only=yes # If this option is given, the cursor is always visible in windowed mode # In fullscreen mode, the cursor is shown or hidden according to --cursor-autohide -cursor-autohide=300 # Cursor hide in ms +cursor-autohide=300 # Cursor hide in ms osd-level=1 # https://mpv.io/manual/stable/#options-osd-level osd-duration=1000 # Set the duration of the OSD messages in ms hr-seek=yes # Select when to use precise seeks that are not limited to keyframes @@ -137,7 +137,7 @@ demuxer-mkv-subtitle-preroll=yes # https://mpv.io/manual/stable/# sub-ass-vsfilter-blur-compat=no # https://mpv.io/manual/stable/#options-sub-ass-vsfilter-aspect-compat sub-fix-timing=no # https://mpv.io/manual/stable/#options-sub-fix-timing sub-auto=fuzzy # https://mpv.io/manual/stable/#options-no-sub-auto - # Load all subs containing the media filename + # Load all subs containing the media filename # The following options only apply to subtitles without own styling sub-font='Netflix Sans Medium' # Specify font to use for subtitles that do not themselves specify a particular font @@ -243,5 +243,5 @@ screenshot-template="%f-%wH.%wM.%wS.%wT-#%#00n" # Name format (filen # [Mini-Encode #4] # profile-desc=Mini Encode Anime 4 -# profile-cond=string.match(p.filename, "Ember")~=nil +# profile-cond=string.match(p.filename, "Ember")~=nil # deband=yes diff --git a/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css index afeae9c..e34edee 100755 --- a/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css +++ b/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css @@ -1,7 +1,7 @@ /* * Waybar styles config * ~/.config/waybar/style.css - * based on https://gitlab.com/fazzi/dotfiles + * based on https://gitlab.com/fazzi/dotfiles * made for `waybar-hyprland` * remember to download `JetBrainsMono Nerd Font` font, * `sudo pacman -S ttf-jetbrains-mono-nerd` on Arch Linux diff --git a/users/guanranwang/home-manager/common/home.nix b/users/guanranwang/home-manager/common/home.nix index 0afd387..0d201dc 100644 --- a/users/guanranwang/home-manager/common/home.nix +++ b/users/guanranwang/home-manager/common/home.nix @@ -12,7 +12,7 @@ # changes in each release. stateVersion = "23.05"; - shellAliases = + shellAliases = let proxy = "http://127.0.0.1:7890/"; in { diff --git a/users/guanranwang/home-manager/darwin/dotfiles.nix b/users/guanranwang/home-manager/darwin/dotfiles.nix index b97d206..3ef5996 100644 --- a/users/guanranwang/home-manager/darwin/dotfiles.nix +++ b/users/guanranwang/home-manager/darwin/dotfiles.nix @@ -8,7 +8,7 @@ in { xdg.configFile = { "clash-meta" = { - source = "${configPath}/clash"; + source = "${configPath}/clash"; recursive = true; }; "alacritty" = { @@ -16,7 +16,7 @@ in recursive = true; }; "fish" = { - source = "${configPath}/fish"; + source = "${configPath}/fish"; recursive = true; }; "zsh/plugins" = { diff --git a/users/guanranwang/home-manager/darwin/home.nix b/users/guanranwang/home-manager/darwin/home.nix index 97e2224..3fe6c89 100644 --- a/users/guanranwang/home-manager/darwin/home.nix +++ b/users/guanranwang/home-manager/darwin/home.nix @@ -55,13 +55,13 @@ # replace outdated macOS components coreutils - vim + vim gnugrep openssh screen # LSP - nixd + nixd nil ];