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

This commit is contained in:
Ivan Malison 2018-06-17 03:17:41 -07:00
commit 697b43b58c
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 34 additions and 29 deletions

View File

@ -1443,7 +1443,7 @@ The file server file for this emacs instance no longer exists.")
(expand-file-name server-name server-dir)))
(setq server-use-tcp t)
(when (equal nil (server-running-p)) (server-start))
(run-with-timer 0 60 'imalison:make-main-emacs-server)))
(imalison:make-main-emacs-server)))
#+END_SRC
** list-environment
#+BEGIN_SRC emacs-lisp
@ -1649,11 +1649,17 @@ custom-set-faces in your custom file.
(let ((frame-mode-use-new-frame-or-window t))
(imalison:named-compile "stack build")))
(defun imalison:stack-build ()
(interactive)
(let ((frame-mode-use-new-frame-or-window t))
(imalison:named-compile "nix-build default.nix")))
(defhydra imalison:compile nil "Compile"
("p" imalison:projectile-helm-command-from-zsh "Run a command in projectile root")
("d" helm-command-from-zsh "Run a command in default directory")
("c" imalison:named-compile "Enter Custom Command")
("s" imalison:stack-build "Stack build")
("n" imalison:nix-build "Nix build")
("t" imalison:make-test "Test")
("u" imalison:glide-up "Update Dependencies"))
;; The following parens close the use-package/progn created several blocks above
@ -2551,6 +2557,10 @@ eval-last-sexp.
(progn
(setq nix-indent-function 'nix-indent-line)))
#+END_SRC
#+BEGIN_SRC emacs-lisp
(use-package nix-update
:after nix)
#+END_SRC
*** clojure
The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877bea582fed72bbca0dc1f80fcb2ec0e6d5/layers/+lang/clojure/funcs.el#L30][spacemacs]]. It adds fancification to a clojure mode.
#+BEGIN_SRC emacs-lisp
@ -4268,8 +4278,10 @@ I had to disable this mode because something that it does messes with coding set
(add-hook 'prog-mode-hook (lambda () (rainbow-delimiters-mode t)))))
#+END_SRC
** undo-tree
Disabled because it makes it hard to redo things
#+BEGIN_SRC emacs-lisp
(use-package undo-tree
:disabled t
:bind (("C--" . undo-redo)
("C-c u" . undo-tree-visualize)
("C-c r" . undo-tree-redo))
@ -4286,6 +4298,7 @@ I had to disable this mode because something that it does messes with coding set
** recentf
#+BEGIN_SRC emacs-lisp
(use-package recentf
:demand t
:config
(progn
(setq recentf-max-saved-items 1000

View File

@ -20,14 +20,21 @@ let
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [pkgs.libappindicator-gtk3];
});
# clipit-master = pkgs.clipt.overrideAttrs (oldAttrs: rec {
# src = fetchFromGitHub {
# owner = "shantzu";
# repo = "ClipIt";
# rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
# sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
# };
# });
clipit-master = pkgs.clipit.overrideAttrs (oldAttrs: rec {
version = "9741c39382a3f6e4c03eac6905a49794d07c465a";
preConfigure = "./autogen.sh";
configureFlags = ["--with-gtk3" "--enable-appindicator"];
src = pkgs.fetchFromGitHub {
owner = "IvanMalison";
repo = "ClipIt";
sha256 = "13lddvbsp16nir9ibllr403qxhwyh4h2bh6774icbb250pghykjx";
rev = version;
};
buildInputs = with pkgs; [
autoconf automake intltool gtk3 xdotool hicolor-icon-theme
libappindicator-gtk3
];
});
in
{
nixpkgs.config.allowUnfree = true;
@ -92,9 +99,10 @@ in
# Desktop
autorandr
clipit
clipit-master
compton
feh
gnome3.gpaste
networkmanagerapplet
pinentry
pommed_light
@ -104,6 +112,7 @@ in
volnoti
xclip
xdotool
# haskellPackages.status-notifier-item
xorg.xkbcomp
xsettingsd
@ -130,6 +139,7 @@ in
ncdu
pass
python-with-my-packages
# qttools
rcm
silver-searcher
stow
@ -151,27 +161,9 @@ in
GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
# List services that you want to enable:
# Enable the OpenSSH daemon.
services.openssh.enable = true;
services.kbfs.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable sound.
services.avahi.enable = true;
sound.enable = true;
hardware.pulseaudio.enable = true;