diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index caa1c75..813123a 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -103,9 +103,6 @@ in enable = true; interfaces = [ "wlp11s0" ]; }; - desktop = { - gnome.enable = lib.mkForce false; - }; }; }; diff --git a/hosts/desktop.nix b/hosts/desktop.nix index ac2222f..4437743 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -51,7 +51,6 @@ systemd.services.NetworkManager-wait-online.enable = false; modules = { - system.desktop.gnome.enable = true; services.tailscale.enable = true; }; diff --git a/hosts/helios/default.nix b/hosts/helios/default.nix index eaeb8ca..4f53ca1 100644 --- a/hosts/helios/default.nix +++ b/hosts/helios/default.nix @@ -1,12 +1,8 @@ { pkgs, - lib, ... }: -let - inherit (lib) mkForce; -in { imports = [ ./hardware-configuration.nix @@ -45,9 +41,6 @@ in repoPath = "ssh://b9cjl9hq@b9cjl9hq.repo.borgbase.com/./repo"; }; }; - system.desktop = { - gnome.enable = mkForce false; - }; }; system.stateVersion = "22.11"; diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix index 88e1f69..0ba1f5a 100644 --- a/hosts/odyssey/default.nix +++ b/hosts/odyssey/default.nix @@ -1,5 +1,4 @@ { - lib, pkgs, ... }: @@ -106,9 +105,6 @@ repoPath = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"; }; }; - system.desktop = { - gnome.enable = lib.mkForce false; - }; }; system.stateVersion = "22.11"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 8967e35..cdb5502 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -5,7 +5,6 @@ ./services/borgmatic.nix ./services/postgresql.nix ./services/tailscale.nix - ./system/desktop/gnome.nix ./system/wireless.nix ]; } diff --git a/modules/nixos/system/desktop/gnome.nix b/modules/nixos/system/desktop/gnome.nix deleted file mode 100644 index 7d733a4..0000000 --- a/modules/nixos/system/desktop/gnome.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.modules.system.desktop.gnome; -in -{ - options.modules.system.desktop.gnome = { - enable = lib.mkOption { - default = false; - example = true; - }; - }; - - config = lib.mkIf cfg.enable { - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; - - services.flatpak.enable = true; - services.fwupd.enable = true; - - programs.dconf.enable = true; - - environment.systemPackages = with pkgs.unstable; [ - adw-gtk3 - adwaita-fonts - libsForQt5.qtstyleplugin-kvantum - morewaita-icon-theme - nautilus-python - qadwaitadecorations - qadwaitadecorations-qt6 - - ## Shell extensions - gnomeExtensions.appindicator - gnomeExtensions.arcmenu - gnomeExtensions.blur-my-shell - gnomeExtensions.burn-my-windows - gnomeExtensions.clipboard-indicator - gnomeExtensions.coverflow-alt-tab - gnomeExtensions.dash-to-panel - gnomeExtensions.desktop-cube - gnomeExtensions.easyScreenCast - gnomeExtensions.fly-pie - gnomeExtensions.forge - gnomeExtensions.gsconnect - gnomeExtensions.gsnap - gnomeExtensions.hide-top-bar - gnomeExtensions.just-perfection - gnomeExtensions.media-controls - gnomeExtensions.mouse-follows-focus - # gnomeExtensions.pano (disabled due to: https://github.com/NixOS/nixpkgs/issues/369438) - gnomeExtensions.paperwm - gnomeExtensions.pip-on-top - gnomeExtensions.search-light - gnomeExtensions.smart-auto-move - gnomeExtensions.space-bar - gnomeExtensions.tiling-assistant - gnomeExtensions.tiling-shell - gnomeExtensions.todotxt - gnomeExtensions.vitals - gnomeExtensions.window-is-ready-remover - gnomeExtensions.worksets - gnomeExtensions.workspace-matrix - ]; - - environment.persistence."/persist".directories = [ - "/etc/NetworkManager" - "/var/lib/AccountsService" - "/var/lib/NetworkManager" - ]; - }; -} diff --git a/users/jordan/common/optional/graphical/gnome.nix b/users/jordan/common/optional/graphical/gnome.nix deleted file mode 100644 index f9ce346..0000000 --- a/users/jordan/common/optional/graphical/gnome.nix +++ /dev/null @@ -1,243 +0,0 @@ -{ - inputs, - lib, - pkgs, - osConfig, - ... -}: - -let - inherit (lib) - mkForce - ; - inherit (lib.generators) - toINI - ; -in -{ - dconf.settings = { - "io/github/celluloid-player/celluloid" = { - draggable-video-area-enable = true; - }; - "org/gnome/Console" = { - font-scale = 1.4; - use-system-font = false; - custom-font = "ComicShannsMono Nerd Font 10"; - }; - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - cursor-theme = "Adwaita"; - enable-hot-corners = false; - font-name = "Adwaita Sans 11"; - gtk-theme = "adw-gtk3-dark"; - icon-theme = "MoreWaita"; - monospace-font-name = "Adwaita Mono 11"; - toolbar-style = "both-horiz"; - }; - "org/gnome/desktop/peripherals/touchpad" = { - tap-to-click = true; - }; - "org/gnome/desktop/sound" = { - theme-name = "freedesktop"; - }; - "org/gnome/desktop/search-providers" = { - disabled = [ "org.gnome.Epiphany.desktop" ]; - }; - "org/gnome/desktop/wm/keybindings" = { - switch-group = [ "grave" ]; - switch-group-backward = [ "grave" ]; - }; - "org/gnome/desktop/wm/preferences" = { - button-layout = "appmenu:close"; - }; - "org/gnome/gnome-session" = { - auto-save-session = true; - }; - "org/gnome/gnome-system-monitor" = { - show-dependencies = true; - }; - "org/gnome/mutter" = { - center-new-windows = true; - edge-tiling = true; - experimental-features = [ "scale-monitor-framebuffer" ]; - }; - "org/gnome/settings-daemon/plugins/media-keys" = { - volume-up = [ - "F12" - "XF86AudioRaiseVolume" - ]; - volume-down = [ - "F11" - "XF86AudioLowerVolume" - ]; - }; - "org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = [ - "appindicatorsupport@rgcjonas.gmail.com" - # "arcmenu@arcmenu.com" - "blur-my-shell@aunetx" - "burn-my-windows@schneegans.github.com" - "clipboard-indicator@tudmotu.com" - "CoverflowAltTab@palatis.blogspot.com" - # "dash-to-panel@jderose9.github.com" - # "desktop-cube@schneegans.github.com" - # "EasyScreenCast@iacopodeenosee.gmail.com" - "espresso@coadmunkee.github.com" - "flypie@schneegans.github.com" - # "forge@jmmaranan.com" - "gsconnect@andyholmes.github.io" - # "gSnap@micahosborne" - "hidetopbar@mathieu.bidon.ca" - "just-perfection-desktop@just-perfection" - # "mediacontrols@cliffniff.github.com" - # "mousefollowsfocus@matthes.biz" - # "pano@elhan.io" - # "paperwm@hedning:matrix.org" - "pip-on-top@rafostar.github.com" - # "search-light@icedman.github.com" - # "smart-auto-move@khimaros.com" - "space-bar@luchrioh" - # "tiling-assistant@leleat-on-github" - "tilingshell@ferrarodomenico.com" - "Vitals@CoreCoding.com" - "windowIsReady_Remover@nunofarruca@gmail.com" - # "worksets@blipk.xyz" - # "wsmatrix@martin.zurowietz.de" - ]; - favorite-apps = [ - "firefox.desktop" - "org.gnome.Nautilus.desktop" - ]; - }; - "org/gnome/shell/extensions/blur-my-shell/panel" = { - static-blur = true; - }; - "org/gnome/shell/extensions/blur-my-shell/applications" = { - blur = false; - }; - "org/gnome/shell/extensions/burn-my-windows" = { - fire-close-effect = false; - glide-open-effect = true; - glide-close-effect = true; - }; - "org/gnome/shell/extensions/dash-to-panel" = { - intellihide = true; - panel-positions = '' - {"0":"TOP"} - ''; - trans-panel-opacity = 0.3; - trans-use-custom-opacity = true; - trans-use-dynamic-opacity = true; - }; - "org/gnome/shell/extensions/espresso" = { - enable-fullscreen = true; - show-indicator = true; - show-notifications = false; - inhibit-apps = [ - "com.obsproject.Studio.desktop" - ]; - }; - "org/gnome/shell/extensions/flypie" = { - preview-on-right-side = true; - }; - "org/gnome/shell/extensions/forge" = { - window-gap-size = 8; - window-gap-hidden-on-single = false; - }; - "org/gnome/shell/extensions/hidetopbar" = { - mouse-sensitive = true; - mouse-sensitive-fullscreen-window = true; - enable-active-window = false; - }; - "org/gnome/shell/extensions/just-perfection" = { - activities-button = false; - window-demands-attention-focus = true; - workspace-wrap-around = true; - }; - "org/gnome/shell/extensions/paperwm" = { - use-default-background = true; - }; - "org/gnome/shell/extensions/pip-on-top" = { - stick = true; - }; - "org/gnome/shell/extensions/search-light" = { - popup-at-cursor-monitor = true; - }; - "org/gnome/shell/extensions/space-bar/behavior" = { - enable-activate-workspace-shortcuts = true; - show-empty-workspaces = true; - smart-workspace-names = false; - }; - "org/gnome/shell/extensions/tiling-assistant" = { - screen-top-gap = 8; - screen-right-gap = 8; - screen-bottom-gap = 8; - screen-left-gap = 8; - window-gap = 8; - }; - "org/gnome/shell/extensions/tilingshell" = { - inner-gaps = 16; - outer-gaps = 8; - enable-blur-snap-assistant = true; - }; - "org/gtk/settings/file-chooser" = { - show-hidden = true; - sort-directories-first = true; - }; - "org/gtk/gtk4/settings/file-chooser" = { - show-hidden = true; - sort-directories-first = true; - }; - }; - - home.sessionVariables = { - QT_STYLE_OVERRIDE = mkForce "kvantum"; - QT_WAYLAND_DECORATION = mkForce "adwaita"; - }; - - xdg.configFile = { - "Kvantum/kvantum.kvconfig".text = toINI { } { - General.theme = "KvLibadwaitaDark"; - }; - "Kvantum/KvLibadwaita".source = "${inputs.kvlibadwaita}/src/KvLibadwaita"; - }; - - home.packages = - with pkgs; - [ - authenticator - # bottles - # bustle - celluloid - # d-spy - # drawing - # fragments - dconf-editor - ghex - ghostty - # gnome-builder - gnome-decoder - gnome-firmware - gnome-frog - # gnome-obfuscate - gnome-podcasts - identity - # mission-center - mousam - newsflash - # schemes - shortwave - sysprof - ] - ++ ( - if osConfig.virtualisation.podman.enable then - [ - pods - ] - else - [ ] - ); - - services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3; -}