wip

3 files changed, 24 insertions, 24 deletions

diff --git a/bash/env.sh b/bash/env.sh
index c81cba2..c537b4e 100644
--- a/bash/env.sh
+++ b/bash/env.sh
@@ -68,9 +68,9 @@ isLinux && {
 #
 
 export GUIX_PROFILE="$HOME/.guix-profile/etc/profile"
-isLinux && {
-  source "$GUIX_PROFILE"
-}
+# isLinux && {
+#   source "$GUIX_PROFILE"
+# }
 export PATH="$HOME/.guix-profile/bin${PATH:+:}$PATH"
 export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
 export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" # after running guix package -i glibc-utf8-locales
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 7162070..a5a7646 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -11,13 +11,13 @@
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
-      grub.device = "/dev/sda";
+      grub.device = "/dev/nvme0n1";
     };
     initrd = {
       luks.devices = [
         {
           name = "root";
-          device = "/dev/sda2";
+          device = "/dev/nvme0n1p3";
           preLVM = true;
         }
       ];
@@ -41,7 +41,7 @@
 
   nix.gc = {
     automatic = true;
-    dates = "03:15";
+    dates = "03:15"; # change to hour?
   };
 
   # Select internationalisation properties.
@@ -127,7 +127,7 @@
     bfg-repo-cleaner
     pwgen
     gksu                        # =gksudo=
-    gnome3.gconf                # https://github.com/NixOS/nixpkgs/issues/15978
+    gnome2.GConf                # https://github.com/NixOS/nixpkgs/issues/15978
     lsof
     pciutils
     python27Packages.pywatchman # =watchman-wait=
@@ -186,7 +186,7 @@
 
     pypi2nix
     bundix
-    nix-repl
+    # nix-repl
 
 
     ## Music
@@ -245,7 +245,7 @@
     qemu
     thunderbird
     calibre
-    quodlibet
+    # quodlibet
     rhythmbox
     gpodder
     firefox
@@ -406,19 +406,19 @@
     services = {
       # Derived from Guix guix-daemon.service.in
       # https://git.savannah.gnu.org/cgit/guix.git/tree/etc/guix-daemon.service.in?id=00c86a888488b16ce30634d3a3a9d871ed6734a2
-      guix-daemon = {
-        enable = true;
-        description = "Build daemon for GNU Guix";
-        serviceConfig = {
-          ExecStart = "/var/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild";
-          Environment="GUIX_LOCPATH=/root/.guix-profile/lib/locale";
-          RemainAfterExit="yes";
-          StandardOutput="syslog";
-          StandardError="syslog";
-          TaskMax= "8192";
-        };
-        wantedBy = [ "multi-user.target" ];
-      };
+#      guix-daemon = {
+#        enable = true;
+#        description = "Build daemon for GNU Guix";
+#        serviceConfig = {
+#          ExecStart = "/var/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild";
+#          Environment="GUIX_LOCPATH=/root/.guix-profile/lib/locale";
+#          RemainAfterExit="yes";
+#          StandardOutput="syslog";
+#          StandardError="syslog";
+#          TaskMax= "8192";
+#        };
+#        wantedBy = [ "multi-user.target" ];
+#      };
     };
   };
 
@@ -426,5 +426,5 @@
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "18.03"; # Did you read the comment?
+  system.stateVersion = "18.09"; # Did you read the comment?
 }
