diff options
| author | nin <nin@c-base.org> | 2018-02-11 16:11:08 +0100 |
|---|---|---|
| committer | nin <nin@c-base.org> | 2018-02-11 16:11:08 +0100 |
| commit | f20bf1a7ba146b3ffe3f2e470614d12885cbce61 (patch) | |
| tree | 092a5e5864814a42b854937a06b8d1ecb8a74402 /jeschli/1systems/bln | |
| parent | 6849d7aa4810d5f1f2ec55d852d21812dd1b8002 (diff) | |
| parent | dbd48fdbf91672dc96992ee0b55ad1da226d4199 (diff) | |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'jeschli/1systems/bln')
| -rw-r--r-- | jeschli/1systems/bln/config.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 9c491c8a1..8a3090a49 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -3,16 +3,17 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, lib, pkgs, ... }: - +# bln config file { imports = [ # Include the results of the hardware scan. <stockholm/jeschli> <stockholm/jeschli/2configs/virtualbox.nix> + <stockholm/jeschli/2configs/urxvt.nix> ./hardware-configuration.nix # ./dcso-vpn.nix ]; - + jeschliFontSize = 20; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; @@ -36,7 +37,15 @@ allowDiscards = true; } ]; - + environment.shellAliases = { + n = "nix-shell"; + gd = "cd /home/markus/go/src/gitlab.dcso.lolcat"; + gh = "cd /home/markus/go/src/github.com"; + stocki = pkgs.writeDash "deploy" '' + cd ~/stockholm + LOGNAME=jeschli exec nix-shell -I stockholm="$PWD" --run 'deploy --system="bln"' + ''; + }; networking.hostName = lib.mkForce "BLN02NB0154"; # Define your hostname. networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -55,13 +64,9 @@ # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget nixpkgs.config.allowUnfree = true; - environment.shellAliases = { - n = "nix-shell"; - gd = "cd /home/markus/go/src/gitlab.dcso.lolcat"; - gh = "cd /home/markus/go/src/github.com"; - }; environment.variables = { GOROOT= [ "${pkgs.go.out}/share/go" ]; }; environment.systemPackages = with pkgs; [ + termite # system helper ag copyq @@ -86,6 +91,7 @@ chromium google-chrome # programming languages + elmPackages.elm go gcc ghc |