From c84204b37358dbde6a1058953f241aef0b3f1a04 Mon Sep 17 00:00:00 2001 From: js0ny Date: Fri, 24 Oct 2025 21:27:22 +0100 Subject: [PATCH] formatting --- home/dot_config/zed/settings.json | 12 +- nixcfgs/flake.lock | 59 ++++++---- nixcfgs/flake.nix | 2 + nixcfgs/hosts/zen/dock.nix | 94 ++++++++-------- nixcfgs/hosts/zen/system.nix | 6 +- nixcfgs/hosts/zephyrus/default.nix | 7 +- nixcfgs/modules/nixos/desktop/de/gnome.nix | 10 +- nixcfgs/modules/nixos/desktop/de/niri.nix | 3 +- nixcfgs/modules/nixos/programs/chromium.nix | 3 +- nixcfgs/modules/nixos/programs/libvirt.nix | 9 -- nixcfgs/modules/nixos/services/exp.nix | 4 +- nixcfgs/users/js0ny/packages/flatpak.nix | 12 +- nixcfgs/users/js0ny/packages/gui.nix | 8 +- nixcfgs/users/js0ny/programs/chromium.nix | 15 +-- .../programs/{gnome.nix => gnome/default.nix} | 105 +++++++++++++----- .../users/js0ny/programs/gnome/paperwm.nix | 9 ++ nixcfgs/users/js0ny/programs/rime.nix | 12 +- nixcfgs/users/js0ny/zephyrus.nix | 6 +- 18 files changed, 231 insertions(+), 145 deletions(-) rename nixcfgs/users/js0ny/programs/{gnome.nix => gnome/default.nix} (58%) create mode 100644 nixcfgs/users/js0ny/programs/gnome/paperwm.nix diff --git a/home/dot_config/zed/settings.json b/home/dot_config/zed/settings.json index 867d045..1d895ff 100644 --- a/home/dot_config/zed/settings.json +++ b/home/dot_config/zed/settings.json @@ -68,9 +68,19 @@ "show_parameter_hints": true }, "terminal": { + "detect_venv": { + "on": { + "directories": [".venv"] + } + }, + "dock": "bottom", "env": { "EDITOR": "zed --wait" - } + }, + "shell": { + "program": "fish" + }, + "option_as_meta": true }, "file_types": { "JSON": ["*.code-snippets"] diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index f2107c4..2a65f24 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -54,11 +54,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1760837100, - "narHash": "sha256-B4iL67pRKARIPnZGnlV19axKjjW+UfNP1wnlPbxUM6M=", + "lastModified": 1761208545, + "narHash": "sha256-rlhP4YHqbqSULj/Q3PkaN5mla8btYBBvs/qCiLCGLVM=", "owner": "caelestia-dots", "repo": "shell", - "rev": "84343dde62f99590cd9e21694065cf70d96d9869", + "rev": "223207235e41e3476aefae4e9f4a8724dcd02e8b", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1760887455, - "narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=", + "lastModified": 1761266473, + "narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=", "owner": "nix-community", "repo": "home-manager", - "rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765", + "rev": "5c71d4a730bd3c972befff343bb074421e345937", "type": "github" }, "original": { @@ -221,13 +221,29 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "owner": "nixOS", + "repo": "nixpkgs", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "type": "github" + }, + "original": { + "owner": "nixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1760872779, - "narHash": "sha256-c5C907Raf9eY8f1NUXYeju9aUDlm227s/V0OptEbypA=", + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63bdb5d90fa2fa11c42f9716ad1e23565613b07c", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", "type": "github" }, "original": { @@ -239,11 +255,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -275,11 +291,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1760925195, - "narHash": "sha256-IXpoYD3wXa4oOjf/01e8GT0NZa4wCZnh1GpgfByyCvY=", + "lastModified": 1761301315, + "narHash": "sha256-B7PylIEgB1iCDq9UyGI1K44BMBRvvxDt0W2+LS3ub9o=", "owner": "nix-community", "repo": "NUR", - "rev": "107b1714e76f67a3ae65a966c2e9937eacad5467", + "rev": "e5a797ab3fa9189ee7f4c95d8c6edae19e1f18ff", "type": "github" }, "original": { @@ -298,11 +314,11 @@ ] }, "locked": { - "lastModified": 1759321049, - "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=", + "lastModified": 1761078382, + "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd", + "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "type": "github" }, "original": { @@ -341,6 +357,7 @@ "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "plasma-manager": "plasma-manager", "winboat": "winboat" @@ -381,11 +398,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1760827883, - "narHash": "sha256-6Cvg9YE8wqpkdjnw0HwJH+HOWY9inO/slXf48w+84RM=", + "lastModified": 1761236108, + "narHash": "sha256-HmdYCnoKNzdMqlG9bUKOf0mm3dRS6OL0989o4axcY/0=", "owner": "TibixDev", "repo": "winboat", - "rev": "a1b1105a30b1f5210ce29077e19f21b53083469a", + "rev": "cbb277eecf37cea7ca219ee61401f26811af76ed", "type": "github" }, "original": { diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index b91072e..5d02121 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -3,6 +3,7 @@ description = "A simple NixOS flake"; inputs = { + nixpkgs-stable.url = "github:nixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nix-flatpak.url = "github:gmodena/nix-flatpak"; flake-utils.url = "github:numtide/flake-utils"; @@ -31,6 +32,7 @@ outputs = { self, nixpkgs, + nixpkgs-stable, nix-flatpak, nix-darwin, home-manager, diff --git a/nixcfgs/hosts/zen/dock.nix b/nixcfgs/hosts/zen/dock.nix index e5f70ea..c2233da 100644 --- a/nixcfgs/hosts/zen/dock.nix +++ b/nixcfgs/hosts/zen/dock.nix @@ -1,47 +1,47 @@ -{ config, pkgs, ... }: -{ - system.defaults.dock = { - appswitcher-all-displays = true; - autohide = true; - # Launch Animation - launchanim = false; - # Minimize Animation - mineffect = "suck"; - minimize-to-application = true; - persistent-apps = [ - { app = "/Applications/Vivaldi.app"; } - { app = "/Applications/kitty.app"; } - { app = "/Applications/Obsidian.app"; } - { app = "Applications/Visual Studio Code.app"; } - # { app = "/Applications/LibreWolf.app"; } - # { spacer = { small = false; }; } - # { spacer = { small = true; }; } - # { folder = "/System/Applications/Utilities"; } - # { folder = "/Users/js0ny/Downloads/"; } - ]; - persistent-others = [ - "/Users/js0ny/Downloads" - # "/Users/js0ny/Source" - ]; - show-recents = false; - orientation = "bottom"; - # tr - Top Right - # tl - Top Left (disable this) - # br - Bottom Right - # bl - Bottom Left - # `1`: Disabled - # `2`: Mission Control - # `3`: Application Windows - # `4`: Desktop - # `5`: Start Screen Saver - # `6`: Disable Screen Saver - # `7`: Dashboard - # `10`: Put Display to Sleep - # `11`: Launchpad - # `12`: Notification Center - # `13`: Lock Screen - # `14`: Quick Note - wvous-tr-corner = 2; - wvous-bl-corner = 11; # Simulate Windows button on Windows - wvous-br-corner = 4; - };} +{...}: { + system.defaults.dock = { + appswitcher-all-displays = true; + autohide = true; + # Launch Animation + launchanim = false; + # Minimize Animation + mineffect = "suck"; + minimize-to-application = true; + persistent-apps = [ + {app = "/Applications/Vivaldi.app";} + {app = "/Applications/kitty.app";} + {app = "/Applications/Obsidian.app";} + {app = "Applications/Visual Studio Code.app";} + # { app = "/Applications/LibreWolf.app"; } + # { spacer = { small = false; }; } + # { spacer = { small = true; }; } + # { folder = "/System/Applications/Utilities"; } + # { folder = "/Users/js0ny/Downloads/"; } + ]; + persistent-others = [ + "/Users/js0ny/Downloads" + # "/Users/js0ny/Source" + ]; + show-recents = false; + orientation = "bottom"; + # tr - Top Right + # tl - Top Left (disable this) + # br - Bottom Right + # bl - Bottom Left + # `1`: Disabled + # `2`: Mission Control + # `3`: Application Windows + # `4`: Desktop + # `5`: Start Screen Saver + # `6`: Disable Screen Saver + # `7`: Dashboard + # `10`: Put Display to Sleep + # `11`: Launchpad + # `12`: Notification Center + # `13`: Lock Screen + # `14`: Quick Note + wvous-tr-corner = 2; + wvous-bl-corner = 11; # Simulate Windows button on Windows + wvous-br-corner = 4; + }; +} diff --git a/nixcfgs/hosts/zen/system.nix b/nixcfgs/hosts/zen/system.nix index 0e71b57..1b1f3ba 100644 --- a/nixcfgs/hosts/zen/system.nix +++ b/nixcfgs/hosts/zen/system.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: - { +{...}: { system.defaults = { finder = { AppleShowAllFiles = true; @@ -64,5 +63,4 @@ ShowSeconds = true; }; }; - - } +} diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index c1f6123..4999d02 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -1,5 +1,6 @@ # ~/.config/nixcfgs/hosts/zephyrus/default.nix -{pkgs, ...}: { +{ pkgs, ... }: +{ imports = [ # Host-specific configs ./asus.nix @@ -20,8 +21,8 @@ ../../modules/nixos/hardware/udev/basys3.nix # desktop environment and display manager - ../../modules/nixos/desktop/de/gnome.nix ../../modules/nixos/desktop/dm/gdm.nix + ../../modules/nixos/desktop/de/gnome.nix # desktop programs ../../modules/nixos/programs/chromium.nix @@ -46,7 +47,7 @@ boot.kernelPackages = pkgs.linuxPackages_latest; # Use unfree software - # nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfree = true; # Disable modem networking.modemmanager.enable = false; diff --git a/nixcfgs/modules/nixos/desktop/de/gnome.nix b/nixcfgs/modules/nixos/desktop/de/gnome.nix index e5e5f25..f80ecfc 100644 --- a/nixcfgs/modules/nixos/desktop/de/gnome.nix +++ b/nixcfgs/modules/nixos/desktop/de/gnome.nix @@ -1,12 +1,16 @@ -{ pkgs, ... }: -{ - services.desktopManager.gnome.enable = true; +{pkgs, ...}: { + services.desktopManager.gnome = { + enable = true; + sessionPath = [pkgs.gtop]; + }; environment.systemPackages = with pkgs; [ gnome-menus + gobject-introspection ]; environment.gnome.excludePackages = with pkgs; [ evince totem papers + gtop ]; } diff --git a/nixcfgs/modules/nixos/desktop/de/niri.nix b/nixcfgs/modules/nixos/desktop/de/niri.nix index 5916b1c..7508653 100644 --- a/nixcfgs/modules/nixos/desktop/de/niri.nix +++ b/nixcfgs/modules/nixos/desktop/de/niri.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.niri.enable = true; environment.systemPackages = with pkgs; [ waybar diff --git a/nixcfgs/modules/nixos/programs/chromium.nix b/nixcfgs/modules/nixos/programs/chromium.nix index d5f3b82..3a9170c 100644 --- a/nixcfgs/modules/nixos/programs/chromium.nix +++ b/nixcfgs/modules/nixos/programs/chromium.nix @@ -1,4 +1,5 @@ -{...}: { +{ ... }: +{ programs.chromium = { enable = true; homepageLocation = "https://duckduckgo.com"; diff --git a/nixcfgs/modules/nixos/programs/libvirt.nix b/nixcfgs/modules/nixos/programs/libvirt.nix index cf177f8..e4650fa 100644 --- a/nixcfgs/modules/nixos/programs/libvirt.nix +++ b/nixcfgs/modules/nixos/programs/libvirt.nix @@ -11,15 +11,6 @@ package = pkgs.qemu_kvm; runAsRoot = true; swtpm.enable = true; - # ovmf = { - # enable = true; - # packages = [ - # (pkgs.OVMF.override { - # secureBoot = true; - # tpmSupport = true; - # }).fd - # ]; - # }; }; }; users.users.js0ny = { diff --git a/nixcfgs/modules/nixos/services/exp.nix b/nixcfgs/modules/nixos/services/exp.nix index 5bf5e5a..71b0798 100644 --- a/nixcfgs/modules/nixos/services/exp.nix +++ b/nixcfgs/modules/nixos/services/exp.nix @@ -1,5 +1,5 @@ -{...}: { - # services.forgejo.enable = true; +{ ... }: +{ services.syncthing.enable = true; services.tailscale.enable = true; } diff --git a/nixcfgs/users/js0ny/packages/flatpak.nix b/nixcfgs/users/js0ny/packages/flatpak.nix index 5163337..990e493 100644 --- a/nixcfgs/users/js0ny/packages/flatpak.nix +++ b/nixcfgs/users/js0ny/packages/flatpak.nix @@ -1,6 +1,5 @@ # https://github.com/gmodena/nix-flatpak -{ ... }: -{ +{...}: { services.flatpak.enable = true; services.flatpak.remotes = [ { @@ -24,6 +23,7 @@ # "app.zen_browser.zen" # "com.vivaldi.Vivaldi" "com.getpostman.Postman" + "us.zoom.Zoom" ]; services.flatpak.overrides = { global = { @@ -39,15 +39,15 @@ ]; }; }; - "com.qq.QQ".Context.sockets = [ "x11" ]; + "com.qq.QQ".Context.sockets = ["x11"]; "com.tencent.WeChat" = { - Context.sockets = [ "x11" ]; + Context.sockets = ["x11"]; Environment = { # WeChat does not support wayland & wayland-ime QT_IM_MODULE = "fcitx"; }; }; - "md.obsidian.Obsidian".Context.sockets = [ "wayland" ]; - "com.getpostman.Postman".Context.persistent = [ "Postman" ]; + "md.obsidian.Obsidian".Context.sockets = ["wayland"]; + "com.getpostman.Postman".Context.persistent = ["Postman"]; }; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index b62ad6c..141fab8 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ home.packages = with pkgs; [ # Terminal Emulator ghostty # default @@ -14,7 +15,7 @@ kdePackages.okular # default sioyek # Image Viewer - nsxiv # default + imv # default loupe # SUPER FAST 有催人跑的感觉 w/ GPU Accel. papirus-icon-theme kdePackages.elisa @@ -39,13 +40,14 @@ qbittorrent protonvpn-gui proton-pass - protonmail-bridge-gui mpv neovim-qt goldendict-ng kdePackages.kdenlive gimp steam-run + bottles + lutris ]; xdg.desktopEntries = { diff --git a/nixcfgs/users/js0ny/programs/chromium.nix b/nixcfgs/users/js0ny/programs/chromium.nix index b406b83..6bd36d3 100644 --- a/nixcfgs/users/js0ny/programs/chromium.nix +++ b/nixcfgs/users/js0ny/programs/chromium.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.chromium = { enable = true; commandLineArgs = [ @@ -8,12 +9,12 @@ "--ozone-platform-hint=auto" ]; extensions = [ - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin - {id = "ghmbeldphafepmbegfdlkpapadhbakde";} # proton pass - {id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";} # dark reader - {id = "gfbliohnnapiefjpjlpjnehglfpaknnc";} # surfingkeys - {id = "bpoadfkcbjbfhfodiogcnhhhpibjhbnh";} # immersive translate - {id = "dhdgffkkebhmkfjojejmpbldmpobfkfo";} # tampermonkey + { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # ublock origin + { id = "ghmbeldphafepmbegfdlkpapadhbakde"; } # proton pass + { id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; } # dark reader + { id = "gfbliohnnapiefjpjlpjnehglfpaknnc"; } # surfingkeys + { id = "bpoadfkcbjbfhfodiogcnhhhpibjhbnh"; } # immersive translate + { id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; } # tampermonkey ]; }; } diff --git a/nixcfgs/users/js0ny/programs/gnome.nix b/nixcfgs/users/js0ny/programs/gnome/default.nix similarity index 58% rename from nixcfgs/users/js0ny/programs/gnome.nix rename to nixcfgs/users/js0ny/programs/gnome/default.nix index b2135e9..2b47f31 100644 --- a/nixcfgs/users/js0ny/programs/gnome.nix +++ b/nixcfgs/users/js0ny/programs/gnome/default.nix @@ -1,8 +1,16 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ + home.sessionVariables = { + QT_STYLE_OVERRIDE = "adwaita"; + }; home.packages = with pkgs; [ gnome-tweaks sushi dconf-editor + gnome-menus + adwaita-qt + adwaita-qt6 + gobject-introspection gnomeExtensions.dash-to-dock gnomeExtensions.caffeine gnomeExtensions.logo-menu @@ -18,15 +26,16 @@ ]; programs.gnome-shell.enable = true; programs.gnome-shell.extensions = [ - {package = pkgs.gnomeExtensions.dash-to-dock;} - {package = pkgs.gnomeExtensions.caffeine;} - {package = pkgs.gnomeExtensions.logo-menu;} - {package = pkgs.gnomeExtensions.kimpanel;} - {package = pkgs.gnomeExtensions.appindicator;} - {package = pkgs.gnomeExtensions.gsconnect;} - {package = pkgs.gnomeExtensions.clipboard-indicator;} - {package = pkgs.gnomeExtensions.advanced-alttab-window-switcher;} - # {package = pkgs.gnomeExtensions.blur-my-shell;} + { package = pkgs.gnomeExtensions.dash-to-dock; } + { package = pkgs.gnomeExtensions.caffeine; } + { package = pkgs.gnomeExtensions.logo-menu; } + { package = pkgs.gnomeExtensions.kimpanel; } + { package = pkgs.gnomeExtensions.appindicator; } + { package = pkgs.gnomeExtensions.gsconnect; } + { package = pkgs.gnomeExtensions.clipboard-indicator; } + { package = pkgs.gnomeExtensions.advanced-alttab-window-switcher; } + { package = pkgs.gnomeExtensions.resource-monitor; } + { package = pkgs.gnomeExtensions.lunar-calendar; } ]; dconf.settings = { @@ -45,14 +54,6 @@ remember-passwords = false; enable-mouse-gestures = true; }; - "org/gnome/shell/extensions/Logo-menu" = { - menu-button-icon-image = 23; - symbolic-icon = true; - use-custom-icon = false; - }; - "org/gnome/shell/extensions/clipboard-indicator" = { - toggle-menu = ["v"]; - }; "org/gnome/shell" = { favorite-apps = [ "com.mitchellh.ghostty.desktop" @@ -61,22 +62,43 @@ ]; }; "org/gnome/shell/keybindings" = { - toggle-overview = ["w"]; - toggle-message-tray = ["n"]; + toggle-overview = [ "w" ]; + toggle-message-tray = [ "n" ]; # G14 Compatibility - show-screenshot-ui = ["s"]; + show-screenshot-ui = [ + "s" + "Print" + ]; }; "org/gnome/desktop/wm/keybindings" = { - activate-window-menu = ["F3"]; - show-desktop = ["d"]; - close = ["q" "F4"]; - switch-windows = ["Tab"]; - switch-windows-backward = ["Tab"]; - switch-applications = ["Tab"]; - switch-applications-backward = ["Tab"]; + activate-window-menu = [ "F3" ]; + show-desktop = [ "d" ]; + close = [ + "q" + "F4" + ]; + switch-windows = [ "Tab" ]; + switch-windows-backward = [ "Tab" ]; + switch-applications = [ "Tab" ]; + switch-applications-backward = [ "Tab" ]; + minimize = [ "m" ]; + maximize = [ + "m" + "Up" + ]; + }; + "org/gnome/mutter/keybindings" = { + toggle-tiled-left = [ + "Left" + "H" + ]; + toggle-tiled-right = [ + "Right" + "L" + ]; }; "org/gnome/settings-daemon/plugins/media-keys" = { - www = ["b"]; + www = [ "b" ]; }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0" = { name = "Open File Explorer"; @@ -114,6 +136,31 @@ "ca/desrt/dconf-editor" = { show-warning = false; }; + # Extension settings + "org/gnome/shell/extensions/Logo-menu" = { + menu-button-icon-image = 23; + symbolic-icon = true; + use-custom-icon = false; + }; + "org/gnome/shell/extensions/clipboard-indicator" = { + toggle-menu = [ "v" ]; + }; + "org/gnome/shell/extensions/lunar-calendar" = { + yuyan = 0; + gen-zhi = false; + jrrilinei = false; + show-date = false; + show-time = false; + }; + "com/github/Ory0n/Resource_Monitor" = { + extensionposition = "left"; + iconsposition = "left"; + cpustatus = true; + netethstatus = false; + netwlanstatus = false; + ramalert = true; + ramunit = "perc"; + }; }; # qt.style.name = "adwaita"; diff --git a/nixcfgs/users/js0ny/programs/gnome/paperwm.nix b/nixcfgs/users/js0ny/programs/gnome/paperwm.nix new file mode 100644 index 0000000..fd03310 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/gnome/paperwm.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs.gnomeExtensions; [ + paperwm + ]; + programs.gnome-shell.extensions = [ + { package = pkgs.gnomeExtensions.paperwm; } + ]; +} diff --git a/nixcfgs/users/js0ny/programs/rime.nix b/nixcfgs/users/js0ny/programs/rime.nix index ad8d66a..5ab77b2 100644 --- a/nixcfgs/users/js0ny/programs/rime.nix +++ b/nixcfgs/users/js0ny/programs/rime.nix @@ -1,15 +1,15 @@ -{ pkgs, ... }: - -let +{pkgs, ...}: let version = "v13.1.3"; rimeConfig = pkgs.fetchzip { url = "https://github.com/amzxyz/rime_wanxiang/releases/download/${version}/rime-wanxiang-zrm-fuzhu.zip"; sha256 = "sha256-UokSOfGCt7C8/F13BEyy02+rJCqyZcYBWrP/m/Me4D4="; stripRoot = false; }; - rimePath = if pkgs.stdenv.isDarwin then "Library/Rime" else ".local/share/fcitx5/rime"; -in -{ + rimePath = + if pkgs.stdenv.isDarwin + then "Library/Rime" + else ".local/share/fcitx5/rime"; +in { i18n.inputMethod = { enable = true; type = "fcitx5"; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 376574b..ac9b9fd 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -1,5 +1,6 @@ # ~/.config/nixcfgs/users/js0ny/default.nix -{...}: { +{ ... }: +{ imports = [ # General config ./default.nix @@ -26,7 +27,8 @@ ./programs/rime.nix # Desktop Linux - ./programs/gnome.nix + ./programs/gnome + ./programs/gnome/paperwm.nix # General Program config ../../modules/home/programs/nvim.nix