diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b2be92b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result diff --git a/flake.lock b/flake.lock index f7d4fe1..9b10abe 100644 --- a/flake.lock +++ b/flake.lock @@ -32,26 +32,10 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1696831218, - "narHash": "sha256-UBtOKflBTUBfeFB7oYvMUzlc2uBLpZc+15JC9bPwKF4=", - "owner": "nix-community", - "repo": "NUR", - "rev": "be4322f9eaf6158baa87b3c08fc0a8d8805db181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nur": "nur" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 6826b01..57e9e93 100644 --- a/flake.nix +++ b/flake.nix @@ -3,30 +3,25 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - nur.url = "github:nix-community/NUR"; home-manager = { url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, nur, ... }: { + outputs = { self, nixpkgs, home-manager }: { nixosConfigurations = { pim = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - { nixpkgs.overlays = [ nur.overlay ]; } - (args: home-manager.nixosModules.home-manager { - inherit (args) lib pkgs config utils; + ./configuration.nix + home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.pim = { - imports = [ - ./home/home.nix - ]; + imports = [ ./home/home.nix ]; }; - }) - ./configuration.nix + } ]; }; }; diff --git a/home/firefox/addons.nix b/home/firefox/addons.nix index 773871f..2527bf5 100644 --- a/home/firefox/addons.nix +++ b/home/firefox/addons.nix @@ -1,6 +1,6 @@ -{pkgs, lib, ...}@args: +{nurpkgs, lib, ...}@args: let - rycee-addons = pkgs.repos.rycee.firefox-addons; + rycee-addons = nurpkgs.repos.rycee.firefox-addons; custom-addons = import ./custom-addons.nix args; in { diff --git a/home/firefox/default.nix b/home/firefox/default.nix index 18ba4a3..65b3397 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -1,7 +1,8 @@ -args: +{ pkgs, ...}@args: let - firefoxAddons = import ./addons.nix args; + nurpkgs = import (builtins.fetchTarball {url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; sha256 = "1gb3wkmyl6xbs4kval2ml48nlil39853dj62rxfrlk9i2nky2ly4"; }) { inherit pkgs; }; + firefoxAddons = import ./addons.nix (args // {inherit nurpkgs; }); firefoxSettings = { "browser.aboutConfig.showWarning" = false; "browser.toolbars.bookmarks.visibility" = "always";