diff options
| author | Alan Pearce | 2017-09-09 22:07:02 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-09-09 22:07:02 +0200 |
| commit | 8eb4aea9debd55b133bdad3c584c270c7367e62c (patch) | |
| tree | 394210f305e7d9d8945c1a2d4116beb468141f73 | |
| parent | d877dfd64c7ea9acb8131532700a58a4774452d0 (diff) | |
| parent | 2d522c9c0a0d33d151435a0aed6c48684dd678cd (diff) | |
| download | nixfiles-8eb4aea9debd55b133bdad3c584c270c7367e62c.tar.lz nixfiles-8eb4aea9debd55b133bdad3c584c270c7367e62c.tar.zst nixfiles-8eb4aea9debd55b133bdad3c584c270c7367e62c.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | marvin.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/marvin.nix b/marvin.nix index f82d2e6a..ca080fab 100644 --- a/marvin.nix +++ b/marvin.nix @@ -27,6 +27,7 @@ ./modules/passwords.nix ./modules/network-manager.nix ./modules/nix.nix + ./modules/window-manager.nix ./modules/i3.nix ]; |