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

This commit is contained in:
Ivan Malison 2018-07-05 13:24:42 -07:00
commit 18d0248bcf
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 3 additions and 7 deletions

View File

@ -35,7 +35,6 @@ extra-deps:
- gio-0.13.4.1 - gio-0.13.4.1
- gtk-sni-tray-0.1.3.2 - gtk-sni-tray-0.1.3.2
- gtk-strut-0.1.2.1 - gtk-strut-0.1.2.1
- gtk-traymanager-1.0.1
- haskell-gi-0.21.2 - haskell-gi-0.21.2
- haskell-gi-base-0.21.1 - haskell-gi-base-0.21.1
- libxml-sax-0.7.5 - libxml-sax-0.7.5

@ -1 +1 @@
Subproject commit d6806c8cafe9a61370a62ef9c6493166ab4d99d7 Subproject commit 80bc3440144ad3e8697677fde7480b5501f14f98

View File

@ -17,14 +17,12 @@ import StatusNotifier.Tray
import System.Directory import System.Directory
import System.Environment import System.Environment
import System.FilePath.Posix import System.FilePath.Posix
import System.Glib.GObject
import System.IO import System.IO
import System.Log.Handler.Simple import System.Log.Handler.Simple
import System.Log.Logger import System.Log.Logger
import System.Process import System.Process
import System.Taffybar import System.Taffybar
import System.Taffybar.Auth import System.Taffybar.Auth
import System.Taffybar.Compat.GtkLibs
import System.Taffybar.DBus import System.Taffybar.DBus
import System.Taffybar.DBus.Toggle import System.Taffybar.DBus.Toggle
import System.Taffybar.Hooks import System.Taffybar.Hooks
@ -136,7 +134,6 @@ main = do
defaultWorkspacesConfig defaultWorkspacesConfig
{ underlineHeight = 3 { underlineHeight = 3
, underlinePadding = 2 , underlinePadding = 2
, minWSWidgetSize = Nothing
, minIcons = 3 , minIcons = 3
, getWindowIconPixbuf = myIcons , getWindowIconPixbuf = myIcons
-- , windowIconSize = 31 -- , windowIconSize = 31

View File

@ -1442,8 +1442,8 @@ 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)
(when (equal nil (server-running-p)) (server-start)) (when (equal nil (server-running-p)) (server-start)
(imalison:make-main-emacs-server))) (imalison:make-main-emacs-server))))
#+END_SRC #+END_SRC
** list-environment ** list-environment
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp