summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2017-02-11 18:57:55 -0500
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2017-02-11 18:57:55 -0500
commit3bbb2dba0255e25b079eb829f7bd196b552ff02e (patch)
tree9fbca458bdbafc013535d0fabc8ad9e806a2f1eb
parenta3fad8e422db175b476588e3c41259a450ed0076 (diff)
Random updates.
-rw-r--r--Xresources-pincer4
-rw-r--r--nixos/configuration.nix11
-rw-r--r--nixos/shell.nix1
-rw-r--r--spacemacs5
-rwxr-xr-xxsession1
5 files changed, 16 insertions, 6 deletions
diff --git a/Xresources-pincer b/Xresources-pincer
index 23e1128..1ab3e06 100644
--- a/Xresources-pincer
+++ b/Xresources-pincer
@@ -1,6 +1,6 @@
*customization: -color
-urxvt*font: xft:fira code:pixelsize=20:antialias=true
-urxvt*font: xft:inconsolata:size=14:antialias=true
+!urxvt*font: xft:fira code:pixelsize=22:antialias=true
+urxvt*font: xft:inconsolata:size=18:antialias=true
urxvt*scrollBar: false
URxvt*termName: xterm-256color
Xterm*termName: xterm-256color
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 64fda3a..4c35cfe 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -4,6 +4,8 @@
hardware.bluetooth.enable = true;
hardware.pulseaudio.enable = true;
hardware.pulseaudio.package = pkgs.pulseaudioFull;
+ hardware.pulseaudio.tcp.enable = true;
+ hardware.pulseaudio.tcp.anonymousClients.allowAll = true;
hardware.enableAllFirmware = true;
boot.cleanTmpDir = true;
@@ -95,7 +97,6 @@
unzip
linssid
lxc
- gnupg1
nix-repl
youtube-dl
vlc
@@ -106,8 +107,14 @@
haskellPackages.hledger
haskellPackages.hledger-ui
haskellPackages.hledger-web
- haskellPackages.hledger-vty
+ haskellPackages.hledger-iadd
moreutils
+ ledger
+ xorg.xhost
+ binutils
+ pandoc
+
+ # (callPackage ./stardew-valley.nix {})
#temporary
debootstrap
diff --git a/nixos/shell.nix b/nixos/shell.nix
index 25fe51a..654ec78 100644
--- a/nixos/shell.nix
+++ b/nixos/shell.nix
@@ -4,4 +4,5 @@ with import nixpkgs {};
{
vlc-nightly = callPackage ./vlc-nightly.nix {};
+ stardew-valley = callPackage ./stardew-valley.nix {};
}
diff --git a/spacemacs b/spacemacs
index 09a613f..bf6271b 100644
--- a/spacemacs
+++ b/spacemacs
@@ -35,6 +35,7 @@ values."
markdown
haskell
git
+ finance
rust
markdown
org
@@ -104,7 +105,7 @@ values."
dotspacemacs-colorize-cursor-according-to-state t
;; Default font. `powerline-scale' allows to quickly tweak the mode-line
;; size to make separators look not too crappy.
- dotspacemacs-default-font '("Fira Code"
+ dotspacemacs-default-font '("Inconsolata"
:size 20
:weight normal
:width normal
@@ -308,7 +309,7 @@ layers configuration. You are free to put any user code."
;; If there is more than one, they won't work right.
'(package-selected-packages
(quote
- (toml-mode racer rust-mode smeargle orgit magit-gitflow helm-gitignore request gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger evil-magit magit magit-popup git-commit with-editor xterm-color ws-butler window-numbering web-mode web-beautify volatile-highlights vi-tilde-fringe toc-org tern tagedit spacemacs-theme spaceline powerline smooth-scrolling slim-mode shm shell-pop scss-mode sass-mode restart-emacs rainbow-delimiters popwin persp-mode pcre2el paradox hydra spinner page-break-lines org-repo-todo org-present org-pomodoro alert log4e gntp org-plus-contrib org-bullets open-junk-file nyan-mode neotree multi-term move-text mmm-mode markdown-toc markdown-mode macrostep lorem-ipsum linum-relative leuven-theme less-css-mode json-mode json-snatcher json-reformat js2-refactor multiple-cursors s js2-mode js-doc jade-mode info+ indent-guide ido-vertical-mode hungry-delete htmlize hl-todo hindent highlight-parentheses highlight-numbers parent-mode highlight-indentation help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flyspell helm-flx helm-descbinds helm-css-scss helm-ag haskell-snippets yasnippet haml-mode google-translate golden-ratio gnuplot ghc haskell-mode gh-md flx-ido flx fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-args evil-anzu anzu eval-sexp-fu highlight eshell-prompt-extras esh-help emmet-mode elisp-slime-nav disaster define-word coffee-mode cmm-mode cmake-mode clean-aindent-mode clang-format buffer-move bracketed-paste auto-highlight-symbol auto-dictionary auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async quelpa package-build use-package which-key bind-key bind-map evil monokai-theme))))
+ (ledger-mode toml-mode racer rust-mode smeargle orgit magit-gitflow helm-gitignore request gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger evil-magit magit magit-popup git-commit with-editor xterm-color ws-butler window-numbering web-mode web-beautify volatile-highlights vi-tilde-fringe toc-org tern tagedit spacemacs-theme spaceline powerline smooth-scrolling slim-mode shm shell-pop scss-mode sass-mode restart-emacs rainbow-delimiters popwin persp-mode pcre2el paradox hydra spinner page-break-lines org-repo-todo org-present org-pomodoro alert log4e gntp org-plus-contrib org-bullets open-junk-file nyan-mode neotree multi-term move-text mmm-mode markdown-toc markdown-mode macrostep lorem-ipsum linum-relative leuven-theme less-css-mode json-mode json-snatcher json-reformat js2-refactor multiple-cursors s js2-mode js-doc jade-mode info+ indent-guide ido-vertical-mode hungry-delete htmlize hl-todo hindent highlight-parentheses highlight-numbers parent-mode highlight-indentation help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flyspell helm-flx helm-descbinds helm-css-scss helm-ag haskell-snippets yasnippet haml-mode google-translate golden-ratio gnuplot ghc haskell-mode gh-md flx-ido flx fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-args evil-anzu anzu eval-sexp-fu highlight eshell-prompt-extras esh-help emmet-mode elisp-slime-nav disaster define-word coffee-mode cmm-mode cmake-mode clean-aindent-mode clang-format buffer-move bracketed-paste auto-highlight-symbol auto-dictionary auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async quelpa package-build use-package which-key bind-key bind-map evil monokai-theme))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/xsession b/xsession
index c20fe9b..8877e81 100755
--- a/xsession
+++ b/xsession
@@ -20,6 +20,7 @@ trayer --edge top --align right --SetDockType true --SetPartialStrut true --expa
if [[ $(hostname) == pincer ]]; then
# xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.5
# xinput set-prop "SynPS/2 Synaptics TouchPad" "Device Accel Constant Deceleration" 0.5
+ true
fi
[[ -f /etc/nixos/configuration.nix ]] || \
redshift -l 40:-70 -r -t 5500:3700 &