diff --git a/2configs/editor/neovim/default.nix b/2configs/editor/neovim/default.nix index a6fc1ab..2aaca95 100644 --- a/2configs/editor/neovim/default.nix +++ b/2configs/editor/neovim/default.nix @@ -1,6 +1,6 @@ {pkgs, config, ...}: { - fonts.fonts = [ pkgs.font-awesome_5 ]; + fonts.packages = [ pkgs.font-awesome_5 ]; # Neovim dependencies home-manager.users.makefu = { home.packages = with pkgs; [ diff --git a/2configs/extra-fonts.nix b/2configs/extra-fonts.nix index 25ca7a3..c5af3a0 100644 --- a/2configs/extra-fonts.nix +++ b/2configs/extra-fonts.nix @@ -3,7 +3,7 @@ fonts = { fontDir.enable = true; enableGhostscriptFonts = true; - fonts = with pkgs; [ + packages = with pkgs; [ inconsolata # monospaced ubuntu_font_family # Ubuntu fonts unifont # some international languages diff --git a/2configs/gui/base.nix b/2configs/gui/base.nix index b1b7c99..a3164f2 100644 --- a/2configs/gui/base.nix +++ b/2configs/gui/base.nix @@ -45,7 +45,7 @@ in fonts = { fontDir.enable = true; enableGhostscriptFonts = true; - fonts = [ pkgs.terminus_font pkgs.corefonts ]; + packages = [ pkgs.terminus_font pkgs.corefonts ]; }; users.users.${mainUser} = { diff --git a/2configs/gui/wbob-kiosk.nix b/2configs/gui/wbob-kiosk.nix index a1442fb..0158e87 100644 --- a/2configs/gui/wbob-kiosk.nix +++ b/2configs/gui/wbob-kiosk.nix @@ -2,7 +2,7 @@ { imports = [ - ./base.nix + ./base.nix ]; users.users.kiosk = { diff --git a/2configs/home/jellyfin.nix b/2configs/home/jellyfin.nix index e613a05..099537a 100644 --- a/2configs/home/jellyfin.nix +++ b/2configs/home/jellyfin.nix @@ -15,7 +15,7 @@ in systemd.services.jellyfin = { after = [ "media-cloud.mount" ]; serviceConfig = rec { - RequiresMountFor = [ "/media/cloud" ]; + RequiresMountsFor = [ "/media/cloud" ]; SupplementaryGroups = lib.mkForce [ "video" "render" "download" ]; UMask = lib.mkForce "0077"; }; diff --git a/flake.nix b/flake.nix index badd8c7..60b85d3 100644 --- a/flake.nix +++ b/flake.nix @@ -54,10 +54,11 @@ inherit (nixpkgs) lib pkgs; pkgsForSystem = system: (import nixpkgs { inherit system; - #system = "x86_64-linux"; config.allowUnfree = true; config.packageOverrides = lib.mkForce (pkgs: { tinc = pkgs.tinc_pre; }); config.allowUnfreePredicate = pkg: lib.packageName pkg == "unrar"; + config.android_sdk.accept_license = true; + config.oraclejdk.accept_license = true overlays = [ self.overlays.default inputs.nix-writers.overlays.default