diff options
| -rw-r--r-- | bash/aliases.sh | 1 | ||||
| -rw-r--r-- | bash/bashrc.sh | 2 | ||||
| -rw-r--r-- | git/mrconfig.ini | bin | 11104 -> 11065 bytes | |||
| -rw-r--r-- | nixos/configuration.nix | 88 | ||||
| -rwxr-xr-x | scripts/gc.sh | 7 | ||||
| l--------- | scripts/guix | 1 | ||||
| -rwxr-xr-x | scripts/mail.sh | 5 | ||||
| -rw-r--r-- | spacemacs.el | 2 | ||||
| -rw-r--r-- | vps/docker-compose.yml | bin | 1908 -> 1957 bytes | |||
| -rw-r--r-- | xmonad/xmonad.hs | 3 |
10 files changed, 68 insertions, 41 deletions
diff --git a/bash/aliases.sh b/bash/aliases.sh index b106ed8..142b6a9 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -15,7 +15,6 @@ alias mr="mr -s" alias sbcl="rlwrap sbcl" alias du="ncdu --color dark" -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null" alias mux="tmuxinator" diff --git a/bash/bashrc.sh b/bash/bashrc.sh index 8613f65..18aeb9a 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -26,3 +26,5 @@ env > ~/.spacemacs.env # tmp FIXME: move to mrconfig.ini export PATH="$HOME/Desktop/hinarioespirita-db/songbooks/cli:$PATH" alias sb="songbooks" + +source "$(dirname $(readlink $(which autojump)))/../share/autojump/autojump.bash" diff --git a/git/mrconfig.ini b/git/mrconfig.ini Binary files differindex 4e5f0af..b502fca 100644 --- a/git/mrconfig.ini +++ b/git/mrconfig.ini diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 7162070..8db07ea 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. @@ -69,6 +69,10 @@ environment.systemPackages = let pkgsUnstable = import(fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {}; + pkgs-18-03 = import(pkgs.fetchzip { + url = "https://github.com/NixOS/nixpkgs/archive/18.03.zip"; + sha256 = "0hk4y2vkgm1qadpsm4b0q1vxq889jhxzjx3ragybrlwwg54mzp4f"; + }) {}; timidityWithEvenMoreFormats = with pkgs; timidity.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-audio=vorbis,flac" ]; buildInputs = oldAttrs.buildInputs ++ [ libogg libvorbis flac ]; @@ -81,7 +85,7 @@ gitAndTools.git-open gitAndTools.gitFull gitAndTools.diff-so-fancy - gitAndTools.git-annex + pkgs-18-03.gitAndTools.git-annex gitAndTools.gitRemoteGcrypt gitAndTools.git-dit pkgsUnstable.gitAndTools.git-secrets @@ -91,6 +95,7 @@ mr nextcloud-client borgbackup + git-sizer ## CLI tools @@ -127,7 +132,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= @@ -140,18 +145,12 @@ feh # simplistic image viewer nixUnstable # =nix= zip - kubernetes zlib - vagrant - docker_compose - docker-machine redis alsaUtils # for xmonad volume commands - git-sizer multimarkdown # =markdown= pup # command-line HTML parsing https://github.com/ericchiang/pup binutils-unwrapped # =ar= command for cargo build - ant nssTools # =pk12util= gitAndTools.hub # GitHub helper insomnia @@ -160,8 +159,6 @@ gitlab-runner sshpass zathura # for viewing Emacs PDF files - notmuch - isync cacert gtypist pandoc @@ -174,19 +171,25 @@ poppler_utils # used by diffoscope for comparing PDF files pdftk # - gnome3.libgnome-keyring gnome3.gnome-keyring + + ## Mail + + notmuch + isync + + ## Spell checking (aspellWithDicts (ps : with ps; [ en eo fr pt_BR ])) + ## NixOS pypi2nix bundix - nix-repl ## Music @@ -204,7 +207,6 @@ leiningen python3 python - # nodejs-9_x yarn elixir openjdk @@ -215,14 +217,26 @@ cargo clojure # =clj= visualvm # JVM profiling tool + ant maven go_bootstrap - ansible rakudo bats ledger + ## Containers and VMs + + packer + docker_compose + docker-machine + vagrant + kubernetes + ansible + qemu + pkgsUnstable.gnome3.gtk-vnc + + ## xmonad xorg.xmodmap @@ -239,20 +253,15 @@ arandr - ## GUI programs - qemu - thunderbird calibre - quodlibet rhythmbox gpodder firefox emacs tdesktop vlc - gnome3.evolution keepassx2-http yubioath-desktop tor-browser-bundle-bin @@ -261,16 +270,18 @@ android-studio androidsdk_extras androidndk - pkgsUnstable.gnome3.gtk-vnc pkgsUnstable.patchwork-classic + ## Cryptocururencies electrum zbar # for on-screen QR Code scanning monero + ## nu specific packages + slack chromium ]; @@ -286,7 +297,8 @@ services = { cron.enable = true; - cron.systemCronJobs = ["* * * * * andreh mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log"]; + # We can see the actual generated crontab at /etc/crontab + cron.systemCronJobs = ["0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"]; xserver = { enable = true; @@ -406,19 +418,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 +438,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/scripts/gc.sh b/scripts/gc.sh index 2d7a8f3..9b98123 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -5,6 +5,7 @@ disk_space() { } before=$(disk_space) + yellow "Cleaning up the NixOS store" profiles=(per-user/root/channels per-user/andreh/profile per-user/andreh/channels system) @@ -20,6 +21,11 @@ nix-store --gc nix-collect-garbage -d +yellow "Cleaning up Guix store" + +guix gc + + yellow "Cleaning up up the Trash and /tmp folders" rm -rf ~/.local/share/Trash/files/* @@ -37,6 +43,7 @@ docker stop $(docker ps -a -q) docker rm $(docker ps -a -q) echo y | docker volume prune +echo y | docker container prune after=$(disk_space) diff --git a/scripts/guix b/scripts/guix new file mode 120000 index 0000000..96901ae --- /dev/null +++ b/scripts/guix @@ -0,0 +1 @@ +/var/guix/profiles/per-user/root/guix-profile/bin/guix
\ No newline at end of file diff --git a/scripts/mail.sh b/scripts/mail.sh new file mode 100755 index 0000000..c8f6522 --- /dev/null +++ b/scripts/mail.sh @@ -0,0 +1,5 @@ +if [ "$1" = "-s" ]; then + mbsync -a &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log +else + mbsync -aV && notmuch new +fi 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. diff --git a/vps/docker-compose.yml b/vps/docker-compose.yml Binary files differindex 58c9a00..d06af98 100644 --- a/vps/docker-compose.yml +++ b/vps/docker-compose.yml diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index 2f868ec..dd46d25 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -17,7 +17,8 @@ main = -- https://stackoverflow.com/questions/20446348/xmonad-toggle-fullscreen-xmobar { manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook def <+> manageScratchPad , handleEventHook = handleEventHook def <+> docksEventHook - , layoutHook = smartBorders $ lessBorders OnlyFloat $ avoidStruts $ layoutHook def + -- , layoutHook = smartBorders $ lessBorders OnlyFloat $ avoidStruts $ layoutHook def + , layoutHook = smartBorders $ avoidStruts $ layoutHook def , modMask = mod4Mask -- User Super instead of Alt , terminal = myTerminal , startupHook = startup |