From 2d3f9a88fa97e246fbf20b4a4eca1a5cd5e323d0 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 21 Nov 2018 10:08:30 -0200 Subject: wip --- nixos/configuration.nix | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'nixos/configuration.nix') 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? } -- cgit v1.2.3 From ddf019522e73e06d8cb47be2c141452cea03b19c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 19:37:07 -0200 Subject: Use git-annex from 18.03 NixOS release. --- nixos/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a5a7646..edd764b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -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 -- cgit v1.2.3 From bd103263fa07eabc05c63f60129d86b48e904f72 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 21:57:15 -0200 Subject: Unify crontab and alias command under scripts/mail.sh. --- bash/aliases.sh | 1 - nixos/configuration.nix | 3 ++- scripts/mail.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100755 scripts/mail.sh (limited to 'nixos/configuration.nix') diff --git a/bash/aliases.sh b/bash/aliases.sh index f9649a2..142b6a9 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -14,7 +14,6 @@ alias watch="watch " alias mr="mr -s" alias sbcl="rlwrap sbcl" alias du="ncdu --color dark" -alias mail="mbsync -a && notmuch new" alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null" diff --git a/nixos/configuration.nix b/nixos/configuration.nix index edd764b..7bfab11 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -290,7 +290,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 = ["* * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh"]; xserver = { enable = true; diff --git a/scripts/mail.sh b/scripts/mail.sh new file mode 100755 index 0000000..e9f14d8 --- /dev/null +++ b/scripts/mail.sh @@ -0,0 +1 @@ +mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log -- cgit v1.2.3 From 8aa714eb5cb459647b92e979f553b1756397bb34 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 21:57:48 -0200 Subject: Reenable Guix in NixOS. --- bash/env.sh | 6 +++--- nixos/configuration.nix | 26 +++++++++++++------------- scripts/gc.sh | 6 ++++++ scripts/guix | 1 + 4 files changed, 23 insertions(+), 16 deletions(-) create mode 120000 scripts/guix (limited to 'nixos/configuration.nix') diff --git a/bash/env.sh b/bash/env.sh index c537b4e..c81cba2 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 7bfab11..0432380 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -411,19 +411,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" ]; + }; }; }; diff --git a/scripts/gc.sh b/scripts/gc.sh index e6a1d0d..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/* 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 -- cgit v1.2.3 From dfb9ea1b5186cf0b27925365f9404a6416a18236 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 21:59:00 -0200 Subject: Remove deprecated nix-repl. --- nixos/configuration.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 0432380..31e04f3 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -190,7 +190,6 @@ pypi2nix bundix - # nix-repl ## Music -- cgit v1.2.3 From 0797990f6139dfb3ee120ae9b5673abf0b340aeb Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 22:00:48 -0200 Subject: Remove thunderbird package. --- nixos/configuration.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 31e04f3..e6d15b6 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -246,7 +246,6 @@ ## GUI programs qemu - thunderbird calibre # quodlibet rhythmbox -- cgit v1.2.3 From 14010fc4d9a06b60a9fab3e44825a447d273ca4b Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 22:01:31 -0200 Subject: Remove evolution package. --- nixos/configuration.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index e6d15b6..81355eb 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -254,7 +254,6 @@ emacs tdesktop vlc - gnome3.evolution keepassx2-http yubioath-desktop tor-browser-bundle-bin -- cgit v1.2.3 From 39572452b393a0f964a8b985824d8018cb7f1513 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 22:03:00 -0200 Subject: Stop using QuodLibet in favor of Rhythmbox. --- nixos/configuration.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 81355eb..440aa4d 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -247,7 +247,6 @@ qemu calibre - # quodlibet rhythmbox gpodder firefox -- cgit v1.2.3 From e66b03a61ab7715b16915744e127a9b379a04018 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 22:03:21 -0200 Subject: Arrange packages by category. --- nixos/configuration.nix | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 440aa4d..d754f7b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -95,6 +95,7 @@ mr nextcloud-client borgbackup + git-sizer ## CLI tools @@ -144,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 @@ -164,8 +159,6 @@ gitlab-runner sshpass zathura # for viewing Emacs PDF files - notmuch - isync cacert gtypist pandoc @@ -178,14 +171,21 @@ 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 @@ -207,7 +207,6 @@ leiningen python3 python - # nodejs-9_x yarn elixir openjdk @@ -218,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 @@ -242,10 +253,8 @@ arandr - ## GUI programs - qemu calibre rhythmbox gpodder @@ -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 ]; -- cgit v1.2.3 From cebd9537d0671f6f71371ed1a955f89ec6457c95 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 22:19:08 -0200 Subject: Fetch mail once an hour. Adapt mail.sh to be called on-demand. --- nixos/configuration.nix | 2 +- scripts/mail.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'nixos/configuration.nix') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d754f7b..8db07ea 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -298,7 +298,7 @@ services = { cron.enable = true; # We can see the actual generated crontab at /etc/crontab - cron.systemCronJobs = ["* * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh"]; + cron.systemCronJobs = ["0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"]; xserver = { enable = true; diff --git a/scripts/mail.sh b/scripts/mail.sh index e9f14d8..c8f6522 100755 --- a/scripts/mail.sh +++ b/scripts/mail.sh @@ -1 +1,5 @@ -mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log +if [ "$1" = "-s" ]; then + mbsync -a &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log +else + mbsync -aV && notmuch new +fi -- cgit v1.2.3