From 01f6fbd9d514c2f099a8bd95af0c04837bea13b4 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Thu, 28 Mar 2024 07:51:33 +0300 Subject: [PATCH] Desktop : Split to modules. --- flake.nix | 4 - module/Gnome.nix | 355 +----------------- module/Sway.nix | 20 +- module/{Desktop.nix => desktop/App.nix} | 0 module/desktop/Dconf.nix | 328 ++++++++++++++++ module/desktop/DisplayManager.nix | 9 + module/desktop/Sound.nix | 11 + module/{ => desktop}/mangohud/MangoHud.conf | 0 .../{ => desktop}/mangohud/MangoPresets.conf | 0 9 files changed, 361 insertions(+), 366 deletions(-) rename module/{Desktop.nix => desktop/App.nix} (100%) create mode 100644 module/desktop/Dconf.nix create mode 100644 module/desktop/DisplayManager.nix create mode 100644 module/desktop/Sound.nix rename module/{ => desktop}/mangohud/MangoHud.conf (100%) rename module/{ => desktop}/mangohud/MangoPresets.conf (100%) diff --git a/flake.nix b/flake.nix index 50ae786..8fbf684 100644 --- a/flake.nix +++ b/flake.nix @@ -158,7 +158,6 @@ system = "x86_64-linux"; modules = [ ./module/AmdGpu.nix - ./module/Desktop.nix ./module/Gnome.nix ./module/IntelCpu.nix ./module/PowersaveIntel.nix @@ -175,7 +174,6 @@ ./module/AmdCompute.nix ./module/AmdCpu.nix ./module/AmdGpu.nix - ./module/Desktop.nix ./module/Gnome.nix ./module/Ollama.nix ./module/PowersaveAmd.nix @@ -214,7 +212,6 @@ modules = [ ./module/AmdCpu.nix ./module/AmdGpu.nix - ./module/Desktop.nix ./module/Gnome.nix ./module/Ollama.nix ./module/PowersaveAmd.nix @@ -243,7 +240,6 @@ hostname = "work"; system = "x86_64-linux"; modules = [ - ./module/Desktop.nix ./module/IntelCpu.nix ./module/Ollama.nix ./module/Powerlimit.nix diff --git a/module/Gnome.nix b/module/Gnome.nix index 2931b9a..e9cb549 100644 --- a/module/Gnome.nix +++ b/module/Gnome.nix @@ -1,14 +1,12 @@ { pkgs, lib, ... }: { - # GUI. - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.xkb = { - layout = "us,ru"; - options = "grp:caps_toggle,lv3:ralt_switch"; - }; + imports = [ + ./desktop/App.nix + ./desktop/Dconf.nix + ./desktop/DisplayManager.nix + ./desktop/Sound.nix + ]; - # Specify default apps. + # Default apps. xdg.mime.defaultApplications = { # Use `file -i file.txt` to find file mime type. # Use `xdg-mime query default "text/plain"` to find default app. @@ -60,343 +58,4 @@ # gnome-disk-utility # pkgs.gnome-text-editor ]; - - # Sound. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Enable dconf. - programs.dconf.enable = true; - programs.dconf.profiles.user = { - enableUserDb = true; # Delete `~/.config/dconf/user` to reset user settings. - databases = [{ - settings = with lib.gvariant; { - "org/gnome/desktop/a11y" = { - always-show-universal-access-status = true; - }; - - "org/gnome/desktop/background" = { - color-shading-type = "solid"; - picture-options = "none"; - primary-color = "#000000000000"; - secondary-color = "#000000000000"; - }; - - "org/gnome/desktop/input-sources" = { - current = mkUint32 0; - mru-sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; - per-window = false; - show-all-sources = true; - sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; - xkb-options = [ "grp:caps_toggle" "lv3:ralt_switch" ]; - }; - - "org/gnome/desktop/interface" = { - clock-show-date = true; - clock-show-weekday = true; - color-scheme = "prefer-dark"; - cursor-blink = false; - cursor-size = "24"; - cursor-theme = "Adwaita"; - document-font-name = "SF Pro Text 11"; - enable-animations = false; - enable-hot-corners = false; - font-antialiasing = "rgba"; - font-hinting = "full"; - font-name = "SF Pro Display 10"; - gtk-enable-primary-paste = false; - gtk-theme = "Adwaita"; - icon-theme = "Adwaita"; - monospace-font-name = "Terminess Nerd Font Mono Medium 12"; - show-battery-percentage = false; - toolbar-style = "text"; - toolkit-accessibility = false; - }; - - "org/gnome/desktop/media-handling" = { - automount = false; - automount-open = false; - autorun-never = true; - }; - - "org/gnome/desktop/peripherals/mouse" = { - accel-profile = "flat"; - natural-scroll = true; - speed = "0.0"; - }; - - "org/gnome/desktop/peripherals/touchpad" = { - tap-to-click = true; - two-finger-scrolling-enabled = true; - }; - - "org/gnome/desktop/privacy" = { - disable-camera = false; - disable-microphone = false; - old-files-age = mkUint32 30; - recent-files-max-age = mkUint32 30; - remove-old-temp-files = true; - remove-old-trash-files = true; - report-technical-problems = true; - }; - - "org/gnome/desktop/remote-desktop/rdp" = { - enable = false; - tls-cert = "/home/voronind/.local/share/gnome-remote-desktop/tls.crt"; - tls-key = "/home/voronind/.local/share/gnome-remote-desktop/tls.key"; - view-only = true; - }; - - "org/gnome/desktop/screensaver" = { - color-shading-type = "solid"; - idle-activation-enabled = false; - lock-delay = mkUint32 0; - picture-options = "zoom"; - picture-uri = "file:///etc/wallpaper/Forest.jpg"; - primary-color = "#000000000000"; - secondary-color = "#000000000000"; - }; - - "org/gnome/desktop/sound" = { - allow-volume-above-100-percent = false; - event-sounds = false; - theme-name = "freedesktop"; - }; - - "org/gnome/desktop/wm/keybindings" = { - activate-window-menu = [ "" ]; - begin-move = [ "" ]; - begin-resize = [ "r" ]; - close = [ "x" ]; - cycle-group = [ "" ]; - cycle-group-backward = [ "" ]; - cycle-panels = [ "" ]; - cycle-panels-backward = [ "" ]; - cycle-windows = [ "" ]; - cycle-windows-backward = [ "" ]; - maximize = [ "" ]; - maximize-horizontally = [ "" ]; - minimize = [ "s" ]; - move-to-monitor-down = [ "" ]; - move-to-monitor-left = [ "" ]; - move-to-monitor-right = [ "" ]; - move-to-monitor-up = [ "" ]; - move-to-workspace-1 = [ "" ]; - move-to-workspace-2 = [ "" ]; - move-to-workspace-3 = [ "" ]; - move-to-workspace-4 = [ "" ]; - move-to-workspace-last = [ "" ]; - move-to-workspace-left = [ "q" ]; - move-to-workspace-right = [ "e" ]; - panel-run-dialog = [ "space" ]; - show-desktop = [ "c" ]; - switch-applications = [ "Tab" ]; - switch-applications-backward = [ "Tab" ]; - switch-group = [ "Tab" ]; - switch-group-backward = [ "Tab" ]; - switch-input-source = [ "" ]; - switch-input-source-backward = [ "" ]; - switch-panels = [ "" ]; - switch-panels-backward = [ "" ]; - switch-to-workspace-1 = [ "" ]; - switch-to-workspace-2 = [ "" ]; - switch-to-workspace-3 = [ "" ]; - switch-to-workspace-4 = [ "" ]; - switch-to-workspace-last = [ "" ]; - switch-to-workspace-left = [ "q" ]; - switch-to-workspace-right = [ "e" ]; - switch-windows = [ "" ]; - switch-windows-backward = [ "" ]; - toggle-fullscreen = [ "f" ]; - toggle-maximized = [ "w" ]; - unmaximize = [ "" ]; - }; - - "org/gnome/desktop/wm/preferences" = { - action-middle-click-titlebar = "minimize"; - action-right-click-titlebar = "menu"; - focus-mode = "click"; # `click` or `sloppy`. - button-layout = "appmenu:close"; - titlebar-font = "SF Pro Display 11"; - }; - - "org/gnome/desktop/session" = { - idle-delay = mkUint32 0; - }; - - "org/gnome/mutter" = { - attach-modal-dialogs = true; - center-new-windows = true; - dynamic-workspaces = true; - edge-tiling = true; - workspaces-only-on-primary = true; - }; - - "org/gnome/mutter/keybindings" = { - toggle-tiled-left = [ "a" ]; - toggle-tiled-right = [ "d" ]; - }; - - "org/gnome/mutter/wayland/keybindings" = { - restore-shortcuts = [ "" ]; - }; - - "org/gnome/nautilus/icon-view" = { - default-zoom-level = "larger"; - }; - - "org/gnome/nautilus/list-view" = { - default-zoom-level = "small"; - use-tree-view = false; - }; - - "org/gnome/nautilus/preferences" = { - click-policy = "single"; - default-folder-viewer = "list-view"; - default-sort-in-reverse-order = false; - default-sort-order = "name"; - migrated-gtk-settings = true; - search-filter-time-type = "last_modified"; - search-view = "list-view"; - show-image-thumbnails = "local-only"; - }; - - "org/gnome/settings-daemon/plugins/color" = { - night-light-enabled = false; - night-light-schedule-automatic = false; - night-light-schedule-from = "0.0"; - night-light-schedule-to = "0.0"; - night-light-temperature = mkUint32 3700; - }; - - "org/gnome/settings-daemon/plugins/media-keys" = { - custom-keybindings = [ - "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" - "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/" - "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/" - ]; - magnifier = [ "" ]; - magnifier-zoom-in = [ "" ]; - magnifier-zoom-out = [ "" ]; - screenreader = [ "" ]; - screensaver = [ "z" ]; - }; - - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { - binding = "Escape"; - command = "kgx -e bash -c 'tmux new-session -A -s main; bash'"; - name = "gnome-terminal"; - }; - - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = { - binding = "z"; - command = "gnome-session-quit --power-off"; - name = "gnome-poweroff"; - }; - - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = { - binding = "Escape"; - command = "kgx -- btop"; - name = "System Monitor"; - }; - - "org/gnome/settings-daemon/plugins/power" = { - ambient-enabled = false; - idle-dim = false; - power-button-action = "nothing"; - sleep-inactive-ac-timeout = "0"; - sleep-inactive-ac-type = "nothing"; - sleep-inactive-battery-type = "nothing"; - }; - - "org/gnome/shell" = { - disable-extension-version-validation = true; - disable-user-extensions = false; - favorite-apps = [ "" ]; - had-bluetooth-devices-setup = true; - last-selected-power-profile = "power-saver"; - remember-mount-password = false; - }; - - "org/gnome/shell/app-switcher" = { - current-workspace-only = true; - }; - - "org/gnome/shell/keybindings" = { - focus-active-notification = [ "" ]; - open-application-menu = [ "" ]; - show-screenshot-ui = [ "v" ]; - 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 = [ "" ]; - toggle-application-view = [ "" ]; - toggle-message-tray = [ "" ]; - toggle-overview = [ "" ]; - toggle-quick-settings = [ "" ]; - }; - - "org/gnome/shell/overrides" = { - edge-tiling = false; - }; - - "org/gnome/software" = { - download-updates = false; - download-updates-notify = false; - first-run = false; - show-nonfree-prompt = false; - }; - - "org/gnome/system/location" = { - enabled = false; - }; - - "org/gtk/gtk4/settings/file-chooser" = { - date-format = "regular"; - location-mode = "path-bar"; - show-hidden = false; - show-size-column = true; - show-type-column = true; - sidebar-width = "166"; - sort-column = "modified"; - sort-directories-first = true; - sort-order = "descending"; - type-format = "category"; - view-type = "list"; - }; - - "org/gtk/settings/file-chooser" = { - date-format = "regular"; - location-mode = "path-bar"; - show-hidden = false; - show-size-column = true; - show-type-column = true; - sort-column = "modified"; - sort-directories-first = true; - sort-order = "descending"; - type-format = "category"; - }; - - "system/locale" = { - region = "ru_RU.UTF-8"; - }; - - "system/proxy" = { - mode = "none"; - }; - }; - }]; - }; } diff --git a/module/Sway.nix b/module/Sway.nix index e576528..ecbf0dd 100644 --- a/module/Sway.nix +++ b/module/Sway.nix @@ -1,5 +1,10 @@ { pkgs, lib, ... }: { - # Specify default apps. + imports = [ + ./desktop/App.nix + ./desktop/Dconf.nix + ./desktop/Sound.nix + ]; + xdg.mime.defaultApplications = { # Use `file -i file.txt` to find file mime type. # Use `xdg-mime query default "text/plain"` to find default app. @@ -56,17 +61,4 @@ security.pam.loginLimits = [ { domain = "@users"; item = "rtprio"; type = "-"; value = 1; } ]; - - # Dconf. -# programs.dconf.enable = true; -# programs.dconf.profiles.user = { -# enableUserDb = true; # Delete `~/.config/dconf/user` to reset user settings. -# databases = [{ -# settings = with lib.gvariant; { -# "org/gnome/desktop/a11y" = { -# always-show-universal-access-status = true; -# }; -# }; -# }]; -# }; } diff --git a/module/Desktop.nix b/module/desktop/App.nix similarity index 100% rename from module/Desktop.nix rename to module/desktop/App.nix diff --git a/module/desktop/Dconf.nix b/module/desktop/Dconf.nix new file mode 100644 index 0000000..4108a47 --- /dev/null +++ b/module/desktop/Dconf.nix @@ -0,0 +1,328 @@ +{ lib, ... }: { + programs.dconf.enable = true; + programs.dconf.profiles.user = { + enableUserDb = true; # Delete `~/.config/dconf/user` to reset user settings. + databases = [{ + settings = with lib.gvariant; { + "org/gnome/desktop/a11y" = { + always-show-universal-access-status = true; + }; + + "org/gnome/desktop/background" = { + color-shading-type = "solid"; + picture-options = "none"; + primary-color = "#000000000000"; + secondary-color = "#000000000000"; + }; + + "org/gnome/desktop/input-sources" = { + current = mkUint32 0; + mru-sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; + per-window = false; + show-all-sources = true; + sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; + xkb-options = [ "grp:caps_toggle" "lv3:ralt_switch" ]; + }; + + "org/gnome/desktop/interface" = { + clock-show-date = true; + clock-show-weekday = true; + color-scheme = "prefer-dark"; + cursor-blink = false; + cursor-size = "24"; + cursor-theme = "Adwaita"; + document-font-name = "SF Pro Text 11"; + enable-animations = false; + enable-hot-corners = false; + font-antialiasing = "rgba"; + font-hinting = "full"; + font-name = "SF Pro Display 10"; + gtk-enable-primary-paste = false; + gtk-theme = "Adwaita"; + icon-theme = "Adwaita"; + monospace-font-name = "Terminess Nerd Font Mono Medium 12"; + show-battery-percentage = false; + toolbar-style = "text"; + toolkit-accessibility = false; + }; + + "org/gnome/desktop/media-handling" = { + automount = false; + automount-open = false; + autorun-never = true; + }; + + "org/gnome/desktop/peripherals/mouse" = { + accel-profile = "flat"; + natural-scroll = true; + speed = "0.0"; + }; + + "org/gnome/desktop/peripherals/touchpad" = { + tap-to-click = true; + two-finger-scrolling-enabled = true; + }; + + "org/gnome/desktop/privacy" = { + disable-camera = false; + disable-microphone = false; + old-files-age = mkUint32 30; + recent-files-max-age = mkUint32 30; + remove-old-temp-files = true; + remove-old-trash-files = true; + report-technical-problems = true; + }; + + "org/gnome/desktop/remote-desktop/rdp" = { + enable = false; + tls-cert = "/home/voronind/.local/share/gnome-remote-desktop/tls.crt"; + tls-key = "/home/voronind/.local/share/gnome-remote-desktop/tls.key"; + view-only = true; + }; + + "org/gnome/desktop/screensaver" = { + color-shading-type = "solid"; + idle-activation-enabled = false; + lock-delay = mkUint32 0; + picture-options = "zoom"; + picture-uri = "file:///etc/wallpaper/Forest.jpg"; + primary-color = "#000000000000"; + secondary-color = "#000000000000"; + }; + + "org/gnome/desktop/sound" = { + allow-volume-above-100-percent = false; + event-sounds = false; + theme-name = "freedesktop"; + }; + + "org/gnome/desktop/wm/keybindings" = { + activate-window-menu = [ "" ]; + begin-move = [ "" ]; + begin-resize = [ "r" ]; + close = [ "x" ]; + cycle-group = [ "" ]; + cycle-group-backward = [ "" ]; + cycle-panels = [ "" ]; + cycle-panels-backward = [ "" ]; + cycle-windows = [ "" ]; + cycle-windows-backward = [ "" ]; + maximize = [ "" ]; + maximize-horizontally = [ "" ]; + minimize = [ "s" ]; + move-to-monitor-down = [ "" ]; + move-to-monitor-left = [ "" ]; + move-to-monitor-right = [ "" ]; + move-to-monitor-up = [ "" ]; + move-to-workspace-1 = [ "" ]; + move-to-workspace-2 = [ "" ]; + move-to-workspace-3 = [ "" ]; + move-to-workspace-4 = [ "" ]; + move-to-workspace-last = [ "" ]; + move-to-workspace-left = [ "q" ]; + move-to-workspace-right = [ "e" ]; + panel-run-dialog = [ "space" ]; + show-desktop = [ "c" ]; + switch-applications = [ "Tab" ]; + switch-applications-backward = [ "Tab" ]; + switch-group = [ "Tab" ]; + switch-group-backward = [ "Tab" ]; + switch-input-source = [ "" ]; + switch-input-source-backward = [ "" ]; + switch-panels = [ "" ]; + switch-panels-backward = [ "" ]; + switch-to-workspace-1 = [ "" ]; + switch-to-workspace-2 = [ "" ]; + switch-to-workspace-3 = [ "" ]; + switch-to-workspace-4 = [ "" ]; + switch-to-workspace-last = [ "" ]; + switch-to-workspace-left = [ "q" ]; + switch-to-workspace-right = [ "e" ]; + switch-windows = [ "" ]; + switch-windows-backward = [ "" ]; + toggle-fullscreen = [ "f" ]; + toggle-maximized = [ "w" ]; + unmaximize = [ "" ]; + }; + + "org/gnome/desktop/wm/preferences" = { + action-middle-click-titlebar = "minimize"; + action-right-click-titlebar = "menu"; + focus-mode = "click"; # `click` or `sloppy`. + button-layout = "appmenu:close"; + titlebar-font = "SF Pro Display 11"; + }; + + "org/gnome/desktop/session" = { + idle-delay = mkUint32 0; + }; + + "org/gnome/mutter" = { + attach-modal-dialogs = true; + center-new-windows = true; + dynamic-workspaces = true; + edge-tiling = true; + workspaces-only-on-primary = true; + }; + + "org/gnome/mutter/keybindings" = { + toggle-tiled-left = [ "a" ]; + toggle-tiled-right = [ "d" ]; + }; + + "org/gnome/mutter/wayland/keybindings" = { + restore-shortcuts = [ "" ]; + }; + + "org/gnome/nautilus/icon-view" = { + default-zoom-level = "larger"; + }; + + "org/gnome/nautilus/list-view" = { + default-zoom-level = "small"; + use-tree-view = false; + }; + + "org/gnome/nautilus/preferences" = { + click-policy = "single"; + default-folder-viewer = "list-view"; + default-sort-in-reverse-order = false; + default-sort-order = "name"; + migrated-gtk-settings = true; + search-filter-time-type = "last_modified"; + search-view = "list-view"; + show-image-thumbnails = "local-only"; + }; + + "org/gnome/settings-daemon/plugins/color" = { + night-light-enabled = false; + night-light-schedule-automatic = false; + night-light-schedule-from = "0.0"; + night-light-schedule-to = "0.0"; + night-light-temperature = mkUint32 3700; + }; + + "org/gnome/settings-daemon/plugins/media-keys" = { + custom-keybindings = [ + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/" + ]; + magnifier = [ "" ]; + magnifier-zoom-in = [ "" ]; + magnifier-zoom-out = [ "" ]; + screenreader = [ "" ]; + screensaver = [ "z" ]; + }; + + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + binding = "Escape"; + command = "kgx -e bash -c 'tmux new-session -A -s main; bash'"; + name = "gnome-terminal"; + }; + + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = { + binding = "z"; + command = "gnome-session-quit --power-off"; + name = "gnome-poweroff"; + }; + + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = { + binding = "Escape"; + command = "kgx -- btop"; + name = "System Monitor"; + }; + + "org/gnome/settings-daemon/plugins/power" = { + ambient-enabled = false; + idle-dim = false; + power-button-action = "nothing"; + sleep-inactive-ac-timeout = "0"; + sleep-inactive-ac-type = "nothing"; + sleep-inactive-battery-type = "nothing"; + }; + + "org/gnome/shell" = { + disable-extension-version-validation = true; + disable-user-extensions = false; + favorite-apps = [ "" ]; + had-bluetooth-devices-setup = true; + last-selected-power-profile = "power-saver"; + remember-mount-password = false; + }; + + "org/gnome/shell/app-switcher" = { + current-workspace-only = true; + }; + + "org/gnome/shell/keybindings" = { + focus-active-notification = [ "" ]; + open-application-menu = [ "" ]; + show-screenshot-ui = [ "v" ]; + 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 = [ "" ]; + toggle-application-view = [ "" ]; + toggle-message-tray = [ "" ]; + toggle-overview = [ "" ]; + toggle-quick-settings = [ "" ]; + }; + + "org/gnome/shell/overrides" = { + edge-tiling = false; + }; + + "org/gnome/software" = { + download-updates = false; + download-updates-notify = false; + first-run = false; + show-nonfree-prompt = false; + }; + + "org/gnome/system/location" = { + enabled = false; + }; + + "org/gtk/gtk4/settings/file-chooser" = { + date-format = "regular"; + location-mode = "path-bar"; + show-hidden = false; + show-size-column = true; + show-type-column = true; + sidebar-width = "166"; + sort-column = "modified"; + sort-directories-first = true; + sort-order = "descending"; + type-format = "category"; + view-type = "list"; + }; + + "org/gtk/settings/file-chooser" = { + date-format = "regular"; + location-mode = "path-bar"; + show-hidden = false; + show-size-column = true; + show-type-column = true; + sort-column = "modified"; + sort-directories-first = true; + sort-order = "descending"; + type-format = "category"; + }; + + "system/locale" = { + region = "ru_RU.UTF-8"; + }; + + "system/proxy" = { + mode = "none"; + }; + }; + }]; + }; +} diff --git a/module/desktop/DisplayManager.nix b/module/desktop/DisplayManager.nix new file mode 100644 index 0000000..8759508 --- /dev/null +++ b/module/desktop/DisplayManager.nix @@ -0,0 +1,9 @@ +{ ... }: { + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.xkb = { + layout = "us,ru"; + options = "grp:caps_toggle,lv3:ralt_switch"; + }; +} diff --git a/module/desktop/Sound.nix b/module/desktop/Sound.nix new file mode 100644 index 0000000..4727883 --- /dev/null +++ b/module/desktop/Sound.nix @@ -0,0 +1,11 @@ +{ ... }: { + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; +} diff --git a/module/mangohud/MangoHud.conf b/module/desktop/mangohud/MangoHud.conf similarity index 100% rename from module/mangohud/MangoHud.conf rename to module/desktop/mangohud/MangoHud.conf diff --git a/module/mangohud/MangoPresets.conf b/module/desktop/mangohud/MangoPresets.conf similarity index 100% rename from module/mangohud/MangoPresets.conf rename to module/desktop/mangohud/MangoPresets.conf