Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2018-06-19 22:52:15 -07:00
commit 5f70c70914
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 7 additions and 4 deletions

View File

@ -149,6 +149,7 @@ in
feh feh
gnome3.gpaste gnome3.gpaste
kdeconnect kdeconnect
lxqt-powermanagement
networkmanagerapplet networkmanagerapplet
pasystray-appindicator pasystray-appindicator
pinentry pinentry
@ -177,6 +178,7 @@ in
# Tools # Tools
binutils binutils
dfeet
gcc gcc
gitFull gitFull
git-sync git-sync
@ -192,6 +194,7 @@ in
python-with-my-packages python-with-my-packages
qt5.qttools qt5.qttools
rcm rcm
scrot
silver-searcher silver-searcher
stow stow
tmux tmux

View File

@ -27,10 +27,10 @@
fsType = "ext4"; fsType = "ext4";
}; };
# fileSystems."/shared" = { fileSystems."/backups" = {
# device = "/dev/disk/by-uuid/4b6f1ca8-6b68-4bdb-b92c-d2d7ba080928"; device = "/dev/disk/by-uuid/752E628C67697A81";
# fsType = "ntfs"; fsType = "ntfs";
# }; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/a6933b22-c7f4-4c57-b330-1450f313922e"; } [ { device = "/dev/disk/by-uuid/a6933b22-c7f4-4c57-b330-1450f313922e"; }