From efd59a963d43242eb79c7c0f738bd48a4b20bcda Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 1 Mar 2024 02:06:15 +0530 Subject: [PATCH] [feat] Tried to add nur --- config/nix/common/firefox.nix | 10 ++++++++-- config/nix/flake.lock | 18 +++++++++++++++++- config/nix/flake.nix | 4 ++-- config/nix/linux/default.nix | 2 +- config/nix/nixos/device.nix | 3 ++- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/config/nix/common/firefox.nix b/config/nix/common/firefox.nix index 80529b1b..33589334 100644 --- a/config/nix/common/firefox.nix +++ b/config/nix/common/firefox.nix @@ -1,6 +1,7 @@ -{ device, pkgs, ... }: { +{ device, pkgs, nur, ... }: { programs.firefox = { - enable = device.isLinux; + enable = false; + # enable = device.isLinux; profiles.default = { userChrome = let csshacks = pkgs.fetchFromGitHub { @@ -13,6 +14,11 @@ @import url(${csshacks}/chrome/tabs_on_bottom.css); @import url(${csshacks}/chrome/toolbars_below_content.css); ''; + # extensions = with nur.repos.rycee.firefox-addons; [ + # privacy-badger + # ublock-origin + # bitwarden + # ]; }; nativeMessagingHosts = [ pkgs.tridactyl-native ]; }; diff --git a/config/nix/flake.lock b/config/nix/flake.lock index 68e8a810..0246c1d2 100644 --- a/config/nix/flake.lock +++ b/config/nix/flake.lock @@ -932,6 +932,21 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1709238329, + "narHash": "sha256-c3GRGuMceCIMt8JiVics4PWzoxnJO1fhThhGBesqRG0=", + "owner": "nix-community", + "repo": "nur", + "rev": "04faed2bbb45869890824deb06ab315228ffe7b1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nur", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -1031,7 +1046,8 @@ "nix-darwin": "nix-darwin", "nixneovim": "nixneovim", "nixneovimplugins": "nixneovimplugins_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "nur": "nur" } }, "rust-overlay": { diff --git a/config/nix/flake.nix b/config/nix/flake.nix index a361fe7d..c0f6d417 100644 --- a/config/nix/flake.nix +++ b/config/nix/flake.nix @@ -81,7 +81,7 @@ }; - outputs = { nixpkgs, home-manager, nix-darwin, flake-utils, anyrun + outputs = { nixpkgs, home-manager, nix-darwin, flake-utils, anyrun, nur , neovim-nightly-overlay, ... }@inputs: let config_devices = [ @@ -157,7 +157,7 @@ in { nixosConfigurations = let devices = nixos_devices; in import ./nixos/device.nix { - inherit devices inputs nixpkgs home-manager overlays; + inherit devices inputs nixpkgs home-manager overlays nur; }; darwinConfigurations = let devices = darwin_devices; diff --git a/config/nix/linux/default.nix b/config/nix/linux/default.nix index 41fed627..810100ec 100644 --- a/config/nix/linux/default.nix +++ b/config/nix/linux/default.nix @@ -1,4 +1,4 @@ -{ pkgs, device, ... }: { +{ pkgs, device, nur, ... }: { imports = [ ../common/firefox.nix ../linux/hyprland.nix diff --git a/config/nix/nixos/device.nix b/config/nix/nixos/device.nix index f118c6fd..8881b8d6 100644 --- a/config/nix/nixos/device.nix +++ b/config/nix/nixos/device.nix @@ -1,4 +1,4 @@ -{ nixpkgs, devices, inputs, overlays, home-manager, ... }: +{ nixpkgs, devices, inputs, overlays, home-manager, nur, ... }: builtins.listToAttrs (builtins.map (device: { name = device.name; value = nixpkgs.lib.nixosSystem { @@ -8,6 +8,7 @@ builtins.listToAttrs (builtins.map (device: { lanzaboote = inputs.lanzaboote; }; modules = [ + nur.nixosModules.nur { nixpkgs.overlays = overlays; } ./configuration.nix home-manager.nixosModules.home-manager