diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/configuration.nix | 88 |
1 files changed, 50 insertions, 38 deletions
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? } |