diff options
| author | tv <tv@krebsco.de> | 2020-06-02 23:35:17 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-06-02 23:35:17 +0200 |
| commit | 09c9f8f7fb04be39390b6f65966789c1bf6333e5 (patch) | |
| tree | b0cb0f718b40517b0645a38169e67b1088566f64 | |
| parent | 09e620c79b70e495e9651e8e5c1b160dd1b5fb8d (diff) | |
| parent | 211e2ca6b9a1d8b4dd92071065b0b595123fe282 (diff) | |
Merge remote-tracking branch 'prism/master'
125 files changed, 1499 insertions, 1972 deletions
diff --git a/.gitmodules b/.gitmodules index aee01051a..7ecb497ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,6 @@ [submodule "lass/5pkgs/autowifi"] path = lass/5pkgs/autowifi url = https://github.com/Lassulus/autowifi -[submodule "submodules/brockman"] - path = submodules/brockman - url = https://github.com/kmein/brockman.git +[submodule "jeschli/2configs/elisp"] + path = jeschli/2configs/elisp + url = https://github.com/Jeschli/misc-elisp-scripts.git diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix index 7596f17d6..dec69563f 100644 --- a/jeschli/1systems/reagenzglas/config.nix +++ b/jeschli/1systems/reagenzglas/config.nix @@ -7,6 +7,7 @@ <stockholm/jeschli/2configs/emacs.nix> <stockholm/jeschli/2configs/firefox.nix> <stockholm/jeschli/2configs/rust.nix> + <stockholm/jeschli/2configs/steam.nix> <stockholm/jeschli/2configs/python.nix> ./desktop.nix ./i3-configuration.nix @@ -36,10 +37,19 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - wget vim git - rofi ag alacritty + google-chrome + chromium + copyq + d |