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

This commit is contained in:
Ivan Malison 2019-01-11 00:18:53 -08:00
commit 483cf0b379
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
17 changed files with 57 additions and 41 deletions

View File

@ -6,7 +6,7 @@ After=status-notifier-watcher.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env alarm-clock-applet ExecStart=/usr/bin/env alarm-clock-applet
ExecStop=/usr/bin/pkill alarm-clock-applet ExecStop=/usr/bin/env pkill alarm-clock-applet
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -6,7 +6,7 @@ After=taffybar.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env chromix-too-server ExecStart=/usr/bin/env chromix-too-server
ExecStop=/usr/bin/pkill chromix-too ExecStop=/usr/bin/env pkill chromix-too
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -6,7 +6,7 @@ After=taffybar.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env notifications-tray-icon --github-token-pass github-token ExecStart=/usr/bin/env notifications-tray-icon --github-token-pass github-token
ExecStop=/usr/bin/pkill 'notifications-tray-icon --github-token-pass github-token' ExecStop=/usr/bin/env pkill 'notifications-tray-icon --github-token-pass github-token'
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -6,7 +6,7 @@ After=taffybar.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env kdeconnect-indicator ExecStart=/usr/bin/env kdeconnect-indicator
ExecStop=/usr/bin/pkill kdeconnect-indicator ExecStop=/usr/bin/env pkill kdeconnect-indicator
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -4,7 +4,7 @@ Description=mopidy
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env mopidy ExecStart=/usr/bin/env mopidy
ExecStop=/usr/bin/pkill mopidy ExecStop=/usr/bin/env pkill mopidy
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -6,7 +6,7 @@ After=taffybar.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env skippy-xd --start-daemon ExecStart=/usr/bin/env skippy-xd --start-daemon
ExecStop=/usr/bin/pkill skippy-xd ExecStop=/usr/bin/env pkill skippy-xd
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -4,7 +4,7 @@ Description=status-notifier-watcher
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env status-notifier-watcher ExecStart=/usr/bin/env status-notifier-watcher
ExecStop=/usr/bin/pkill status-notifier-watcher ExecStop=/usr/bin/env pkill status-notifier-watcher
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -4,7 +4,7 @@ Description=volnoti
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env volnoti -n -v ExecStart=/usr/bin/env volnoti -n -v
ExecStop=/usr/bin/pkill volnoti ExecStop=/usr/bin/env pkill volnoti
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -3,7 +3,7 @@ Description=X Settings Daemon
[Service] [Service]
ExecStart=/usr/bin/env xsettingsd-setup ExecStart=/usr/bin/env xsettingsd-setup
ExecStop=/usr/bin/pkill xsettingsd ExecStop=/usr/bin/env pkill xsettingsd
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -14,8 +14,8 @@ executable imalison-taffybar
hs-source-dirs: . hs-source-dirs: .
main-is: taffybar.hs main-is: taffybar.hs
ghc-options: -threaded -rtsopts -with-rtsopts=-N ghc-options: -threaded -rtsopts -with-rtsopts=-N
-- ghc-options: -threaded -debug -g -- ghc-options: -threaded -g -rtsopts
-- cpp-options: +RTS -DS ghc-prof-options: -fprof-auto
build-depends: base build-depends: base
, X11>=1.8 , X11>=1.8
, bytestring , bytestring

@ -1 +1 @@
Subproject commit 307c17bc9cac041c8a3dffc00e89139d2ada7fbd Subproject commit d49e8dfa229b42e654bc18f4801aff061919c751

View File

@ -1,4 +1,3 @@
{-# LANGUAGE PackageImports #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
module Main where module Main where
@ -100,10 +99,6 @@ logDebug = do
workspacesLogger <- getLogger "System.Taffybar.Widget.Workspaces" workspacesLogger <- getLogger "System.Taffybar.Widget.Workspaces"
saveGlobalLogger $ setLevel WARNING workspacesLogger saveGlobalLogger $ setLevel WARNING workspacesLogger
-- github = do
-- Right (token, _) <- passGet "github-token"
-- githubNotificationsNew $ defaultGithubConfig $ Auth.OAuth $ BS.pack token
main = do main = do
homeDirectory <- getHomeDirectory homeDirectory <- getHomeDirectory
-- logDebug -- logDebug
@ -116,15 +111,8 @@ main = do
highContrastDirectory = highContrastDirectory =
"/" </> "usr" </> "share" </> "icons" </> "HighContrast" </> "256x256" "/" </> "usr" </> "share" </> "icons" </> "HighContrast" </> "256x256"
inHighContrastDirectory file = highContrastDirectory </> file inHighContrastDirectory file = highContrastDirectory </> file
getIconFileName w@WindowData {windowTitle = title, windowClass = klass}
-- | "URxvt" `isInfixOf` klass = Just "urxvt.png"
-- | "Termite" `isInfixOf` klass = Just "urxvt.png"
-- | "Kodi" `isInfixOf` klass = Just "kodi.png"
| "@gmail.com" `isInfixOf` title &&
"chrome" `isInfixOf` klass && "Gmail" `isInfixOf` title =
Just "gmail.png"
| otherwise = Nothing
myIcons = scaledWindowIconPixbufGetter $ myIcons = scaledWindowIconPixbufGetter $
getWindowIconPixbufFromChrome <|||>
unscaledDefaultGetWindowIconPixbuf <|||> unscaledDefaultGetWindowIconPixbuf <|||>
(\size _ -> lift $ loadPixbufByName size "application-default-icon") (\size _ -> lift $ loadPixbufByName size "application-default-icon")
cpu = pollingGraphNew cpuCfg 0.5 cpuCallback cpu = pollingGraphNew cpuCfg 0.5 cpuCallback
@ -156,12 +144,11 @@ main = do
, batteryIconNew , batteryIconNew
, textClockNew Nothing "%a %b %_d %r" 1 , textClockNew Nothing "%a %b %_d %r" 1
, sniTrayNew , sniTrayNew
-- , github
, cpu , cpu
, mem , mem
, networkGraphNew netCfg Nothing , networkGraphNew netCfg Nothing
-- , networkMonitorNew defaultNetFormat Nothing >>= setMinWidth 200 -- , networkMonitorNew defaultNetFormat Nothing >>= setMinWidth 200
-- , fsMonitorNew 60 ["/dev/sdd2"] -- , fsMonitorNew 60 ["/dev/sdd2"]
, mpris2New , mpris2New
] ]
, barPosition = Top , barPosition = Top
@ -169,9 +156,10 @@ main = do
, barHeight = 45 , barHeight = 45
} }
simpleTaffyConfig = baseConfig simpleTaffyConfig = baseConfig
-- { endWidgets = [] { centerWidgets = map (>>= buildContentsBox) []
-- , endWidgets = map (>>= buildContentsBox) [ sniTrayNew, mpris2New ]
-- , startWidgets = [flip widgetSetClass "Workspaces" =<< workspaces] -- , startWidgets = [flip widgetSetClass "Workspaces" =<< workspaces]
-- } }
startTaffybar $ startTaffybar $
appendHook notifySystemD $ appendHook notifySystemD $
appendHook (void $ getHost False) $ appendHook (void $ getHost False) $

View File

@ -5,6 +5,7 @@
'( '(
TeX-insert-backslash TeX-insert-backslash
backward-sexp backward-sexp
beginning-of-buffer
beginning-of-visual-line beginning-of-visual-line
c-electric-delete-forward c-electric-delete-forward
c-electric-semi&comma c-electric-semi&comma

View File

@ -286,13 +286,16 @@ This had to be disabled because it was causing a bunch of issues with projectile
This solution only applies it to projectile-find-file This solution only applies it to projectile-find-file
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun imalison:call-with-quick-shell-command (fn &rest args) (defun imalison:call-with-quick-shell-command (fn &rest args)
(noflet ((shell-command-to-string (&rest args) (noflet
(or (apply 'imalison:try-call-process args) (apply this-fn args)))) ((shell-command-to-string (&rest args)
(condition-case _e
(or (apply 'imalison:try-call-process args) (apply this-fn args))
(error (apply this-fn args)))))
(apply fn args))) (apply fn args)))
(advice-add 'projectile-find-file :around 'imalison:call-with-quick-shell-command) ;; I've had to disable this becuase newer versions of projectile use a ton of shell commands
;; (advice-add 'projectile-files-via-ext-command :around 'imalison:call-with-quick-shell-command)
#+END_SRC #+END_SRC
** Set EMACS environment variable ** Set EMACS environment variable
Emacs cask seems to depend on the EMACS environment variable being set to the Emacs cask seems to depend on the EMACS environment variable being set to the
@ -1585,6 +1588,7 @@ custom-set-faces in your custom file.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package highlight-indent-guides (use-package highlight-indent-guides
:commands highlight-indent-guides-mode :commands highlight-indent-guides-mode
:diminish highlight-indent-guides-mode
:preface :preface
(progn (progn
(add-hook 'prog-mode-hook 'highlight-indent-guides-mode)) (add-hook 'prog-mode-hook 'highlight-indent-guides-mode))
@ -1763,7 +1767,6 @@ bind-key and global-set-key forms.
I use helm for almost all emacs completion I use helm for almost all emacs completion
#+BEGIN_SRC emacs-lisp -n -r #+BEGIN_SRC emacs-lisp -n -r
(use-package helm-config (use-package helm-config
:demand t
:diminish helm-mode :diminish helm-mode
:straight helm :straight helm
:bind (("M-y" . helm-show-kill-ring) :bind (("M-y" . helm-show-kill-ring)
@ -1771,11 +1774,11 @@ I use helm for almost all emacs completion
("C-x C-i" . helm-imenu) ("C-x C-i" . helm-imenu)
("C-h a" . helm-apropos) ("C-h a" . helm-apropos)
("C-c ;" . helm-recentf)) ("C-c ;" . helm-recentf))
:diminish helm-mode
:config :config
(progn (progn
(setq helm-split-window-default-side 'same (setq helm-split-window-default-side 'same
helm-exit-idle-delay 0) helm-exit-idle-delay 0)
(use-package helm-org (use-package helm-org
:straight nil :straight nil
:defer 10 :defer 10
@ -2822,8 +2825,7 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package lsp-haskell (use-package lsp-haskell
:config :config
(when (executable-find "hie") (add-hook 'haskell-mode-hook 'lsp))
(add-hook 'haskell-mode-hook 'lsp-haskell-enable)))
#+END_SRC #+END_SRC
**** intero **** intero
Intero seems to be causing hangs, so it has been disabled Intero seems to be causing hangs, so it has been disabled
@ -3972,9 +3974,12 @@ emr (emacs refactor) provides support for refactoring in many programming langua
** language-server-protocol (lsp) ** language-server-protocol (lsp)
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package lsp-mode (use-package lsp-mode
:commands lsp-mode
:config :config
(progn (progn
(setq lsp-prefer-flymake nil)
(use-package lsp-ui
:config
(add-hook 'lsp-mode-hook 'lsp-ui-mode))
(require 'lsp-clients) (require 'lsp-clients)
(add-hook 'programming-mode-hook 'lsp))) (add-hook 'programming-mode-hook 'lsp)))
#+END_SRC #+END_SRC
@ -4292,6 +4297,7 @@ I had to disable this mode because something that it does messes with coding set
** dtrt-indent ** dtrt-indent
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package dtrt-indent (use-package dtrt-indent
:diminish 'dtrt-indent-mode
:commands 'dtrt-indent-mode :commands 'dtrt-indent-mode
:init (add-hook 'prog-mode-hook 'dtrt-indent-mode) :init (add-hook 'prog-mode-hook 'dtrt-indent-mode)
:config :config

12
nixos/cachix.nix Normal file
View File

@ -0,0 +1,12 @@
{
nix = {
binaryCaches = [
"https://cache.nixos.org/"
"https://hie-nix.cachix.org"
];
binaryCachePublicKeys = [
"hie-nix.cachix.org-1:EjBSHzF6VmDnzqlldGXbi0RM3HdjfTU3yDRi9Pd0jTY="
];
trustedUsers = [ "root" "imalison" "kat" ];
};
}

View File

@ -175,6 +175,7 @@ in
patchelf patchelf
plasma-workspace plasma-workspace
powertop powertop
pscircle
python-with-my-packages python-with-my-packages
qt5.qttools qt5.qttools
rcm rcm
@ -215,6 +216,7 @@ in
programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
programs.adb.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
services.avahi = { services.avahi = {
enable = true; enable = true;
@ -271,7 +273,13 @@ in
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.extraUsers = let users.extraUsers = let
extraGroups = [ extraGroups = [
"wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "audio"
"adbusers"
"disk"
"networkmanager"
"systemd-journal"
"video"
"wheel"
]; ];
userDefaults = { userDefaults = {
inherit extraGroups; inherit extraGroups;
@ -295,5 +303,5 @@ in
}; };
}; };
system.nixos.stateVersion = "18.03"; system.stateVersion = "18.03";
} }

View File

@ -5,6 +5,7 @@
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../configuration.nix ../configuration.nix
../games.nix ../games.nix
../cachix.nix
../extra.nix ../extra.nix
]; ];