[Emacs] Fix inverted server start condition

This commit is contained in:
Ivan Malison 2018-06-14 15:16:17 -07:00
parent 4c5625bb7d
commit ef83a4b890
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 32 additions and 3 deletions

View File

@ -1440,7 +1440,7 @@ The file server file for this emacs instance no longer exists.")
(let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))) (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)))
(expand-file-name server-name server-dir))) (expand-file-name server-name server-dir)))
(setq server-use-tcp t) (setq server-use-tcp t)
(unless (equal nil (server-running-p)) (server-start)) (when (equal nil (server-running-p)) (server-start))
(run-with-timer 0 60 'imalison:make-main-emacs-server))) (run-with-timer 0 60 'imalison:make-main-emacs-server)))
#+END_SRC #+END_SRC
** list-environment ** list-environment

View File

@ -0,0 +1,5 @@
#!/usr/bin/env sh
git config --bool branch.master.sync true
git config --bool branch.master.syncNewFiles true
git branch --set-upstream-to=origin/master

View File

@ -0,0 +1,11 @@
#!/usr/bin/env bash
cd "$1"
echo "Syncing $1"
git-sync
enable_git_sync.sh
while changedFile=$(inotifywait ./ -r -e modify,move,create,delete --format "%w%f" --exclude '\.git' 2>/dev/null); do
git check-ignore "$changedFile" >> /dev/null || git-sync
done

View File

@ -10,9 +10,16 @@ let
pip pip
]; ];
python-with-my-packages = pkgs.python3.withPackages my-python-packages; python-with-my-packages = pkgs.python3.withPackages my-python-packages;
# clipit-master = pkgs.clipt.overrideAttrs (oldAttrs: rec {
# src = fetchFromGitHub {
# owner = "shantzu";
# repo = "ClipIt";
# rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
# sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
# };
# });
in in
{ {
boot.loader.systemd-boot.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -76,12 +83,13 @@ in
clipit clipit
compton compton
feh feh
sddm-kcm
networkmanagerapplet networkmanagerapplet
pinentry pinentry
pommed_light pommed_light
rofi rofi
rofi-pass rofi-pass
sddm-kcm
udiskie
volnoti volnoti
xclip xclip
xdotool xdotool
@ -107,6 +115,7 @@ in
gnumake gnumake
gnupg gnupg
htop htop
inotify-tools
ncdu ncdu
pass pass
python-with-my-packages python-with-my-packages
@ -117,7 +126,11 @@ in
wget wget
zsh zsh
# Nix
nix-prefetch-git
# Miscellaneous # Miscellaneous
android-udev-rules
librsvg librsvg
]; ];