muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pkgs

Browse source
This commit is contained in:
muon 2025-01-02 11:53:41 +00:00
parent 7a0ea882c5
commit 7bf3d8fd7c
5 changed files with 15 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

27
flake.nix
View file

@ -17,32 +17,7 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs' = (import inputs.nixpkgs { inherit system; }).applyPatches { pkgs = import inputs.nixpkgs { inherit system; };
name = "nixpkgs-unstable-patched";
src = inputs.nixpkgs;
patches = [
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/369042.patch";
sha256 =
"sha256:08asxmd34rzaxb8dr4nccy26k3vxnx7psy2imnp40fdplqna0a85";
})
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368790.patch";
sha256 =
"sha256:1blsawm4l30wkrdkvvq0fw2aki7v921isdwrk9dw8yh09cglbfd9";
})
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368091.patch";
sha256 =
"sha256:11qnwrq8sgbmxiy9qvv7q2lbl824x90p2iklf3kjf9yb3c2dx9nj";
})
];
};
pkgs = import pkgs' { inherit system; };
utils = import ./utils.nix { inherit inputs system pkgs; }; utils = import ./utils.nix { inherit inputs system pkgs; };
in { in {

2
hosts/muop/configuration.nix
View file

@ -31,7 +31,7 @@ in {
mods.server.astral.autoStart = false; mods.server.astral.autoStart = false;
mods.server.sync.enable = true; mods.server.sync.enable = true;
mods.tailscale.enable = false; mods.tailscale.enable = true;
mods.openvpn.enable = false; mods.openvpn.enable = false;
mods.wireguard.id = 4; mods.wireguard.id = 4;

3
modules/home/desktop/productivity.nix
View file

@ -20,6 +20,9 @@
# password manager # password manager
bitwarden-desktop bitwarden-desktop
# file management
krusader
# documents # documents
# texliveFull # texliveFull
# texstudio # texstudio

19
modules/nixos/unfree/default.nix
View file

@ -1,21 +1,12 @@
{ pkgs, lib, config, ... }: { lib, config, ... }:
let let
cfg = config.mods.unfree; cfg = config.mods.unfree;
mkPackages = mod: mkPackages = mod: if cfg.${mod}.enable then cfg.${mod}.packages else [ ];
if cfg.${mod}.enable then
cfg.${mod}.packages else [];
in { in {
imports = [ imports = [ ./steam.nix ./nvidia.nix ./minecraft.nix ];
./steam.nix
./nvidia.nix
./minecraft.nix
];
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) ( builtins.elem (lib.getName pkg)
(mkPackages "steam") ++ ((mkPackages "steam") ++ (mkPackages "minecraft") ++ (mkPackages "nvidia"));
(mkPackages "minecraft") ++
(mkPackages "nvidia")
);
} }

8
utils.nix
View file

@ -1,7 +1,9 @@
{ inputs, system, pkgs, ... }: { { inputs, system, pkgs, ... }:
let nixpkgs = inputs.nixpkgs;
in {
mkHost = host: mkHost = host:
inputs.nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs system pkgs; }; specialArgs = { inherit inputs system; };
modules = [ modules = [
host host