diff --git a/flake.lock b/flake.lock index 28a9eda..2a5eaf3 100644 --- a/flake.lock +++ b/flake.lock @@ -38,10 +38,26 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1685126679, + "narHash": "sha256-cOZiSirGQ4gP7Q2Yoht/rtEaAZgsHum6xm3NjN82In0=", + "owner": "nix-community", + "repo": "NUR", + "rev": "a502f8367bdd5fedb9eb19b70fec1513c3d0d1b5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nur": "nur" } }, "utils": { diff --git a/flake.nix b/flake.nix index 370ae34..8a30404 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ inputs = { # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; - # nur.url = github:nix-community/NUR; + nur.url = github:nix-community/NUR; # Home manager home-manager.url = "github:nix-community/home-manager/release-22.11"; @@ -34,7 +34,6 @@ # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#nils@nixos' homeConfigurations = { - # FIXME replace with your username@hostname "nils@nixos" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config diff --git a/home-manager/home.nix b/home-manager/home.nix index 498cab9..99439f9 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,7 +1,12 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ inputs, lib, config, pkgs, nur, ... }: { +{ inputs +, lib +, config +, pkgs +, ... +}: { # You can import other home-manager modules here imports = [ # If you want to use home-manager modules from other flakes (such as nix-colors): @@ -23,6 +28,8 @@ # patches = [ ./change-hello-to-hi.patch ]; # }); # }) + + inputs.nur.overlay ]; # Configure your nixpkgs instance config = { @@ -74,10 +81,10 @@ programs.firefox = { enable = true; - # extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - # ublock-origin - # bitwarden - # ]; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + bitwarden + ]; profiles = { nils = { id = 0; @@ -100,6 +107,11 @@ enable = true; }; + programs.zoxide = { + enable = true; + enableFishIntegration = true; + }; + # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch";