diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop.nix | 2 | ||||
| -rw-r--r-- | modules/disk.nix | 2 | ||||
| -rw-r--r-- | modules/network.nix | 5 | ||||
| -rw-r--r-- | modules/xnet/default.nix | 8 |
4 files changed, 10 insertions, 7 deletions
diff --git a/modules/desktop.nix b/modules/desktop.nix index 747c302..b098020 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -38,8 +38,6 @@ in # Spell checking aspell aspellDicts.en - aspellDicts.en-science - aspellDicts.en-computers hunspell hunspellDicts.en-us diff --git a/modules/disk.nix b/modules/disk.nix index bf4a9a8..a8f7fbf 100644 --- a/modules/disk.nix +++ b/modules/disk.nix @@ -61,7 +61,6 @@ in kernelParams = [ "nohibernate" "elevator=none" - "rd.systemd.unit=rescue.target" ]; supportedFilesystems = [ "vfat" @@ -145,7 +144,6 @@ in ''; }; - boot.initrd.systemd.emergencyAccess = true; boot.initrd.systemd.initrdBin = [ pkgs.cloud-utils pkgs.util-linux diff --git a/modules/network.nix b/modules/network.nix index 8264102..e9383c2 100644 --- a/modules/network.nix +++ b/modules/network.nix @@ -3,6 +3,8 @@ let cfg = config.depot.net; inherit (lib) mkOption + mkEnableOption + mkIf types ; @@ -27,6 +29,7 @@ in ]; options.depot.net = { + enable = mkEnableOption "depot networking"; v6Token = mkOption { type = types.str; default = "eui64"; @@ -34,7 +37,7 @@ in }; }; - config = { + config = mkIf cfg.enable { # networkd handles this networking.useDHCP = false; diff --git a/modules/xnet/default.nix b/modules/xnet/default.nix index 67bbbe5..415fc0b 100644 --- a/modules/xnet/default.nix +++ b/modules/xnet/default.nix @@ -45,14 +45,15 @@ in time.timeZone = mkDefault "US/Pacific"; nix = { - nixPath = mkForce [ "nixpkgs=${pkgs.path}" ]; settings = { auto-optimise-store = true; + nix-path = mkForce [ "nixpkgs=${pkgs.path}" ]; experimental-features = [ "nix-command" "flakes" "pipe-operators" ]; + warn-dirty = false; # timeout fast from binary cache @@ -62,7 +63,7 @@ in automatic = true; options = mkDefault "--delete-older-than 30d"; }; - # registry.nixpkgs.flake = pkgs.path; + registry.nixpkgs.flake.outPath = "path:${pkgs.path}"; }; documentation = { @@ -99,6 +100,9 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmWInQNT6EoU1NtUYzTs5jtpfbO/m6yvCckOiEGjvDc"; }; extraConfig = '' + Host * + SetEnv TERM=xterm-256color + Host github HostName github.com User git |