From e1bcc9e7973b653b69940849e17bf59b6b9b65ba Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sat, 29 Jan 2022 19:40:54 -0700 Subject: [PATCH] trim some options and make tiling optional in de2 --- home-manager/modules/de2u.nix | 104 +++++++++++++++------------------- modules/de2.nix | 5 ++ 2 files changed, 51 insertions(+), 58 deletions(-) diff --git a/home-manager/modules/de2u.nix b/home-manager/modules/de2u.nix index d9edadf..3f94e1b 100644 --- a/home-manager/modules/de2u.nix +++ b/home-manager/modules/de2u.nix @@ -6,6 +6,12 @@ in { options.de2u = { enable = mkEnableOption "Enable de2 user stuff"; + + tiling = mkOption { + type = types.bool; + default = true; + description = "Enable tiling stuff"; + }; }; config = mkIf cfg.enable { @@ -51,7 +57,7 @@ in systemd.user.sessionVariables = { QT_QPA_PLATFORM = "wayland-egl;xcb"; MOZ_ENABLE_WAYLAND = "1"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = lib.mkIf cfg.tiling "1"; }; xdg.mimeApps = { @@ -73,12 +79,12 @@ in dconf.settings = with lib.hm.gvariant; { "org/gnome/desktop/interface" = { - enable-hot-corners = false; + enable-hot-corners = !cfg.tiling; show-battery-percentage = true; }; "org/gnome/shell/extensions/pop-shell" = { - tile-by-default = true; - show-title = false; + tile-by-default = cfg.tiling; + show-title = !cfg.tiling; active-hint = false; }; "org/gnome/shell/extensions/improved-workspace-indicator" = { @@ -87,7 +93,7 @@ in "org/gnome/shell/extensions/vitals" = { hide-zeros = true; show-battery = true; - update-time = 8; + update-time = 10; }; "org/gnome/shell/extensions/appindicator" = { icon-opacity = 255; @@ -97,26 +103,17 @@ in name = if config.colors.enable then "Generated" else "Default"; }; "org/gnome/shell/extensions/just-perfection" = { - activities-button = false; + activities-button = !cfg.tiling; + startup-status = 0; + workspace-popup = false; + window-picker-icon = false; animation = 3; - app-menu = true; - app-menu-icon = true; - background-menu = true; dash = false; double-super-to-appgrid = true; - gesture = true; - hot-corner = false; - show-apps-button = false; - startup-status = 0; - window-picker-icon = false; - window-preview-caption = true; - workspace = true; - workspace-popup = false; - workspace-switcher-should-show = false; - workspaces-in-app-grid = true; }; "org/gnome/shell" = { disable-user-extensions = false; + disabled-extensions = [ "" ]; enabled-extensions = [ "pop-shell@system76.com" "rrc@ogarcia.me" @@ -127,20 +124,21 @@ in "clipboard-indicator@tudmotu.com" "just-perfection-desktop@just-perfection" "appindicatorsupport@rgcjonas.gmail.com" + "launch-new-instance@gnome-shell-extensions.gcampax.github.com" ]; }; "org/gnome/desktop/peripherals/touchpad" = { natural-scroll = false; }; "org/gnome/mutter" = { - edge-tiling = false; - dynamic-workspaces = false; + edge-tiling = !cfg.tiling; + dynamic-workspaces = !cfg.tiling; }; "org/gnome/shell/extensions/blur-me" = { toggle-app-blur = false; }; "org/gnome/desktop/wm/preferences" = { - focus-mode = "sloppy"; + focus-mode = if cfg.tiling then "sloppy" else "click"; resize-with-right-button = true; num-workspaces = 9; }; @@ -152,43 +150,33 @@ in enabled = true; }; - "org/gnome/desktop/wm/keybindings" = { - move-to-workspace-1 = [ "exclam" ]; - move-to-workspace-2 = [ "at" ]; - move-to-workspace-3 = [ "numbersign" ]; - move-to-workspace-4 = [ "dollar" ]; - move-to-workspace-5 = [ "percent" ]; - move-to-workspace-6 = [ "asciicircum" ]; - move-to-workspace-7 = [ "ampersand" ]; - move-to-workspace-8 = [ "asterisk" ]; - move-to-workspace-9 = [ "parenleft" ]; - switch-to-workspace-1 = [ "1" ]; - switch-to-workspace-2 = [ "2" ]; - switch-to-workspace-3 = [ "3" ]; - switch-to-workspace-4 = [ "4" ]; - switch-to-workspace-5 = [ "5" ]; - switch-to-workspace-6 = [ "6" ]; - switch-to-workspace-7 = [ "7" ]; - switch-to-workspace-8 = [ "8" ]; - switch-to-workspace-9 = [ "9" ]; + "org/gnome/desktop/wm/keybindings" = + let + workspaceAttrsList = lib.flatten (map + (n: [ + (lib.nameValuePair "move-to-workspace-${n}" [ "${n}" ]) + (lib.nameValuePair "switch-to-workspace-${n}" [ "${n}" ]) + ]) + (map (n: toString n) (lib.range 0 9))); + in + lib.listToAttrs workspaceAttrsList // { + minimize = [ "comma" ]; + switch-to-workspace-left = [ "" ]; + switch-to-workspace-right = [ "" ]; + maximize = [ "" ]; + unmaximize = [ "" ]; + move-to-monitor-up = [ "" ]; + move-to-monitor-down = [ "" ]; + move-to-monitor-left = [ "" ]; + move-to-monitor-right = [ "" ]; + move-to-workspace-down = [ "" ]; + move-to-workspace-up = [ "" ]; + switch-to-workspace-down = [ "Down" "j" ]; + switch-to-workspace-up = [ "Up" "k" ]; + toggle-maximized = [ "m" ]; + close = [ "q" "F4" ]; - minimize = [ "comma" ]; - switch-to-workspace-left = [ "" ]; - switch-to-workspace-right = [ "" ]; - maximize = [ "" ]; - unmaximize = [ "" ]; - move-to-monitor-up = [ "" ]; - move-to-monitor-down = [ "" ]; - move-to-monitor-left = [ "" ]; - move-to-monitor-right = [ "" ]; - move-to-workspace-down = [ "" ]; - move-to-workspace-up = [ "" ]; - switch-to-workspace-down = [ "Down" "j" ]; - switch-to-workspace-up = [ "Up" "k" ]; - toggle-maximized = [ "m" ]; - close = [ "q" "F4" ]; - - }; + }; "org/gnome/mutter/keybindings" = { toggle-tiled-left = [ "" ]; toggle-tiled-right = [ "" ]; diff --git a/modules/de2.nix b/modules/de2.nix index 79042a4..744fffa 100644 --- a/modules/de2.nix +++ b/modules/de2.nix @@ -7,6 +7,11 @@ in options.de2.enable = mkEnableOption "Enable de2 system stuff"; config = mkIf cfg.enable { + environment.gnome.excludePackages = with pkgs; [ + gnome.epiphany + gnome.gnome-software + ]; + services.xserver = { enable = lib.mkDefault true; displayManager.gdm.enable = lib.mkDefault true;