diff --git a/flake.nix b/flake.nix index f28e793..9577e9c 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; - home-manager.backupFileExtension = "backup95"; + home-manager.backupFileExtension = "backup974"; } ]; }; diff --git a/modules/gnome-quirks/default.nix b/modules/gnome-quirks/default.nix index a5bb9a0..e44fbae 100644 --- a/modules/gnome-quirks/default.nix +++ b/modules/gnome-quirks/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ @@ -15,6 +15,9 @@ gnomeExtensions.desktop-cube gnomeExtensions.category-sorted-app-grid gnomeExtensions.blur-my-shell + gnomeExtensions.tiling-assistant + gnomeExtensions.pip-on-top + gnomeExtensions.zen dconf-editor gnome-tweaks @@ -49,7 +52,93 @@ "desktop-cube@schneegans.github.com" "blur-my-shell@aunetx" "category-sorted-app-grid@noobping.dev" + "tiling-assistant@leleat-on-github" + "pip-on-top@rafostar.github.com" ]; + favourite-apps = [ + "org.gnome.Console.desktop" + "org.gnome.Nautilus.desktop" + "librewolf.desktop" + "org.telegram.desktop.desktop" + "discord.desktop" + "spotify.desktop" + "org.prismlauncher.PrismLauncher.desktop" + ]; + }; + "org/gnome/desktop/wm/keybindings" = { + switch-to-workspace-1 = ["1"]; + switch-to-workspace-2 = ["2"]; + switch-to-workspace-3 = ["3"]; + switch-to-workspace-4 = ["4"]; + switch-to-workspace-5 = ["5"]; + switch-to-workspace-6 = ["6"]; + switch-to-workspace-7 = ["7"]; + switch-to-workspace-8 = ["8"]; + switch-to-workspace-9 = ["9"]; + switch-to-workspace-10 = ["0"]; + move-to-workspace-1 = ["1"]; + move-to-workspace-2 = ["2"]; + move-to-workspace-3 = ["3"]; + move-to-workspace-4 = ["4"]; + move-to-workspace-5 = ["5"]; + move-to-workspace-6 = ["6"]; + move-to-workspace-7 = ["7"]; + move-to-workspace-8 = ["8"]; + move-to-workspace-9 = ["9"]; + move-to-workspace-10 = ["0"]; + show-desktop = ["d"]; + close = ["F4" "Q"]; + toggle-fullscreen = ["f"]; + }; + "org/gnome/settings-daemon/plugins/media-keys" = { + www = ["i"]; + 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/" + ]; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { + binding = "Return"; + command = "kgx"; + name = "gnome console keybind"; + enable-in-lockscreen = true; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = { + binding = "n"; + command = "nautilus"; + name = "gnome file manager keybind"; + enable-in-lockscreen = true; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = { + binding = "o"; + command = "gnome-calculator"; + name = "gnome calculator keybind"; + enable-in-lockscreen = true; + }; + "org/gnome/shell/keybindings" = { + 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 = []; + open-new-window-application-1 = []; + open-new-window-application-2 = []; + open-new-window-application-3 = []; + open-new-window-application-4 = []; + open-new-window-application-5 = []; + open-new-window-application-6 = []; + open-new-window-application-7 = []; + open-new-window-application-8 = []; + open-new-window-application-9 = []; + }; + "org/gnome/gnome-session" = { + logout-prompt = false; + show-fallback-warning = false; }; "org/gnome/shell/extensions/dash-to-dock" = { always-center-icons = false; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index ea59b95..23c4ab5 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -111,7 +111,7 @@ spotify telegram-desktop - (chromium.override { enableWideVine = true; }) + # (chromium.override { enableWideVine = true; }) revolt-desktop element-desktop surf diff --git a/modules/packages/discord.nix b/modules/packages/discord.nix index b105a99..164336c 100644 --- a/modules/packages/discord.nix +++ b/modules/packages/discord.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: -{ +{ programs.nixcord = { enable = true; @@ -115,5 +115,7 @@ translate.enable = true; }; }; - }; + }; + + } diff --git a/modules/packages/firefox.nix b/modules/packages/firefox.nix index 553c3f7..76807fe 100644 --- a/modules/packages/firefox.nix +++ b/modules/packages/firefox.nix @@ -28,7 +28,10 @@ "svg.context-properties.content.enabled" = true; "browser.theme.dark-private-windows" = false; - # do not clear cookies + # disable annoying stuff + "privacy.resistFingerprinting" = false; + "clipboard.autocopy" = false; + "middlemouse.paste" = false; "privacy.clearOnShutdown.history" = false; "privacy.clearOnShutdown.cookies" = false; }; diff --git a/modules/proxies/hysteria. b/modules/proxies/hysteria. new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/modules/proxies/hysteria. @@ -0,0 +1 @@ + diff --git a/modules/sway/waybar/config.jsonc b/modules/sway/waybar/config.jsonc index 4f617d8..769f408 100755 --- a/modules/sway/waybar/config.jsonc +++ b/modules/sway/waybar/config.jsonc @@ -183,7 +183,7 @@ "reboot": "systemctl reboot", "suspend": "systemctl suspend", "hibernate": "systemctl hibernate", - "logout": "pkill sway" + "logout": "swaymsg exit" } } }