From 7314178fa78720b2b3d6e7cb6258c100fca474a2 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 4 Nov 2023 00:02:28 +0800 Subject: [PATCH] home: modify installed packages ### NixOS - re-added libnotify and jq they are needed for my screenshot script and were removed by accident - removed kvantum, hyprland - removed unnecessary hyprland options in flake.nix - configured browsers through home-manager options - fixed typo in i18n.nix ### Common - added nix-output-monitor - configured helix - fixed indentation at programs.vscode --- flake.nix | 9 - .../guanranwang/home-manager/common/home.nix | 21 +- .../guanranwang/home-manager/darwin/home.nix | 1 + users/guanranwang/home-manager/nixos/home.nix | 237 ++++++++++++++---- users/guanranwang/home-manager/nixos/i18n.nix | 2 +- 5 files changed, 206 insertions(+), 64 deletions(-) diff --git a/flake.nix b/flake.nix index 3686f4a..1bc0fda 100755 --- a/flake.nix +++ b/flake.nix @@ -210,15 +210,6 @@ modules = [ sops-nix.homeManagerModules.sops hyprland.homeManagerModules.default - { - wayland.windowManager.hyprland = { - enable = true; - #enableNvidiaPatches = true; - xwayland = { - enable = true; - }; - }; - } ]; }; }; diff --git a/users/guanranwang/home-manager/common/home.nix b/users/guanranwang/home-manager/common/home.nix index 391933e..47f6e65 100644 --- a/users/guanranwang/home-manager/common/home.nix +++ b/users/guanranwang/home-manager/common/home.nix @@ -193,7 +193,7 @@ "terminal.integrated.cursorBlinking" = true; "update.mode" = "none"; "window.menuBarVisibility" = "toggle"; - "workbench.colorTheme" = "Tokyo Night"; + "workbench.colorTheme" = "Tokyo Night"; # Extensions ### Nix IDE @@ -241,9 +241,24 @@ normal = "block"; select = "underline"; }; - file-picker = { - hidden = false; + statusline = { + mode = { + normal = "--NORMAL--"; + insert = "--INSERT--"; + select = "--SELECT--"; + }; }; + indent-guides.render = true; + file-picker.hidden = false; + }; + # i still use these keybinds somethimes, even its hard to reach + keys.insert = { + C-left = "move_prev_word_start"; + C-right = "move_next_word_end"; + }; + keys.normal = { + C-left = "move_prev_word_start"; + C-right = "move_next_word_end"; }; }; }; diff --git a/users/guanranwang/home-manager/darwin/home.nix b/users/guanranwang/home-manager/darwin/home.nix index c67c13e..0b8893b 100644 --- a/users/guanranwang/home-manager/darwin/home.nix +++ b/users/guanranwang/home-manager/darwin/home.nix @@ -55,6 +55,7 @@ android-tools skim ydict + nix-output-monitor ## GUI diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix index 250cfac..5b650d9 100644 --- a/users/guanranwang/home-manager/nixos/home.nix +++ b/users/guanranwang/home-manager/nixos/home.nix @@ -5,12 +5,6 @@ username = "guanranwang"; homeDirectory = "/home/guanranwang"; - # Environment variables - sessionVariables = { - # qt theme - #"QT_STYLE_OVERRIDE"="kvantum"; - }; - packages = (with pkgs; [ # x11 + wayland rofi-wayland @@ -32,6 +26,8 @@ #udiskie swww mpvpaper + libnotify + jq # x11 #polybar @@ -47,58 +43,20 @@ mpv spicetify-cli - # TUI - cava - joshuto # rs - bottom - helix - skim - bat - - # cli - fastfetch - wget - sops - skim - ydict - zoxide # rs - trashy - eza - ripgrep - fd - freshfetch - hyperfine - - # themes - tela-icon-theme - tela-circle-icon-theme - papirus-icon-theme - adw-gtk3 - libsForQt5.qtstyleplugin-kvantum # Kvantum, theme engine - - - ### flatpak-able - - # browser - #brave - #google-chrome - #firefox - librewolf - #microsoft-edge - - # matrix + ### matrix #fluffychat element-desktop cinny-desktop #nheko - # music + ### music easyeffects spotify yesplaymusic amberol netease-cloud-music-gtk + ### misc bitwarden #discord #qq @@ -117,6 +75,40 @@ gnome.gnome-weather gnome.gnome-calculator gnome.dconf-editor + + # TUI + cava + joshuto # rs + bottom + helix + skim + bat + + # cli + #fastfetch + wget + sops + skim + ydict + nix-output-monitor + zoxide # rs + trashy + eza + ripgrep + fd + freshfetch + hyperfine + + # lsp + nil + gopls + libclang + + # themes + tela-icon-theme + tela-circle-icon-theme + papirus-icon-theme + adw-gtk3 ]) ++ (with pkgs.gnome; [ # GNOME nautilus @@ -231,11 +223,13 @@ wayland.windowManager = { hyprland = { - enable = true; + #enable = true; enableNvidiaPatches = true; - xwayland = { - enable = true; - }; + xwayland.enable = true; + plugins = [ + #inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix + ]; + extraConfig = '' #source = ~/.config/hypr/themes/mocha.conf #source = ~/.config/hypr/themes/colors.conf @@ -269,5 +263,146 @@ # # # #}; #}; + + firefox = { + #enable = true; + profiles."default" = {}; + }; + + librewolf = { + enable = true; + settings = { + "identity.fxaccounts.enabled" = true; + + # https:#github.com/yokoffing/Betterfox/blob/main/librewolf.overrides.cfg + ### SECTION: FASTFOX + "layout.css.grid-template-masonry-value.enabled" = true; + "dom.enable_web_task_scheduling" = true; + + + ### SECTION: SECUREFOX + # TRACKING PROTECTION + "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com"; + "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com"; + + ### OCSP & CERTS / HPKP + # Use CRLite instead of OCSP + "security.OCSP.enabled" = 0; + "security.OCSP.require" = false; + "security.pki.crlite_mode" = 2; + + ### RFP + # Limits refresh rate to 60mHz, breaks timezone, and forced light theme + # [1] https:#librewolf.net/docs/faq/#what-are-the-most-common-downsides-of-rfp-resist-fingerprinting + "privacy.resistFingerprinting" = false; + + ### WebGL + # Breaks Map sites, NYT articles, Nat Geo, and more + # [1] https:#manu.ninja/25-real-world-applications-using-webgl/ + "webgl.disabled" = false; + + # DRM + # Netflix, Udemy, Spotify, etc. + "media.eme.enabled" = true; + + # HTTPS-ONLY MODE + "dom.security.https_only_mode_error_page_user_suggestions" = true; + + # PASSWORDS AND AUTOFILL + "signon.generation.enabled" = false; + + ### WEBRTC + # Breaks video conferencing + "media.peerconnection.ice.no_host" = false; + + ### PERMISSIONS + "permissions.default.geo" = 2; + "permissions.default.desktop-notification" = 2; + "dom.push.enabled" = false; + + + ### SECTION: PESKYFOX + ### MOZILLA UI + "layout.css.prefers-color-scheme.content-override" = 2; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.compactmode.show" = true; + + ### FULLSCREEN + "full-screen-api.transition-duration.enter" = "0 0"; + "full-screen-api.transition-duration.leave" = "0 0"; + "full-screen-api.warning.delay" = 0; + "full-screen-api.warning.timeout" = 0; + + ### URL BAR + "browser.urlbar.suggest.engines" = false; + "browser.urlbar.suggest.topsites" = false; + "browser.urlbar.suggest.calculator" = true; + "browser.urlbar.unitConversion.enabled" = true; + + ### AUTOPLAY + # Default breaks some video players + "media.autoplay.blocking_policy" = 0; + + #### PASSWORDS + "editor.truncate_user_pastes" = false; + + #### DOWNLOADS + "browser.download.autohideButton" = true; + + ### PDF + "browser.download.open_pdf_attachments_inline" = true; + + ### TAB BEHAVIOR + "browser.tabs.loadBookmarksInTabs" = true; + "browser.bookmarks.openInTabClosesMenu" = false; + "findbar.highlightAll" = true; + + + ### SECTION: SMOOTHFOX + "apz.overscroll.enabled" = true; + "general.smoothScroll" = true; + "general.smoothScroll.msdPhysics.continuousMotionMaxDeltaMS" = 12; + "general.smoothScroll.msdPhysics.enabled" = true; + "general.smoothScroll.msdPhysics.motionBeginSpringConstant" = 600; + "general.smoothScroll.msdPhysics.regularSpringConstant" = 650; + "general.smoothScroll.msdPhysics.slowdownMinDeltaMS" = 25; + "general.smoothScroll.msdPhysics.slowdownMinDeltaRatio" = "2.0"; + "general.smoothScroll.msdPhysics.slowdownSpringConstant" = 250; + "general.smoothScroll.currentVelocityWeighting" = "1.0"; + "general.smoothScroll.stopDecelerationWeighting" = "1.0"; + "mousewheel.default.delta_multiplier_y" = 75; + }; + }; + + chromium = { + enable = true; + #package = pkgs.ungoogled-chromium; + # ungoogled-chrome does not work with extensions for now + # https://github.com/nix-community/home-manager/issues/2216 + # https://github.com/nix-community/home-manager/issues/2585 + extensions = [ + { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # ublock origin + { id = "mnjggcdmjocbbbhaepdhchncahnbgone"; } # sponsorblock + { id = "icallnadddjmdinamnolclfjanhfoafe"; } # fastforward + { id = "dbepggeogbaibhgnhhndojpepiihcmeb"; } # vimium + { id = "nngceckbapebfimnlniiiahkandclblb"; } # bitwarden + { id = "gebbhagfogifgggkldgodflihgfeippi"; } # return youtube dislike + { id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; } # dark reader + { id = "njdfdhgcmkocbgbhcioffdbicglldapd"; } # localcdn + { id = "hipekcciheckooncpjeljhnekcoolahp"; } # tabliss + { id = "bgfofngpplpmpijncjegfdgilpgamhdk"; } # modern scrollbar + { id = "ajhmfdgkijocedmfjonnpjfojldioehi"; } # privacy pass + { id = "hkgfoiooedgoejojocmhlaklaeopbecg"; } # picture in picture + #{ id = "fnaicdffflnofjppbagibeoednhnbjhg"; } # floccus bookmark sync + #{ id = "jaoafjdoijdconemdmodhbfpianehlon"; } # skip redirect + #{ id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; } # tampermonkey + #{ id = "jinjaccalgkegednnccohejagnlnfdag"; } # violentmonkey + #{ id = "kdbmhfkmnlmbkgbabkdealhhbfhlmmon"; } # steamdb + #{ id = "cmeakgjggjdlcpncigglobpjbkabhmjl"; } # steam inventory helper + #{ id = "mgijmajocgfcbeboacabfgobmjgjcoja"; } # google dictionary + #{ id = "kbfnbcaeplbcioakkpcpgfkobkghlhen"; } # grammarly + #{ id = "ekbmhggedfdlajiikminikhcjffbleac"; } # 喵喵折+ + ]; + }; }; } diff --git a/users/guanranwang/home-manager/nixos/i18n.nix b/users/guanranwang/home-manager/nixos/i18n.nix index 2c9cb21..01271c7 100644 --- a/users/guanranwang/home-manager/nixos/i18n.nix +++ b/users/guanranwang/home-manager/nixos/i18n.nix @@ -6,7 +6,7 @@ enabled = "fcitx5"; fcitx5.addons = with pkgs; [ fcitx5-chinese-addons - fcitx5-pinyin-moegirl # Using Berberman's FLake overlay + fcitx5-pinyin-moegirl # Using Berberman's Flake overlay fcitx5-pinyin-zhwiki #fcitx5-rime