steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into 'master'

Browse source 
Staging

See merge request steveeJ/infra!12
This commit is contained in:
steveej 2019-01-26 23:30:07 +00:00
commit b50f4ebd73
5 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -53,8 +53,6 @@ in {
] ++ [ ] ++ [
pkgs.libffi pkgs.libffi
]); ]);
staruml = callPackage ../../pkgs/staruml.nix { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
}; };
}; };

20
nix/home-manager/profiles/common.nix
View file

@ -7,25 +7,13 @@ in {
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.home-manager.path = https://github.com/rycee/home-manager/archive/master.tar.gz; programs.home-manager.path = https://github.com/rycee/home-manager/archive/master.tar.gz;
nixpkgs.overlays = [
(import ../../overlay.nix)
];
nixpkgs.config = { nixpkgs.config = {
allowBroken = true; allowBroken = true;
allowUnfree = 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 = { home.keyboard = {

3
nix/home-manager/programs/homeshick.nix
View file

@ -3,7 +3,8 @@
, ... , ...
}: }:
let let
# TODO: clean up the impurity in here
in { in {
home.sessionVariables = { home.sessionVariables = {

10
nix/os/profiles/common/pkg.nix
View file

@ -11,14 +11,6 @@
allowUnfree = true; allowUnfree = true;
packageOverrides = pkgs: with pkgs; { 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 usbutils
pciutils pciutils
podman
]; ];
} }

27
nix/overlay.nix
View file

@ -1,5 +1,26 @@
self: super: { let
duplicay = super.callPackage ./pkgs/duplicacy {}; nixpkgs-master = import (builtins.fetchTarball {
mfcl3770cdw = super.callPackage ./pkgs/mfcl3770cdw.nix {}; 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 {}; 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;
};
} }