diff --git a/spacemacs.el b/spacemacs.el
index 5957c7f..a45d968 100644
--- a/spacemacs.el
+++ b/spacemacs.el
@@ -757,7 +757,7 @@ This function is called at the very end of Spacemacs initialization."
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (flyspell-correct-helm flyspell-correct yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum which-key web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package unicode-fonts unfill toml-mode toc-org tide tagedit systemd symon swift-mode string-inflection sql-indent spaceline-all-the-icons smeargle slime-company slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode perl6-mode pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode json-navigator js2-refactor js-doc jinja2-mode intero interleave insert-shebang indent-guide importmagic impatient-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets google-translate google-c-style golden-ratio gnuplot gitignore-templates gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flycheck-rust flycheck-rtags flycheck-pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flx-ido fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit evil-lisp-state evil-lion evil-ledger evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump dotenv-mode doom-modeline dockerfile-mode docker disaster diminish diff-hl define-word debbugs dante cython-mode csv-mode counsel-projectile company-web company-tern company-statistics company-shell company-rtags company-restclient company-plsense company-nixos-options company-lua company-ghci company-ghc company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clean-aindent-mode clang-format cider-eval-sexp-fu chruby centered-cursor-mode cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile auctex-latexmk ansible-doc ansible alchemist aggressive-indent adoc-mode ace-window ace-link ace-jump-helm-line ac-ispell))))
+    (yasnippet-snippets yapfify yaml-mode xterm-color ws-butler winum web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen unicode-fonts ucs-utils font-utils unfill toml-mode toc-org tide typescript-mode tagedit systemd symon swift-mode string-inflection spaceline-all-the-icons spaceline powerline smeargle slime-company slime slim-mode shell-pop seeing-is-believing scss-mode sass-mode rvm ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restclient-helm restart-emacs rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode psci purescript-mode psc-ide prettier-js powershell popwin pippel pipenv pip-requirements persp-mode persistent-soft list-utils pcache pdf-tools password-generator paradox ox-reveal overseer orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http ob-elixir nov esxml nix-mode neotree nameless mwim multi-term move-text mmm-mode minitest markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum livid-mode skewer-mode live-py-mode link-hint json-navigator hierarchy js2-refactor multiple-cursors js2-mode js-doc jinja2-mode interleave insert-shebang indent-guide importmagic epc ctable concurrent deferred impatient-mode simple-httpd hungry-delete htmlize hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-xref helm-themes helm-swoop helm-rtags helm-pydoc helm-purpose window-purpose imenu-list helm-projectile helm-org-rifle helm-notmuch notmuch helm-nixos-options helm-mode-manager helm-make helm-hoogle helm-gitignore request helm-git-grep helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag haskell-snippets haml-mode google-translate google-c-style golden-ratio gnuplot gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md geiser fuzzy flyspell-correct-helm flyspell-correct flycheck-rust flycheck-rtags flycheck-pos-tip pos-tip flycheck-perl6 flycheck-mix flycheck-ledger flycheck-haskell flycheck-elm flycheck-credo flycheck-bashate flycheck flx-ido flx fish-mode fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-tutor evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-magit magit git-commit ghub treepy graphql with-editor evil-lisp-state evil-lion evil-ledger ledger-mode evil-indent-plus evil-iedit-state iedit evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens smartparens paredit evil-args evil-anzu anzu eshell-z eshell-prompt-extras esh-help erlang emmet-mode elm-test-runner elm-mode elisp-slime-nav editorconfig dumb-jump doom-modeline eldoc-eval shrink-path all-the-icons memoize dockerfile-mode docker json-mode tablist magit-popup docker-tramp json-snatcher json-reformat disaster diff-hl define-word debbugs soap-client cython-mode csv-mode counsel-projectile projectile counsel swiper ivy company-web web-completion-data company-tern dash-functional tern company-statistics company-shell company-rtags rtags company-restclient restclient know-your-http-well company-plsense company-nixos-options nixos-options company-lua lua-mode company-ghci haskell-mode company-cabal company-c-headers company-auctex company-ansible company-anaconda common-lisp-snippets column-enforce-mode cmm-mode clojure-snippets clojure-cheatsheet clean-aindent-mode clang-format cider-eval-sexp-fu eval-sexp-fu highlight cider sesman spinner queue clojure-mode chruby centered-cursor-mode cargo markdown-mode rust-mode bundler inf-ruby browse-at-remote auto-yasnippet yasnippet auto-highlight-symbol auto-dictionary auto-compile packed auctex-latexmk auctex ansible-doc ansible anaconda-mode pythonic alchemist company elixir-mode aggressive-indent adoc-mode markup-faces ace-window ace-link ace-jump-helm-line helm avy helm-core ac-ispell auto-complete popup which-key use-package pcre2el org-plus-contrib hydra evil goto-chg undo-tree dotenv-mode diminish bind-map bind-key async sql-indent perl6-mode font-lock+ evil-unimpaired))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.