diff --git a/config/programs/firefox.nix b/config/programs/firefox.nix index 19d63b18..921248e6 100644 --- a/config/programs/firefox.nix +++ b/config/programs/firefox.nix @@ -31,24 +31,6 @@ "font.name-list.serif.x-western" = "sans-serif, nasin-nanpa"; }; id = 0; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - clearurls - consent-o-matic - darkreader - decentraleyes - don-t-fuck-with-paste - keepassxc-browser - privacy-badger - privacy-possum - sponsorblock - stylus - tree-style-tab - ublock-origin - umatrix - unpaywall - plasma-integration - tampermonkey - ]; }; }; }; diff --git a/flake.lock b/flake.lock index 08cd7f47..f41d237b 100644 --- a/flake.lock +++ b/flake.lock @@ -726,21 +726,6 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1703958323, - "narHash": "sha256-Hf6djNNhlKNDHQ7Vh/1QmFmdAklWtAfydP6j2edMhB8=", - "owner": "nix-community", - "repo": "NUR", - "rev": "ba98d1482678650833e821f1c63e9082d2d1829e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "admin-fe": "admin-fe", @@ -766,7 +751,6 @@ "nixos-hardware": "nixos-hardware", "nixos-vscode-server": "nixos-vscode-server", "nixpkgs": "nixpkgs", - "nur": "nur", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "systems": "systems" diff --git a/flake.nix b/flake.nix index 2a937186..13cb975b 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,6 @@ rec { inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:NixOS/nixpkgs"; - nur.url = "github:nix-community/NUR"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.flake-utils.follows = "flake-utils"; @@ -137,7 +136,6 @@ rec { nixpkgs, sops-nix, home-manager, - nur, ... } @ args: let systems = [ @@ -161,10 +159,6 @@ rec { name = "instance-20221213-1915"; # Oracle server system = "aarch64-linux"; } - { - name = "vf2"; # VisionFive 2 - system = "riscv64-linux"; - } { name = "rainbow-resort"; # PC system = "x86_64-linux"; @@ -193,9 +187,6 @@ rec { sops-nix.nixosModules.sops home-manager.nixosModules.home-manager ({pkgs, ...}: { - nixpkgs.overlays = [ - nur.overlay - ]; home-manager.extraSpecialArgs = args // {inherit system;}; }) (import utils/link-input.nix args) @@ -206,7 +197,6 @@ rec { overlays = { x86_64-linux = import ./overlays args "x86_64-linux"; aarch64-linux = import ./overlays args "aarch64-linux"; - riscv64-linux = import ./overlays args "riscv64-linux"; }; devShell.x86_64-linux = let pkgs = import nixpkgs { @@ -268,22 +258,6 @@ rec { configuration = import ./config/programs/vim/configuration.nix true; }; }; - packages.riscv64-linux = let - pkgs = import nixpkgs { - system = "riscv64-linux"; - overlays = [ - self.overlays.riscv64-linux - (import ./overlays/riscv.nix args) - args.nix-packages.overlays.riscv64-linux.default - ]; - config.allowUnfree = true; - }; - in { - neovim-base = args.nix-neovim.buildNeovim { - inherit pkgs; - configuration = import ./config/programs/vim/configuration.nix false; - }; - }; hydraJobs = (builtins.listToAttrs (map ({