From d52099bbb9a2aa25b0268886450270c8fa3cb9cd Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Sat, 2 Nov 2024 06:20:18 +0100 Subject: [PATCH] adds various game fixes gnome extensions adds various configs for extensions fixes proper gtk theme --- config/home-manager/dconf.nix | 38 ++++++++- config/home-manager/gnome-extensions.nix | 100 ++++++++++++++++++++--- config/home-manager/home.nix | 9 -- config/home-manager/packages.nix | 14 ++++ vscode/settings.json | 4 +- 5 files changed, 139 insertions(+), 26 deletions(-) diff --git a/config/home-manager/dconf.nix b/config/home-manager/dconf.nix index 4918e09..3b9a1a8 100644 --- a/config/home-manager/dconf.nix +++ b/config/home-manager/dconf.nix @@ -1,12 +1,42 @@ { config, pkgs, ... }: { + # GTK Theme + gtk = { + enable = true; + + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + + theme = { + name = "Yaru-purple-dark"; + package = pkgs.yaru-theme; + }; + + cursorTheme = { + name = "Numix-Cursor"; + package = pkgs.numix-cursor-theme; + }; + + gtk3.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme=1 + ''; + }; + + gtk4.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme=1 + ''; + }; + }; + dconf = { enable = true; settings = { - # Dark theme "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; - gtk-theme = "Adwaita-dark"; }; # Pinned apps @@ -25,8 +55,8 @@ # Set wallpaper "org/gnome/desktop/background" = { - picture-uri-dark = "file:///${config.home.homeDirectory}/dotfiles/secrets/wp/9.jpg"; - picture-uri = "file:///${config.home.homeDirectory}/dotfiles/secrets/wp/9.jpg"; + picture-uri-dark = "file:///${config.home.homeDirectory}/dotfiles/secrets/wp/9.png"; + picture-uri = "file:///${config.home.homeDirectory}/dotfiles/secrets/wp/9.png"; picture-options = "zoom"; primary-color = "#000000"; }; diff --git a/config/home-manager/gnome-extensions.nix b/config/home-manager/gnome-extensions.nix index a6560e4..b05fb11 100644 --- a/config/home-manager/gnome-extensions.nix +++ b/config/home-manager/gnome-extensions.nix @@ -1,23 +1,23 @@ { config, pkgs, ... }: { home.packages = with pkgs.gnomeExtensions; [ - # lilypad@shendrew.github.io - # tailscale@joaophi.github.com - forge + tailscale-qs gsconnect blur-my-shell - rounded-window-corners weather-oclock space-bar - show-desktop-button gtk4-desktop-icons-ng-ding logo-menu media-controls burn-my-windows coverflow-alt-tab dash-to-dock - hide-top-bar appindicator + user-themes + autohide-battery + battery-health-charging + just-perfection + pano ]; # Copy burn-my-windows profile to user config @@ -34,28 +34,39 @@ "org/gnome/shell" = { disable-user-extensions = false; enabled-extensions = [ - # "tilingshell@ferrarodomenico.com" - "forge@jmmaranan.com" + "tilingshell@ferrarodomenico.com" "gsconnect@andyholmes.github.io" "blur-my-shell@aunetx" "tailscale@joaophi.github.com" "easy_docker_containers@red.software.systems" "weatheroclock@CleoMenezesJr.github.io" "space-bar@luchrioh" - "show-desktop-button@amivaleo" "gtk4-ding@smedius.gitlab.com" "logomenu@aryan_k" "mediacontrols@cliffniff.github.com" "burn-my-windows@schneegans.github.com" "CoverflowAltTab@palatis.blogspot.com" "dash-to-dock@micxgx.gmail.com" - "hidetopbar@mathieu.bidon.ca" "gnome-shell-extension-appindicator" - "lilypad@shendrew.github.io" "appindicatorsupport@rgcjonas.gmail.com" + "user-theme@gnome-shell-extensions.gcampax.github.com" + "autohide-battery@sitnik.ru" + "just-perfection-desktop@just-perfection" ]; }; + # Perfection settings + "org/gnome/shell/extensions/just-perfection" = { + theme = false; + notification-banner-position = 2; + startup-status = 0; + }; + + # Autohide battery + "org/gnome/shell/extensions/autohide-battery" = { + hide-on = 95; + }; + # Configure dash-to-dock "org/gnome/shell/extensions/dash-to-dock" = { apply-custom-theme = false; @@ -122,6 +133,68 @@ noise-amount = 0; }; + # Configure tiling shell + "org/gnome/shell/extensions/tilingshell" = { + layouts-json = '' + [ + { + "id": "Layout 1", + "tiles": [ + { "x": 0, "y": 0, "width": 0.22, "height": 0.5, "groups": [1, 2] }, + { "x": 0, "y": 0.5, "width": 0.22, "height": 0.5, "groups": [1, 2] }, + { "x": 0.22, "y": 0, "width": 0.56, "height": 1, "groups": [2, 3] }, + { "x": 0.78, "y": 0, "width": 0.22, "height": 0.5, "groups": [3, 4] }, + { "x": 0.78, "y": 0.5, "width": 0.22, "height": 0.5, "groups": [3, 4] } + ] + }, + { + "id": "Layout 2", + "tiles": [ + { "x": 0, "y": 0, "width": 0.22, "height": 1, "groups": [1] }, + { "x": 0.22, "y": 0, "width": 0.56, "height": 1, "groups": [1, 2] }, + { "x": 0.78, "y": 0, "width": 0.22, "height": 1, "groups": [2] } + ] + }, + { + "id": "Layout 3", + "tiles": [ + { "x": 0, "y": 0, "width": 0.33, "height": 1, "groups": [1] }, + { "x": 0.33, "y": 0, "width": 0.67, "height": 1, "groups": [1] } + ] + }, + { + "id": "Layout 4", + "tiles": [ + { "x": 0, "y": 0, "width": 0.67, "height": 1, "groups": [1] }, + { "x": 0.67, "y": 0, "width": 0.33, "height": 1, "groups": [1] } + ] + }, + { + "id": "Portrait Layout", + "tiles": [ + { "x": 0, "y": 0, "width": 1, "height": 0.25, "groups": [1] }, + { "x": 0, "y": 0.25, "width": 1, "height": 0.5, "groups": [1, 2] }, + { + "x": 0, + "y": 0.75, + "width": 0.50, + "height": 0.25, + "groups": [2, 3] + }, + { + "x": 0.50, + "y": 0.75, + "width": 0.50, + "height": 0.25, + "groups": [2, 3] + } + ] + } + ] + ''; + overridden-settings = "{\"org.gnome.mutter.keybindings\":{\"toggle-tiled-right\":\"['Right']\",\"toggle-tiled-left\":\"['Left']\"},\"org.gnome.desktop.wm.keybindings\":{\"maximize\":\"['Up']\",\"unmaximize\":\"['Down', 'F5']\"},\"org.gnome.mutter\":{\"edge-tiling\":\"false\"}}"; + }; + # Configure forge "org/gnome/shell/extensions/forge" = { move-pointer-focus-enabled = false; @@ -171,6 +244,11 @@ window-toggle-float = [ "c" ]; workspace-active-tile-toggle = [ "w" ]; }; + + # User theme + "org/gnome/shell/extensions/user-theme" = { + name = "Yaru-purple-dark"; + }; }; }; } diff --git a/config/home-manager/home.nix b/config/home-manager/home.nix index 5fde6ab..adea78c 100644 --- a/config/home-manager/home.nix +++ b/config/home-manager/home.nix @@ -19,15 +19,6 @@ home.homeDirectory = "/home/menno"; home.stateVersion = "24.05"; - # GTK Theme - gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome.gnome-themes-extra; - }; - }; - # Default applications xdg.mimeApps = { enable = true; diff --git a/config/home-manager/packages.nix b/config/home-manager/packages.nix index 64ea758..eb6c917 100644 --- a/config/home-manager/packages.nix +++ b/config/home-manager/packages.nix @@ -94,6 +94,7 @@ pinta bottles trayscale + spacedrive ## Chat Apps telegram-desktop @@ -111,6 +112,19 @@ stellarium ## Games + ### Open-source games openra + xonotic + mindustry + wesnoth + shattered-pixel-dungeon + + ### Games launchers + lutris + heroic + + ### Game utilities + protonup-qt + protontricks ]; } diff --git a/vscode/settings.json b/vscode/settings.json index 9eae5f6..1503fda 100755 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -9,15 +9,15 @@ "markdown": true, "scminput": false }, - "git.autofetch": true, "workbench.iconTheme": "vscode-icons", "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, + "editor.formatOnSave": true }, + "git.autofetch": false, "git.openRepositoryInParentFolders": "always", "makefile.configureOnOpen": false, "[dart]": {