refactor
This commit is contained in:
parent
66c05f9093
commit
45d6f4b0f3
205 changed files with 9040 additions and 342 deletions
333
modules/nixos/desktop/gnome/default.nix
Normal file
333
modules/nixos/desktop/gnome/default.nix
Normal file
|
|
@ -0,0 +1,333 @@
|
|||
{ options
|
||||
, config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
with lib;
|
||||
with lib.plusultra; let
|
||||
cfg = config.plusultra.desktop.gnome;
|
||||
gdmHome = config.users.users.gdm.home;
|
||||
|
||||
defaultExtensions = with pkgs.gnomeExtensions; [
|
||||
appindicator
|
||||
aylurs-widgets
|
||||
dash-to-dock
|
||||
emoji-selector
|
||||
gsconnect
|
||||
gtile
|
||||
just-perfection
|
||||
logo-menu
|
||||
no-overview
|
||||
remove-app-menu
|
||||
space-bar
|
||||
top-bar-organizer
|
||||
wireless-hid
|
||||
|
||||
# NOTE: These extensions are currently unsupported. They may also
|
||||
# no longer be required.
|
||||
|
||||
# audio-output-switcher
|
||||
# big-avatar
|
||||
# clear-top-bar
|
||||
];
|
||||
|
||||
default-attrs = mapAttrs (key: mkDefault);
|
||||
nested-default-attrs = mapAttrs (key: default-attrs);
|
||||
in
|
||||
{
|
||||
options.plusultra.desktop.gnome = with types; {
|
||||
enable =
|
||||
mkBoolOpt false "Whether or not to use Gnome as the desktop environment.";
|
||||
wallpaper = {
|
||||
light = mkOpt (oneOf [ str package ]) pkgs.plusultra.wallpapers.nord-rainbow-light-nix "The light wallpaper to use.";
|
||||
dark = mkOpt (oneOf [ str package ]) pkgs.plusultra.wallpapers.nord-rainbow-dark-nix "The dark wallpaper to use.";
|
||||
};
|
||||
color-scheme = mkOpt (enum [ "light" "dark" ]) "dark" "The color scheme to use.";
|
||||
wayland = mkBoolOpt true "Whether or not to use Wayland.";
|
||||
suspend =
|
||||
mkBoolOpt true "Whether or not to suspend the machine after inactivity.";
|
||||
monitors = mkOpt (nullOr path) null "The monitors.xml file to create.";
|
||||
extensions = mkOpt (listOf package) [ ] "Extra Gnome extensions to install.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
plusultra.system.xkb.enable = true;
|
||||
plusultra.desktop.addons = {
|
||||
gtk = enabled;
|
||||
wallpapers = enabled;
|
||||
electron-support = enabled;
|
||||
foot = enabled;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
(hiPrio plusultra.xdg-open-with-portal)
|
||||
wl-clipboard
|
||||
gnome.gnome-tweaks
|
||||
gnome.nautilus-python
|
||||
]
|
||||
++ defaultExtensions
|
||||
++ cfg.extensions;
|
||||
|
||||
environment.gnome.excludePackages = with pkgs.gnome; [
|
||||
pkgs.gnome-tour
|
||||
epiphany
|
||||
geary
|
||||
gnome-font-viewer
|
||||
gnome-system-monitor
|
||||
gnome-maps
|
||||
];
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
[
|
||||
"d ${gdmHome}/.config 0711 gdm gdm"
|
||||
]
|
||||
++ (
|
||||
# "./monitors.xml" comes from ~/.config/monitors.xml when GNOME
|
||||
# display information is updated.
|
||||
lib.optional (cfg.monitors != null) "L+ ${gdmHome}/.config/monitors.xml - - - - ${cfg.monitors}"
|
||||
);
|
||||
|
||||
systemd.services.plusultra-user-icon = {
|
||||
before = [ "display-manager.service" ];
|
||||
wantedBy = [ "display-manager.service" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "root";
|
||||
Group = "root";
|
||||
};
|
||||
|
||||
script = ''
|
||||
config_file=/var/lib/AccountsService/users/${config.plusultra.user.name}
|
||||
icon_file=/run/current-system/sw/share/plusultra-icons/user/${config.plusultra.user.name}/${config.plusultra.user.icon.fileName}
|
||||
|
||||
if ! [ -d "$(dirname "$config_file")"]; then
|
||||
mkdir -p "$(dirname "$config_file")"
|
||||
fi
|
||||
|
||||
if ! [ -f "$config_file" ]; then
|
||||
echo "[User]
|
||||
Session=gnome
|
||||
SystemAccount=false
|
||||
Icon=$icon_file" > "$config_file"
|
||||
else
|
||||
icon_config=$(sed -E -n -e "/Icon=.*/p" $config_file)
|
||||
|
||||
if [[ "$icon_config" == "" ]]; then
|
||||
echo "Icon=$icon_file" >> $config_file
|
||||
else
|
||||
sed -E -i -e "s#^Icon=.*$#Icon=$icon_file#" $config_file
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# Required for app indicators
|
||||
services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
|
||||
libinput.enable = true;
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
wayland = cfg.wayland;
|
||||
autoSuspend = cfg.suspend;
|
||||
};
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
|
||||
plusultra.home.extraOptions = {
|
||||
dconf.settings =
|
||||
let
|
||||
user = config.users.users.${config.plusultra.user.name};
|
||||
get-wallpaper = wallpaper:
|
||||
if lib.isDerivation wallpaper
|
||||
then builtins.toString wallpaper
|
||||
else wallpaper;
|
||||
in
|
||||
nested-default-attrs {
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions =
|
||||
(builtins.map (extension: extension.extensionUuid) (cfg.extensions ++ defaultExtensions))
|
||||
++ [
|
||||
"native-window-placement@gnome-shell-extensions.gcampax.github.com"
|
||||
"drive-menu@gnome-shell-extensions.gcampax.github.com"
|
||||
"user-theme@gnome-shell-extensions.gcampax.github.com"
|
||||
];
|
||||
favorite-apps =
|
||||
[ "org.gnome.Nautilus.desktop" ]
|
||||
++ optional config.plusultra.apps.firefox.enable "firefox.desktop"
|
||||
++ optional config.plusultra.apps.vscode.enable "code.desktop"
|
||||
++ optional config.plusultra.desktop.addons.foot.enable "foot.desktop"
|
||||
++ optional config.plusultra.apps.logseq.enable "logseq.desktop"
|
||||
++ optional config.plusultra.apps.discord.enable "discord.desktop"
|
||||
++ optional config.plusultra.apps.element.enable "element-desktop.desktop"
|
||||
++ optional config.plusultra.apps.steam.enable "steam.desktop";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-uri = get-wallpaper cfg.wallpaper.light;
|
||||
picture-uri-dark = get-wallpaper cfg.wallpaper.dark;
|
||||
};
|
||||
"org/gnome/desktop/screensaver" = {
|
||||
picture-uri = get-wallpaper cfg.wallpaper.light;
|
||||
picture-uri-dark = get-wallpaper cfg.wallpaper.dark;
|
||||
};
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme =
|
||||
if cfg.color-scheme == "light"
|
||||
then "default"
|
||||
else "prefer-dark";
|
||||
enable-hot-corners = false;
|
||||
};
|
||||
"org/gnome/desktop/peripherals/touchpad" = {
|
||||
disable-while-typing = false;
|
||||
};
|
||||
"org/gnome/desktop/wm/preferences" = {
|
||||
num-workspaces = 10;
|
||||
resize-with-right-button = true;
|
||||
};
|
||||
"org/gnome/desktop/wm/keybindings" = {
|
||||
switch-to-workspace-1 = [ "<Super>1" ];
|
||||
switch-to-workspace-2 = [ "<Super>2" ];
|
||||
switch-to-workspace-3 = [ "<Super>3" ];
|
||||
switch-to-workspace-4 = [ "<Super>4" ];
|
||||
switch-to-workspace-5 = [ "<Super>5" ];
|
||||
switch-to-workspace-6 = [ "<Super>6" ];
|
||||
switch-to-workspace-7 = [ "<Super>7" ];
|
||||
switch-to-workspace-8 = [ "<Super>8" ];
|
||||
switch-to-workspace-9 = [ "<Super>9" ];
|
||||
switch-to-workspace-10 = [ "<Super>0" ];
|
||||
|
||||
move-to-workspace-1 = [ "<Shift><Super>1" ];
|
||||
move-to-workspace-2 = [ "<Shift><Super>2" ];
|
||||
move-to-workspace-3 = [ "<Shift><Super>3" ];
|
||||
move-to-workspace-4 = [ "<Shift><Super>4" ];
|
||||
move-to-workspace-5 = [ "<Shift><Super>5" ];
|
||||
move-to-workspace-6 = [ "<Shift><Super>6" ];
|
||||
move-to-workspace-7 = [ "<Shift><Super>7" ];
|
||||
move-to-workspace-8 = [ "<Shift><Super>8" ];
|
||||
move-to-workspace-9 = [ "<Shift><Super>9" ];
|
||||
move-to-workspace-10 = [ "<Shift><Super>0" ];
|
||||
};
|
||||
"org/gnome/shell/keybindings" = {
|
||||
# Remove the default hotkeys for opening favorited applications.
|
||||
switch-to-application-1 = [ ];
|
||||
switch-to-application-2 = [ ];
|
||||
switch-to-application-3 = [ ];
|
||||
switch-to-application-4 = [ ];
|
||||
switch-to-application-5 = [ ];
|
||||
switch-to-application-6 = [ ];
|
||||
switch-to-application-7 = [ ];
|
||||
switch-to-application-8 = [ ];
|
||||
switch-to-application-9 = [ ];
|
||||
switch-to-application-10 = [ ];
|
||||
};
|
||||
"org/gnome/mutter" = {
|
||||
edge-tiling = false;
|
||||
dynamic-workspaces = false;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/dash-to-dock" = {
|
||||
autohide = true;
|
||||
dock-fixed = false;
|
||||
dock-position = "BOTTOM";
|
||||
pressure-threshold = 200.0;
|
||||
require-pressure-to-show = true;
|
||||
show-favorites = true;
|
||||
hot-keys = false;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/just-perfection" = {
|
||||
panel-size = 48;
|
||||
activities-button = false;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/Logo-menu" = {
|
||||
hide-softwarecentre = true;
|
||||
|
||||
# Use right click to open Activities.
|
||||
menu-button-icon-click-type = 3;
|
||||
|
||||
# Use the NixOS logo.
|
||||
menu-button-icon-image = 23;
|
||||
|
||||
menu-button-terminal =
|
||||
if config.plusultra.desktop.addons.term.enable
|
||||
then lib.getExe config.plusultra.desktop.addons.term.pkg
|
||||
else lib.getExe pkgs.gnome.gnome-terminal;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/aylurs-widgets" = {
|
||||
background-clock = false;
|
||||
battery-bar = false;
|
||||
dash-board = false;
|
||||
date-menu-date-format = "%H:%M %B %d";
|
||||
date-menu-hide-clocks = true;
|
||||
date-menu-hide-system-levels = true;
|
||||
date-menu-hide-user = true;
|
||||
|
||||
# Hide the indincator
|
||||
date-menu-indicator-position = 2;
|
||||
|
||||
media-player = false;
|
||||
media-player-prefer = "firefox";
|
||||
notification-indicator = false;
|
||||
power-menu = false;
|
||||
quick-toggles = false;
|
||||
workspace-indicator = false;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/top-bar-organizer" = {
|
||||
left-box-order = [
|
||||
"menuButton"
|
||||
"activities"
|
||||
"dateMenu"
|
||||
"appMenu"
|
||||
];
|
||||
|
||||
center-box-order = [
|
||||
"Space Bar"
|
||||
];
|
||||
|
||||
right-box-order = [
|
||||
"keyboard"
|
||||
"EmojisMenu"
|
||||
"wireless-hid"
|
||||
"drive-menu"
|
||||
"vitalsMenu"
|
||||
"screenRecording"
|
||||
"screenSharing"
|
||||
"dwellClick"
|
||||
"a11y"
|
||||
"quickSettings"
|
||||
];
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/space-bar/shortcuts" = {
|
||||
enable-activate-workspace-shortcuts = false;
|
||||
};
|
||||
"org/gnome/shell/extensions/space-bar/behavior" = {
|
||||
show-empty-workspaces = false;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/gtile" = {
|
||||
show-icon = false;
|
||||
grid-sizes = "8x2,4x2,2x2";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.kdeconnect = {
|
||||
enable = true;
|
||||
package = pkgs.gnomeExtensions.gsconnect;
|
||||
};
|
||||
|
||||
# Open firewall for samba connections to work.
|
||||
networking.firewall.extraCommands = "iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns";
|
||||
};
|
||||
}
|
||||
31
modules/nixos/desktop/gnome/monitors.xml
Normal file
31
modules/nixos/desktop/gnome/monitors.xml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
<monitors version="2">
|
||||
<configuration>
|
||||
<logicalmonitor>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<scale>1</scale>
|
||||
<primary>yes</primary>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-3</connector>
|
||||
<vendor>DEL</vendor>
|
||||
<product>Dell U4919DW</product>
|
||||
<serial>D3TXTY2</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>5120</width>
|
||||
<height>1440</height>
|
||||
<rate>59.976879119873047</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<disabled>
|
||||
<monitorspec>
|
||||
<connector>HDMI-2</connector>
|
||||
<vendor>AOC</vendor>
|
||||
<product>28E850</product>
|
||||
<serial>0x00000000</serial>
|
||||
</monitorspec>
|
||||
</disabled>
|
||||
</configuration>
|
||||
</monitors>
|
||||
Loading…
Add table
Add a link
Reference in a new issue