From 4713123db9296f69b62ac7518ac87e8e957ee54f Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 2 Jul 2023 14:12:03 +0900 Subject: [PATCH] test --- common/dotfiles/firefox.nix | 35 +----- flake.nix | 17 ++- laptop/flake.lock | 212 ------------------------------------ 3 files changed, 17 insertions(+), 247 deletions(-) delete mode 100644 laptop/flake.lock diff --git a/common/dotfiles/firefox.nix b/common/dotfiles/firefox.nix index a14da3df..68f768fb 100644 --- a/common/dotfiles/firefox.nix +++ b/common/dotfiles/firefox.nix @@ -71,37 +71,10 @@ "services.sync.prefs.sync.browser.newtabpage.enabled" = "false"; }; - extraConfig = { - "extension.pocket.enabled" = "false";\n - "toolkit.telemetry.pioneer-new-studies-availble" = "false";\n - "datareporting.healthreport.uploadEnabled" = "false";\n - "datareporting.healthreport.infoURL" = "null";\n - "toolkit.telemetry.server" = "null";\n - "browser.newtabpage.activity-stream.feeds.telemetry" = "false";\n - "browser.newtabpage.activity-stream.telemetry" = "false";\n - "browser.ping-centre.telemetry" = "false";\n - "toolkit.telemetry.enabled" = "false";\n - "toolkit.telemetry.firstShutdownPing.enabled" = "false";\n - "toolkit.telemetry.hybridContent.enabled" = "false";\n - "toolkit.telemetry.newProfilePing.enabled" = "false";\n - "toolkit.telemetry.shutdownPingSender.enabled" = "false";\n - "toolkit.telemetry.updatePing.enabled" = "false";\n - "toolkit.telemetry.reportingpolicy.firstRun" = "false";\n - "toolkit.telemetry.unified" = "false";\n - "toolkit.telemetry.archive.enabled" = "false";\n - "devtools.onboarding.telemetry.logged" = "false";\n - "toolkit.telemetry.bhrPing.enabled" = "false";\n - "datareporting.policy.dataSubmissionEnabled" = "false";\n - "datareporting.sessions.current.clean" = "true";\n - "browser.startup.homepage" = "https://searx.sysctl.io";\n - "browser.search.region" = "US";\n - "browser.search.isUS" = false;\n - "distribution.searchplugins.defaultLocale" = "en-US";\n - "general.useragent.locale" = "en-US";\n - "browser.bookmarks.showMobileBookmarks" = "false";\n - "browser.newtabpage.enabled" = "false";\n - "services.sync.prefs.sync.browser.newtabpage.enabled" = "false";\n - }; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + privacy-badger + ]; + search.default = "DuckDuckGo"; search.force = true; search.order = [ diff --git a/flake.nix b/flake.nix index a76e3324..a92eca85 100644 --- a/flake.nix +++ b/flake.nix @@ -19,9 +19,15 @@ # Firefox Overlay moz_overlay.url = "github:mozilla/nixpkgs-mozilla"; + + # Nix User Repository + nur.url = "github:nix-community/NUR"; + nur.inputs.nixpkgs.follows = "nixpkgs"; + + }; - outputs = { nixpkgs, home-manager, lanzaboote, moz_overlay, ... }@inputs: + outputs = { nixpkgs, home-manager, lanzaboote, moz_overlay, nur, ... }@inputs: let # Variables - Remember to set these hostname = "nixos-laptop"; @@ -46,12 +52,15 @@ # Extra options for the host hardware configuration ./hosts/${hostname}/configuration.nix - # SecureBoot Configuration - lanzaboote.nixosModules.lanzaboote - # Common NixOS Configuration file ./configuration.nix + # SecureBoot Configuration + lanzaboote.nixosModules.lanzaboote + + # Import NUR + nur.nixosModules.nur + # Tell home-manager to use both global and user packages: home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/laptop/flake.lock b/laptop/flake.lock deleted file mode 100644 index e4bfbebe..00000000 --- a/laptop/flake.lock +++ /dev/null @@ -1,212 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1687871164, - "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.05", - "repo": "home-manager", - "type": "github" - } - }, - "lanzaboote": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix" - }, - "locked": { - "lastModified": 1687124707, - "narHash": "sha256-BEC2y7zwDI/Saeupr9rijLvwb0OoqTD9vntlcyciyrM=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "c758cdad465e0c8174db57dc493f51a89f0e3372", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lanzaboote", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1687829761, - "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1684842236, - "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "61e567d6497bc9556f391faebe5e410e6623217f", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -}