colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Malison 2018-06-17 03:27:15 -07:00
commit ed2c96fc70
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/configuration.nix
View File

@ -113,17 +113,18 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Applications # Applications
google-chrome emacs
firefox firefox
google-chrome
hexchat hexchat
keybase-gui
kodi kodi
vlc rxvt_unicode
xfce.thunar
spotify spotify
steam steam
termite termite
rxvt_unicode vlc
emacs xfce.thunar
# Appearance # Appearance
numix-icon-theme-circle numix-icon-theme-circle
@ -201,8 +202,6 @@ in
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
environment.loginShellInit = ". ~/.lib/nix_login.sh";
services.xserver = { services.xserver = {
exportConfiguration = true; exportConfiguration = true;
enable = true; enable = true;

13
tasks/shell/enable_user_units.sh
View File

@ -1,15 +1,20 @@
#!/usr/bin/env sh #!/usr/bin/env sh
enable_git_sync () { enable_git_sync () {
[ -e "$1" ] || git clone $2 $1
unit_name=$(systemd-escape -p "$1" --template git-sync@.service) unit_name=$(systemd-escape -p "$1" --template git-sync@.service)
echo $unit_name echo $unit_name
cd $1
git config --bool branch.master.sync true
git config --bool branch.master.syncNewFiles true
git branch --set-upstream-to=origin/master
systemctl --user enable "$unit_name" systemctl --user enable "$unit_name"
systemctl --user restart "$unit_name"
} }
cd "$HOME/.config/systemd/user/" cd "$HOME/.config/systemd/user/"
find * -type f | grep -v git-sync | grep -E "\.service$" | xargs -I unitname sh -c 'echo unitname && systemctl --user enable unitname' find * -type f | grep -v git-sync | grep -E "\.service$" | xargs -I unitname sh -c 'echo unitname && systemctl --user enable unitname'
enable_git_sync "$HOME/org" enable_git_sync "$HOME/org" git@bitbucket.org:ivanmalison/org.git
enable_git_sync "$HOME/config" enable_git_sync "$HOME/config" git@bitbucket.org:ivanmalison/config.git
enable_git_sync "$HOME/.password-store" enable_git_sync "$HOME/.password-store" git@bitbucket.org:ivanmalison/pass.git