Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'prism/staging/jeschli'

Browse Source
This commit is contained in:
lassulus 2018-01-05 15:56:50 +01:00
commit d1f1bf8354
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeschli/1systems/bln/config.nix
View File

@ -54,7 +54,11 @@
# List packages installed in system profile. To search by name, run: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.shellAliases = { n = "nix-shell"; }; 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.variables = { GOROOT= [ "${pkgs.go.out}/share/go" ]; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# system helper # system helper
@ -62,6 +66,7 @@
copyq copyq
dmenu dmenu
git git
tig
i3lock i3lock
keepass keepass
networkmanagerapplet networkmanagerapplet
@ -72,6 +77,8 @@
rxvt_unicode rxvt_unicode
# editors # editors
emacs emacs
# databases
sqlite
# internet # internet
thunderbird thunderbird
hipchat hipchat
@ -91,6 +98,7 @@
jetbrains.pycharm-professional jetbrains.pycharm-professional
jetbrains.webstorm jetbrains.webstorm
jetbrains.goland jetbrains.goland
jetbrains.datagrip
texlive.combined.scheme-full texlive.combined.scheme-full
pandoc pandoc
redis redis

2
jeschli/1systems/brauerei/config.nix
View File

@ -96,7 +96,7 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# services.xserver.layout = "us"; services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";
# Enable touchpad support. # Enable touchpad support.

2
jeschli/source.nix
View File

@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/nixos/nixpkgs; url = https://github.com/nixos/nixpkgs;
ref = "f9390d6"; ref = "d83c808";
}; };
secrets.file = getAttr builder { secrets.file = getAttr builder {
buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>; buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>;