diff --git a/flake.lock b/flake.lock index e000dfbe..f25d83ae 100644 --- a/flake.lock +++ b/flake.lock @@ -192,6 +192,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -712,11 +733,33 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ - "stylix", "nixpkgs" ], "treefmt-nix": "treefmt-nix" }, + "locked": { + "lastModified": 1743128178, + "narHash": "sha256-h/05pQp7KTy83UqwfZQpuJGB5oEWYf+5kVM7RGBi47k=", + "owner": "nix-community", + "repo": "NUR", + "rev": "e8dc75a445e7d58d4b4b5be1d13a3b1e32a5c027", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_2": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_2" + }, "locked": { "lastModified": 1741693509, "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", @@ -764,6 +807,7 @@ "impermanence": "impermanence", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", + "nur": "nur", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "sops-nix": "sops-nix", "stylix": "stylix", @@ -836,7 +880,7 @@ "nixpkgs": [ "nixpkgs" ], - "nur": "nur", + "nur": "nur_2", "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -986,6 +1030,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", diff --git a/flake.nix b/flake.nix index 5d28644f..8595477b 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,11 @@ url = "github:LunaCOLON3/zen-browser-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -61,6 +66,8 @@ self, nixpkgs, home-manager, + nur, + zen-browser, ... }@inputs: let @@ -81,7 +88,13 @@ let config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) (import ./unfree.nix).allowed; in - import nixpkgs { inherit system config; }; + import nixpkgs { + inherit system config; + overlays = [ + nur.overlays.default + zen-browser.overlay + ]; + }; makeHost = host: system: diff --git a/home/lilith/default.nix b/home/lilith/default.nix index 46a40815..96ea0b54 100644 --- a/home/lilith/default.nix +++ b/home/lilith/default.nix @@ -11,7 +11,7 @@ ./env.nix #zen-browser (WIP) - # ./firefox + ./firefox ./alacritty.nix ./clipman.nix diff --git a/home/lilith/firefox.nix b/home/lilith/firefox.nix index 4bea0e04..499c178b 100644 --- a/home/lilith/firefox.nix +++ b/home/lilith/firefox.nix @@ -1,4 +1,5 @@ -{ pkgs, ...}: { +{ pkgs, ... }: +{ programs.firefox = { enable = true; @@ -12,29 +13,29 @@ URL = "https://duckduckgo.com"; StartPage = "homepage"; }; - + DisablePocket = true; DisableFirefoxAccounts = true; DisableAccounts = true; DisableFormHistory = true; OfferToSaveLogins = false; PasswordManagerEnabled = false; - + DisableSetDesktopBackground = true; DisableTelemetry = true; DisableFirefoxScreenshots = true; - + OverrideFirstRunPage = "https://duckduckgo.com"; OverridePostUpdatePage = "https://duckduckgo.com"; NewTabPage = false; - + DontCheckDefaultBrowser = true; DisplayBookmarksToolbar = "never"; - + SearchBar = "unified"; SearchSuggestEnabled = false; DownloadDirectory = "/home/lilith/sync/inbox"; - + Containers = { "Default" = [ { @@ -47,7 +48,7 @@ icon = "briefcase"; color = "green"; } - ]; + ]; }; ExtensionSettings = { diff --git a/home/lilith/firefox/default.nix b/home/lilith/firefox/default.nix index 2c712cd3..59ee3537 100644 --- a/home/lilith/firefox/default.nix +++ b/home/lilith/firefox/default.nix @@ -1,74 +1,48 @@ -{zen-browser, system, pkgs, lib, ...}: { +{ + zen-browser, + pkgs, + lib, + ... +}: +{ imports = [ zen-browser.homeManagerModules.zen-browser ]; - home.file.".mozilla/native-messaging-hosts".source = lib.mkForce "/home/lilith/.mozilla/native-messaging-hosts"; + home.file.".mozilla/native-messaging-hosts".source = + lib.mkForce /home/lilith/.mozilla/native-messaging-hosts; programs.zen-browser = { enable = true; - nativeMessagingHosts = with pkgs; [ - tridactyl-native - keepassxc - ]; + nativeMessagingHosts = lib.mkForce ( + with pkgs; + [ + tridactyl-native + keepassxc + ] + ); - policies = { - Homepage = { - URL = "https://duckduckgo.com"; - StartPage = "homepage"; + profiles.lilith = { + id = 0; + name = "Lilith"; + isDefault = true; + + search = { + force = true; + default = "DuckDuckGo"; + privateDefault = "DuckDuckGo"; + order = [ "DuckDuckGo" ]; }; - DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFormHistory = true; - OfferToSaveLogins = false; - PasswordManagerEnabled = false; - - DisableSetDesktopBackground = true; - DisableTelemetry = true; - DisableFirefoxScreenshots = true; - - OverrideFirstRunPage = "https://duckduckgo.com"; - OverridePostUpdatePage = "https://duckduckgo.com"; - NewTabPage = false; - - DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "never"; - - SearchBar = "unified"; - SearchSuggestEnabled = false; - DownloadDirectory = "/home/lilith/sync/inbox"; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + keepassxc-browser + tridactyl + ]; - ExtensionSettings = { - # uBlock Origin: - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - }; - - "keepassxc-browser@keepassxc.org" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/keepassxc-browser/latest.xpi"; - installation_mode = "force_installed"; - }; - - "sponsorBlocker@ajay.app" = { - install_url = "https://addons.mozilla.org/firefox/downloads/file/4292214/sponsorblock-5.6.xpi"; - installation_mode = "force_installed"; - }; - - "tridactyl.vim@cmcaine.co.uk" = { - install_url = "https://addons.mozilla.org/firefox/downloads/file/4261352/tridactyl_vim-1.24.1.xpi"; - installation_mode = "force_installed"; - }; - }; - - SearchEngines = { - Default = "DuckDuckGo"; - }; - - Preferences = { - "browser.newtab.extensionControlled" = false; - "browser.translations.neverTranslateLanguages" = true; + settings = { + "zen.experimental-no-window-controls" = true; + "zen.sidebar.data" = ""; + "browser.translations.automaticallyPopup" = false; }; }; }; diff --git a/system/core/default.nix b/system/core/default.nix index 87a2ac4f..7daaac97 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -17,6 +17,6 @@ ./users.nix ./zsh.nix - ./virtulization.nix + ./virtualization.nix ]; } diff --git a/system/optional/gaming.nix b/system/optional/gaming.nix index 00451a7b..3d320633 100644 --- a/system/optional/gaming.nix +++ b/system/optional/gaming.nix @@ -18,6 +18,10 @@ steam = { enable = true; gamescopeSession.enable = true; + + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; }; gamemode.enable = true; @@ -32,5 +36,17 @@ protontricks ]; }; + + # SteamVR kernel patch for AMDGPU + boot.kernelPatches = [ + { + name = "amdgpu-ignore-ctx-privileges"; + patch = pkgs.fetchpatch { + name = "cap_sys_nice_begone.patch"; + url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; + hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; + }; + } + ]; }; }