nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for nixos stable

Browse Source
This commit is contained in:
NullBite 2024-03-29 23:40:24 +00:00
parent 8bfb043fed
commit daf5f1be08
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backports/default.nix
View File

@ -2,9 +2,7 @@ nixfiles: final: prev:
let let
inherit (prev) callPackage fetchFromGitHub; inherit (prev) callPackage fetchFromGitHub;
inherit (prev.lib) recurseIntoAttrs optionalAttrs; inherit (prev.lib) recurseIntoAttrs optionalAttrs;
isNewer = ref: ver: (builtins.compareVersions ver ref) == 1;
xz-hold = nixfiles.inputs.nixpkgs-unstable.legacyPackages.${prev.system}.xz.version == "5.6.1";
xz-fixed = (nixfiles.inputs.nixpkgs-staging-next.legacyPackages.${prev.system}.xz);
# if you can't do version based just make it time based and deal with it in a # if you can't do version based just make it time based and deal with it in a
# month if it's not fixed # month if it's not fixed
@ -19,4 +17,9 @@ let
}; };
in recurseIntoAttrs (callPackage "${src}/pkgs/applications/graphics/gimp/plugins" {}); in recurseIntoAttrs (callPackage "${src}/pkgs/applications/graphics/gimp/plugins" {});
in (optionalAttrs gap-hold { gimpPlugins = gimpPlugins-gap; }) // in (optionalAttrs gap-hold { gimpPlugins = gimpPlugins-gap; }) //
(optionalAttrs xz-hold { xz=xz-fixed; }) # can't optionalAttrs for version checks because it breaks lazy eval and causes infinite recursion
{
obsidian = let
pkg = final.callPackage "${nixfiles.inputs.nixpkgs-unstable}/pkgs/applications/misc/obsidian" { electron = final.electron_28; };
in if isNewer "1.4.16" prev.obsidian.version then prev.obsidian else pkg;
}

1
hosts/nullbox/configuration.nix
View File

@ -59,7 +59,6 @@
common.remoteAccess.enable = true; common.remoteAccess.enable = true;
sessions.plasma.enable = lib.mkDefault false; sessions.plasma.enable = lib.mkDefault false;
sessions.hyprland.enable = lib.mkDefault true; sessions.hyprland.enable = lib.mkDefault true;
sessions.hyprland.useFlake = true;
hardware.nvidia.modesetting.enable = true; hardware.nvidia.modesetting.enable = true;
packageSets.gaming.enable = true; packageSets.gaming.enable = true;
}; };

1
hosts/slab/configuration.nix
View File

@ -54,7 +54,6 @@
fun.enable = true; fun.enable = true;
}; };
sessions.hyprland.enable = lib.mkDefault true; sessions.hyprland.enable = lib.mkDefault true;
sessions.hyprland.useFlake = true;
sessions.plasma.enable = lib.mkDefault false; sessions.plasma.enable = lib.mkDefault false;
programs = { programs = {
adb.enable = true; adb.enable = true;

2
system/programs/unbound.nix
View File

@ -8,7 +8,7 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
networking.networkmanager.dns = "none"; networking.networkmanager.dns = lib.mkDefault "none";
services.unbound = { services.unbound = {
enable = true; enable = true;
settings = { settings = {

9
system/sessions/hyprland.nix
View File

@ -12,7 +12,14 @@ in
options.nixfiles.sessions.hyprland = { options.nixfiles.sessions.hyprland = {
enable = lib.mkEnableOption "hyprland configuration"; enable = lib.mkEnableOption "hyprland configuration";
useFlake = lib.mkEnableOption "hyprland flake package"; useFlake = lib.mkOption {
description = "Whether to use the Hyprland flake package";
type = lib.types.bool;
# enable if not on nixpkgs stable
defaultText = "config.nixfiles.nixpkgs != inputs.nixpkgs";
default = config.nixfiles.nixpkgs != inputs.nixpkgs;
example = true;
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {