From cfbb063c31a64c56ab5504b58eef79cc8b2f6300 Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Sat, 19 Sep 2026 18:14:07 +0100 Subject: [PATCH] use moppkgs explicitly instead of using overlays --- common/hm/programs/defaultApps.nix | 27 +++++++++++++-------------- common/hm/programs/helix/dnsZone.nix | 7 ++++--- common/hm/programs/helix/verilog.nix | 11 ++++++----- common/os/programs/steam.nix | 5 +++-- common/os/services/bandcampsync.nix | 7 ++++--- hosts/kaoru/home/home.nix | 10 +++++----- hosts/yuhata/home/home.nix | 12 ++++++------ hosts/yure/os/configuration.nix | 5 +++-- nixosModules/sidonia.nix | 6 +++++- overlays.nix | 14 -------------- 10 files changed, 49 insertions(+), 55 deletions(-) diff --git a/common/hm/programs/defaultApps.nix b/common/hm/programs/defaultApps.nix index bdc8d48..2adfc8a 100644 --- a/common/hm/programs/defaultApps.nix +++ b/common/hm/programs/defaultApps.nix @@ -1,8 +1,9 @@ { - osConfig, config, - pkgs, lib, + moppkgs, + osConfig, + pkgs, ... }: let @@ -23,18 +24,16 @@ lib.mkMerge [ ]; }; }; - home.packages = - with pkgs; - [ - leaf-markdown - pinta - plexamp - prismlauncher - proton-vpn - slack - tageditor - ] - ++ (lib.optional config.services.shikane.enable config.services.shikane.package); + home.packages = [ + moppkgs.leaf-markdown + pkgs.pinta + pkgs.plexamp + pkgs.prismlauncher + pkgs.proton-vpn + pkgs.slack + pkgs.tageditor + ] + ++ (lib.optional config.services.shikane.enable config.services.shikane.package); }) { catppuccin.cache.enable = lib.mkDefault true; diff --git a/common/hm/programs/helix/dnsZone.nix b/common/hm/programs/helix/dnsZone.nix index 4637bc9..6a8711c 100644 --- a/common/hm/programs/helix/dnsZone.nix +++ b/common/hm/programs/helix/dnsZone.nix @@ -1,8 +1,9 @@ { - osConfig, config, - pkgs, lib, + moppkgs, + osConfig, + pkgs, ... }: { @@ -31,7 +32,7 @@ unit = " "; }; formatter = { - command = lib.getExe pkgs.dnsfmt; + command = lib.getExe moppkgs.dnsfmt; }; } ]; diff --git a/common/hm/programs/helix/verilog.nix b/common/hm/programs/helix/verilog.nix index 0ceaab1..f494cb3 100644 --- a/common/hm/programs/helix/verilog.nix +++ b/common/hm/programs/helix/verilog.nix @@ -1,15 +1,16 @@ { - osConfig, config, - pkgs, lib, + moppkgs, + osConfig, + pkgs, ... }: { programs.helix = { - extraPackages = with pkgs; [ - slang-server # verilog/systemverilog - verible # verilog formatter + extraPackages = [ + moppkgs.slang-server # verilog/systemverilog + pkgs.verible # verilog formatter ]; languages = { language-server = { diff --git a/common/os/programs/steam.nix b/common/os/programs/steam.nix index 2bcac3e..c42fab1 100644 --- a/common/os/programs/steam.nix +++ b/common/os/programs/steam.nix @@ -1,7 +1,8 @@ { config, - pkgs, lib, + moppkgs, + pkgs, ... }: let @@ -28,7 +29,7 @@ in extraCompatPackages = [ pkgs.proton-ge-bin pkgs.steam-play-none - pkgs.proton-wineland-bin + moppkgs.proton-wineland-bin ]; }; }; diff --git a/common/os/services/bandcampsync.nix b/common/os/services/bandcampsync.nix index badad43..4ebb0f7 100644 --- a/common/os/services/bandcampsync.nix +++ b/common/os/services/bandcampsync.nix @@ -1,8 +1,9 @@ { - inputs, config, - pkgs, + inputs, lib, + moppkgs, + pkgs, ... }: let @@ -11,7 +12,7 @@ in { options.services.bandcampsync = { enable = lib.mkEnableOption "Enable bandcampsync service"; - package = lib.mkPackageOption pkgs "bandcampsync" { }; + package = lib.mkPackageOption moppkgs "bandcampsync" { }; user = lib.mkOption { type = lib.types.str; default = "bandcampsync"; diff --git a/hosts/kaoru/home/home.nix b/hosts/kaoru/home/home.nix index 9f61c22..9aa3461 100644 --- a/hosts/kaoru/home/home.nix +++ b/hosts/kaoru/home/home.nix @@ -1,19 +1,19 @@ { - osConfig, config, - pkgs, lib, + moppkgs, + osConfig, + pkgs, ... }: { home.packages = [ pkgs.wireshark - (pkgs.quartusPackages.pro.latestWithDevices [ "cyclone10gx" ]) pkgs.fiano pkgs.uefitoolPackages.old-engine pkgs.coreboot-utils pkgs.wineWow64Packages.full - pkgs.remanager + moppkgs.remanager ]; xdg.autostart.entries = lib.mkIf osConfig.services.asusd.enable [ @@ -40,7 +40,7 @@ userSettings = { "redhat.telemetry.enabled" = false; "vsc-webshark.sharkdFullPath" = "${pkgs.wireshark}/bin/sharkd"; - "slang.path" = "${lib.getExe pkgs.slang-server}"; + "slang.path" = "${lib.getExe moppkgs.slang-server}"; "workbench.editorAssociations" = { #"*.pcap" = "proto.pcapng"; "*.pcap" = "vsc-webshark.pcap"; diff --git a/hosts/yuhata/home/home.nix b/hosts/yuhata/home/home.nix index d3d5374..4e8d77f 100644 --- a/hosts/yuhata/home/home.nix +++ b/hosts/yuhata/home/home.nix @@ -1,10 +1,11 @@ { - osConfig, config, - pkgs, - unstable, inputs, lib, + moppkgs, + osConfig, + pkgs, + unstable, ... }: { @@ -15,17 +16,16 @@ qmk unstable.bambu-studio (limo.override { withUnrar = true; }) - veadotube + moppkgs.veadotube (heroic.override { extraPkgs = pkgs': [ pkgs'.gamescope pkgs'.scopebuddy pkgs'.wlr-randr pkgs'.jq - pkgs'.proton-wineland-bin + moppkgs.proton-wineland-bin ]; }) - # (pkgs.callPackage ../packages/brow6el.nix { }) wl-clipboard ]; programs = { diff --git a/hosts/yure/os/configuration.nix b/hosts/yure/os/configuration.nix index 3a58005..da3eda3 100644 --- a/hosts/yure/os/configuration.nix +++ b/hosts/yure/os/configuration.nix @@ -1,8 +1,9 @@ { config, - pkgs, inputs, lib, + moppkgs, + pkgs, ... }: { @@ -33,6 +34,6 @@ model = "thinkpad60"; }; environment.systemPackages = [ - pkgs.intel-sde + moppkgs.intel-sde ]; } diff --git a/nixosModules/sidonia.nix b/nixosModules/sidonia.nix index 5834f43..1db1457 100644 --- a/nixosModules/sidonia.nix +++ b/nixosModules/sidonia.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + moppkgs, ... }: let @@ -126,7 +127,10 @@ in apply = x: { inherit (x) enable; package = - if (isNull x.source) then pkgs.comic-code else (pkgs.comic-code.overrideAttrs { src = x.source; }); + if (isNull x.source) then + moppkgs.comic-code + else + (moppkgs.comic-code.overrideAttrs { src = x.source; }); name = if x.enable then if x.ligatures.enable then "Comic Code Ligatures" else "Comic Code" diff --git a/overlays.nix b/overlays.nix index df0063c..64efc85 100644 --- a/overlays.nix +++ b/overlays.nix @@ -14,20 +14,6 @@ in [ inputs.noctalia.overlays.default inputs.niri.overlays.niri-nix - (final: prev: { - inherit (inputs.moppkgs.packages.${getSystem prev}) - bandcampsync - comic-code - dnsfmt - intel-sde - leaf-markdown - proton-wineland-bin - quartusPackages - remanager - slang-server - veadotube - ; - }) ( final: prev: let -- 2.51.2