diff --git a/nixcfgs/modules/nixos/desktop/de/gnome.nix b/nixcfgs/modules/nixos/desktop/de/gnome.nix index 1b576ce..062b689 100644 --- a/nixcfgs/modules/nixos/desktop/de/gnome.nix +++ b/nixcfgs/modules/nixos/desktop/de/gnome.nix @@ -1,7 +1,14 @@ {pkgs, ...}: { services.desktopManager.gnome = { enable = true; - sessionPath = [pkgs.gtop]; + sessionPath = with pkgs; [ + gtop + gnome-menus + gobject-introspection + # Copyous + libgda6 + gsound + ]; }; environment.systemPackages = with pkgs; [ gnome-menus @@ -14,5 +21,6 @@ gnome-tour baobab # Disk Usage Analyzer, use dust instead epiphany # GNOME Web + gnome-system-monitor # use mission-center ]; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 3bb0f7a..14c8ba0 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -72,7 +72,6 @@ in { loupe # SUPER FAST 有催人跑的感觉 w/ GPU Accel. kdePackages.elisa - haruna # Email protonmail-bridge @@ -127,6 +126,9 @@ in { scanmem dex piliplus + foliate + newsflash + mission-center ] ++ (mkFcitxIM [ pkgs.neovim-qt diff --git a/nixcfgs/users/js0ny/programs/celluloid.nix b/nixcfgs/users/js0ny/programs/celluloid.nix new file mode 100644 index 0000000..9f6c7cd --- /dev/null +++ b/nixcfgs/users/js0ny/programs/celluloid.nix @@ -0,0 +1,17 @@ +{ + pkgs, + config, + ... +}: { + # MPV GTK4 frontend + imports = [./mpv.nix]; # Include MPV configuration + home.packages = [pkgs.celluloid]; + dconf.settings = { + "io/github/celluloid-player/celluloid" = { + mpv-config-enable = true; + mpv-input-config-enable = true; + mpv-config-file = "file:///home/${config.home.username}/.config/mpv/mpv.conf"; + mpv-input-config-file = "file:///home/${config.home.username}/.config/mpv/input.conf"; + }; + }; +} diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix index a977fb4..b7be862 100644 --- a/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix @@ -1,4 +1,3 @@ -# 大败而归,等打包了 { pkgs, lib, @@ -15,4 +14,11 @@ in { gsound ]; xdg.dataFile."copyous@boerdereinar.dev/highlight.min.js".source = highlightJs; + dconf.settings = { + # TODO: Add more settings here later. + "org/gnome/shell/extensions/copyous" = { + open-clipboard-dialog-shortcut = ["v"]; + show-at-pointer = true; + }; + }; } diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix index 815c6b0..35d7fe4 100644 --- a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix @@ -11,7 +11,6 @@ kimpanel appindicator gsconnect - clipboard-indicator advanced-alttab-window-switcher resource-monitor lunar-calendar @@ -19,16 +18,13 @@ in { imports = [ ../../walker.nix - # ./copyous.nix + ./copyous.nix ]; home.packages = with pkgs; [ gnome-tweaks sushi dconf-editor - gnome-menus - showtime - gobject-introspection ] ++ extensions; programs.gnome-shell.enable = true; @@ -171,6 +167,7 @@ in { netwlanstatus = false; ramalert = true; ramunit = "perc"; + customleftclickstatus = "missioncenter"; }; }; } diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix index 906284e..6f1542b 100644 --- a/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix @@ -10,6 +10,10 @@ screensaver = [""]; }; "org/gnome/shell/extensions/paperwm/keybindings" = { + close-window = ["q"]; + new-window = []; + switch-next = []; + switch-previous = []; switch-left = [ "Left" "h" @@ -22,35 +26,27 @@ "Down" "j" ]; - move-left = [ - "comma" - "comma" - "Left" - "h" - ]; - move-right = [ - "comma" - "comma" - "Left" - "l" - ]; - move-up = [ - "comma" - "comma" - "Left" - "k" - ]; - move-down = [ - "comma" - "comma" - "Left" - "j" + switch-up = [ + "Up" + "k" ]; + move-left = ["h"]; + move-right = ["l"]; + move-up = [""]; + move-down = [""]; + switch-down-or-else-workspace = ["j"]; + switch-up-or-else-workspace = ["k"]; center-vertically = [""]; drift-left = [""]; drift-right = [""]; move-up-workspace = ["k"]; move-down-workspace = ["j"]; + slurp-in = ["bracketleft"]; + barf-out = ["bracketright"]; + barf-out-active = []; + }; + "org/gnome/shell/extensions/paperwm" = { + winprops = [''{"wm_class":"dev.benz.walker","scratch_layer":true}'']; }; }; } diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix index 57228f4..d7ca4e7 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix +++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix @@ -39,6 +39,10 @@ # Applies to all chromium title = "^Picture in picture$"; } + { + title = "^Friends List$"; + app-id = "^steam$"; + } ]; open-floating = true; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index ff916e5..56fd017 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -69,9 +69,12 @@ ./programs/pwa.nix ./programs/walker.nix ./programs/sioyek.nix + ./programs/celluloid.nix # Desktop Linux ./programs/desktop/gnome + ./programs/desktop/gnome/paperwm.nix + ./programs/desktop/gnome/copyous.nix ./programs/desktop/wayland-wm/niri ../../modules/home/do-not-track.nix