general: post-flakes cleanup

This commit is contained in:
Jez Cope 2021-05-24 11:54:34 +01:00
parent b0b28cdc6d
commit 3925e4193a
2 changed files with 6 additions and 27 deletions

View File

@ -4,19 +4,13 @@
{ config, pkgs, lib, ... }:
let
# local = import ./local.nix { inherit config pkgs lib; };
# hostName = local.networking.hostName;
# host-config = ./machines + "/${hostName}.nix";
# optionalPath = path: lib.lists.optional (builtins.pathExists path) path;
in {
imports = [
# <home-manager/nixos>
# ./hardware-configuration.nix
# ./local.nix
./cachix.nix
]; # ++ optionalPath host-config;
{
imports = [./cachix.nix];
# Temporary fixes !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#
# nixos-rebuild fails with memory allocation for gzip -d
# See https://github.com/NixOS/nixpkgs/issues/124215
documentation.info.enable = lib.mkForce false;
# Nix ######################################################################

View File

@ -20,22 +20,7 @@ in {
./modules/protonmail.nix
] ++ lib.lists.optional (pathExists host-config) host-config;
# nixpkgs.config = {
# allowUnfree = true;
# joypixels.acceptLicense = true;
# packageOverrides = pkgs:
# let mypkgs = import ../../nixexprs { inherit pkgs; };
# in {
# nur = import (builtins.fetchTarball
# "https://github.com/nix-community/NUR/archive/master.tar.gz") {
# inherit pkgs;
# };
# inherit (mypkgs) dart-sass;
# };
# };
home.username = "jez";
# home.homeDirectory = h;
home.stateVersion = "20.09";