diff --git a/flake.nix b/flake.nix index 4e1969e..25ee0d6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ inputs = { nixpkgs = { - url = "nixpkgs/nixos-unstable"; + #url = "nixpkgs/nixos-unstable"; + url = "nixpkgs/nixpkgs-unstable"; }; home-manager = { @@ -39,7 +40,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }: + outputs = { self, nixpkgs, home-manager, nur, ... }@inputs: let username = "manuel"; hostname = "terra"; @@ -56,13 +57,14 @@ { overlays.default = (final: prev: rec { + nerdfonts = prev.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + discord = prev.discord.override { - nss = pkgs.nss_latest; withOpenASAR = true; }; }); @@ -75,16 +77,15 @@ ./system/configuration.nix home-manager.nixosModules.home-manager { - home-manager = - { - useGlobalPkgs = true; - useUserPackages = true; - users.${username} = import ./user/home.nix; - extraSpecialArgs = { - inherit inputs; - inherit pkgs; - }; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.${username} = import ./user/home.nix; + extraSpecialArgs = { + inherit inputs; + inherit pkgs; }; + }; } ]; }; diff --git a/system/configuration.nix b/system/configuration.nix index e151862..57f48a2 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -11,7 +11,9 @@ ./hardware-configuration.nix ]; - nixpkgs.config.allowUnfree = true; + nixpkgs.config = { + allowUnfree = true; + }; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot = { @@ -84,8 +86,6 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget git links2 ripgrep @@ -103,10 +103,6 @@ # }; # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - services.udev.packages = [ pkgs.openrgb ]; programs.dconf.enable = true; @@ -130,13 +126,6 @@ enable = true; }; - - nixpkgs.config.packageOverrides = pkgs: { - nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { - inherit pkgs; - }; - }; - nix.gc = { persistent = true; automatic = true; diff --git a/user/configs/fish/fish.nix b/user/configs/fish/fish.nix index bc8a671..e71c83f 100644 --- a/user/configs/fish/fish.nix +++ b/user/configs/fish/fish.nix @@ -42,7 +42,7 @@ nou = '' pushd &> /dev/null cd "${config.home.homeDirectory}/.dotfiles" - nix flake lock --commit-lock-file + nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager doas nixos-rebuild switch --upgrade --flake .# popd &> /dev/null '';