diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index ecd1850..70d9557 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -53,8 +53,6 @@ in { ] ++ [ pkgs.libffi ]); - - staruml = callPackage ../../pkgs/staruml.nix { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; }; }; diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix index 1f6ffc0..ed3daed 100644 --- a/nix/home-manager/profiles/common.nix +++ b/nix/home-manager/profiles/common.nix @@ -7,25 +7,13 @@ in { programs.home-manager.enable = true; programs.home-manager.path = https://github.com/rycee/home-manager/archive/master.tar.gz; + nixpkgs.overlays = [ + (import ../../overlay.nix) + ]; + nixpkgs.config = { allowBroken = true; allowUnfree = true; - - # TODO: move this to a pkgs overlay - packageOverrides = pkgs: with pkgs; { - busyboxStatic = busybox.override { - enableStatic = true; - extraConfig = '' - CONFIG_STATIC y - CONFIG_INSTALL_APPLET_DONT y - CONFIG_INSTALL_APPLET_SYMLINKS n - ''; - }; - - dropbearStatic = dropbear.override { - enableStatic = true; - }; - }; }; home.keyboard = { diff --git a/nix/home-manager/programs/homeshick.nix b/nix/home-manager/programs/homeshick.nix index bb50b31..dc05362 100644 --- a/nix/home-manager/programs/homeshick.nix +++ b/nix/home-manager/programs/homeshick.nix @@ -3,7 +3,8 @@ , ... }: -let +let + # TODO: clean up the impurity in here in { home.sessionVariables = { diff --git a/nix/os/profiles/common/pkg.nix b/nix/os/profiles/common/pkg.nix index 9e80867..720fcd8 100644 --- a/nix/os/profiles/common/pkg.nix +++ b/nix/os/profiles/common/pkg.nix @@ -11,14 +11,6 @@ allowUnfree = true; packageOverrides = pkgs: with pkgs; { - busyboxStatic = busybox.override { - enableStatic = true; - extraConfig = '' - CONFIG_STATIC y - CONFIG_INSTALL_APPLET_DONT y - CONFIG_INSTALL_APPLET_SYMLINKS n - ''; - }; }; }; @@ -43,5 +35,7 @@ usbutils pciutils + + podman ]; } diff --git a/nix/overlay.nix b/nix/overlay.nix index 1d13c4f..0306421 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -1,5 +1,26 @@ -self: super: { - duplicay = super.callPackage ./pkgs/duplicacy {}; - mfcl3770cdw = super.callPackage ./pkgs/mfcl3770cdw.nix {}; +let + nixpkgs-master = import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs-channels/archive/de5fd9e6110489722e8667664dce9fdc17331866.tar.gz"; + sha256 = "0z1j2pmvn15m2ir2i9l2prr81cq7f1x8xs4cv2s7q4fslz586ghn"; + }) {}; + +in self: super: { + podman = nixpkgs-master.podman; + + duplicacy = super.callPackage ./pkgs/duplicacy {}; just = super.callPackage ./pkgs/just.nix {}; + mfcl3770cdw = super.callPackage ./pkgs/mfcl3770cdw.nix {}; + staruml = super.callPackage ./pkgs/staruml.nix { inherit (super.gnome2) GConf; libgcrypt = super.libgcrypt_1_5; }; + + busyboxStatic = super.busybox.override { + enableStatic = true; + extraConfig = '' + CONFIG_STATIC y + CONFIG_INSTALL_APPLET_DONT y + CONFIG_INSTALL_APPLET_SYMLINKS n + ''; + }; + dropbearStatic = super.dropbear.override { + enableStatic = true; + }; }