diff --git a/home/toph/common/optional/desktops/default.nix b/home/toph/common/optional/desktops/default.nix deleted file mode 100644 index 174d62c..0000000 --- a/home/toph/common/optional/desktops/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./gnome - # ./hyprland - ]; -} diff --git a/home/toph/common/optional/desktops/gnome/dconf.conf b/home/toph/common/optional/gnome/dconf.conf similarity index 98% rename from home/toph/common/optional/desktops/gnome/dconf.conf rename to home/toph/common/optional/gnome/dconf.conf index a1dd110..9c81e21 100644 --- a/home/toph/common/optional/desktops/gnome/dconf.conf +++ b/home/toph/common/optional/gnome/dconf.conf @@ -224,7 +224,7 @@ with lib.hm.gvariant; }; "org/gnome/desktop/notifications/application/zen-twilight" = { - application-id = "zen_twilight.desktop"; + application-id = "zen.desktop"; }; "org/gnome/desktop/peripherals/mouse" = { @@ -340,7 +340,7 @@ with lib.hm.gvariant; "org/gnome/shell" = { disable-user-extensions = false; enabled-extensions = [ "appindicatorsupport@rgcjonas.gmail.com" "blur-my-shell@aunetx" "clipboard-indicator@tudmotu.com" "color-picker@tuberry" "dash-to-panel@jderose9.github.com" "hibernate@dafne.rocks" "monitor-brightness-volume@ailin.nemui" "native-window-placement@gnome-shell-extensions.gcampax.github.com" "screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com" "tilingshell@ferrarodomenico.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "Vitals@CoreCoding.com" ]; - favorite-apps = [ "org.gnome.Nautilus.desktop" "org.wezfurlong.wezterm.desktop" "win11.desktop" "zen_twilight.desktop" "spotify.desktop" "vesktop.desktop" "org.telegram.desktop.desktop" "code.desktop" "fleet-jet.desktop" "steam.desktop" "Marvel Rivals.desktop" "org.prismlauncher.PrismLauncher.desktop" ]; + favorite-apps = [ "org.gnome.Nautilus.desktop" "org.wezfurlong.wezterm.desktop" "win11.desktop" "zen.desktop" "spotify.desktop" "vesktop.desktop" "org.telegram.desktop.desktop" "code.desktop" "fleet-jet.desktop" "steam.desktop" "Marvel Rivals.desktop" "org.prismlauncher.PrismLauncher.desktop" ]; last-selected-power-profile = "performance"; welcome-dialog-last-shown-version = "47.4"; }; diff --git a/home/toph/common/optional/desktops/gnome/default.nix b/home/toph/common/optional/gnome/default.nix similarity index 97% rename from home/toph/common/optional/desktops/gnome/default.nix rename to home/toph/common/optional/gnome/default.nix index be866df..eb5434d 100644 --- a/home/toph/common/optional/desktops/gnome/default.nix +++ b/home/toph/common/optional/gnome/default.nix @@ -205,12 +205,16 @@ "tilingshell@ferrarodomenico.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "Vitals@CoreCoding.com" + # pkgs.gnomeExtensions.just-perfection.extensionUuid + pkgs.gnomeExtensions.alphabetical-app-grid.extensionUuid + pkgs.gnomeExtensions.quick-settings-audio-devices-hider.extensionUuid + pkgs.gnomeExtensions.quick-settings-audio-devices-renamer.extensionUuid ]; favorite-apps = [ "org.gnome.Nautilus.desktop" "org.wezfurlong.wezterm.desktop" "win11.desktop" - "zen_twilight.desktop" + "zen.desktop" "spotify.desktop" "vesktop.desktop" "org.telegram.desktop.desktop" diff --git a/home/toph/common/optional/desktops/gnome/wallpaper.jpg b/home/toph/common/optional/gnome/wallpaper.jpg similarity index 100% rename from home/toph/common/optional/desktops/gnome/wallpaper.jpg rename to home/toph/common/optional/gnome/wallpaper.jpg diff --git a/home/toph/common/optional/foot/default.nix b/home/toph/common/optional/hyprland/default.nix similarity index 100% rename from home/toph/common/optional/foot/default.nix rename to home/toph/common/optional/hyprland/default.nix diff --git a/home/toph/rune/default.nix b/home/toph/rune/default.nix index a078c2f..1dd6a7e 100644 --- a/home/toph/rune/default.nix +++ b/home/toph/rune/default.nix @@ -11,7 +11,7 @@ ## Host-specific Optional Configs ## ../common/optional/browsers - ../common/optional/desktops + ../common/optional/gnome ../common/optional/development ../common/optional/gaming ../common/optional/xdg.nix # file associations diff --git a/home/toph/vm/default.nix b/home/toph/vm/default.nix index b6f280e..c460343 100644 --- a/home/toph/vm/default.nix +++ b/home/toph/vm/default.nix @@ -9,7 +9,7 @@ ## Host-specific Optional Configs ## ../common/optional/browsers - ../common/optional/desktops + ../common/optional/gnome # ../common/optional/development # ../common/optional/gaming ../common/optional/xdg.nix # file associations diff --git a/hosts/common/optional/bluetooth.nix b/hosts/common/optional/bluetooth.nix new file mode 100644 index 0000000..75f37c4 --- /dev/null +++ b/hosts/common/optional/bluetooth.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: +{ + hardware.bluetooth = { + enable = true; + package = pkgs.bluez5-experimental; + settings = { + # make Xbox Series X controller work + General = { + Class = "0x000100"; + ControllerMode = "bredr"; + FastConnectable = true; + JustWorksRepairing = "always"; + Privacy = "device"; + # Battery info for Bluetooth devices + Experimental = true; + }; + }; + }; + + # https://github.com/NixOS/nixpkgs/issues/114222 + systemd.user.services.telephony_client.enable = false; +} diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix index dba5b13..bf103dc 100644 --- a/hosts/common/optional/gnome.nix +++ b/hosts/common/optional/gnome.nix @@ -27,6 +27,10 @@ gnomeExtensions.dash-to-panel gnomeExtensions.tiling-shell gnomeExtensions.vitals + # gnomeExtensions.just-perfection + gnomeExtensions.alphabetical-app-grid + gnomeExtensions.quick-settings-audio-devices-hider + gnomeExtensions.quick-settings-audio-devices-renamer ]; environment.gnome.excludePackages = ( diff --git a/hosts/nixos/rune/default.nix b/hosts/nixos/rune/default.nix index ba96d12..da11089 100644 --- a/hosts/nixos/rune/default.nix +++ b/hosts/nixos/rune/default.nix @@ -30,6 +30,7 @@ in ## Optional Configs ## "hosts/common/optional/audio.nix" # pipewire and cli controls + "hosts/common/optional/bluetooth.nix" "hosts/common/optional/ddcutil.nix" # ddcutil for monitor controls "hosts/common/optional/gaming.nix" # steam, gamescope, gamemode, and related hardware "hosts/common/optional/gnome.nix" # desktop