Various changes

- `hs` host
  - cam subdomain behind reverse proxy
  - dynamic dns updater script
- `pc` host
  - ext4 instead of btrfs
  - ca-derivations experimental feature
- nix from unstable channel (2.8)
- cura from stable (unstable went broken)
- Emacs
  - company-nixos-options
  - helm-nixos-options
  - nix-modeline
  - disable format hook on save for nix mode
- nix from master (only in overlay, not used)
- bat (alias for cat)
- batman (alias for batman)
- disabled weird extra options for nix I couldn't even remember of
- Fira Code for sway/waybar
- New plain style for waybar

pkgs/default.nix

@@ -17,7 +17,7 @@ in
   customEmacs = prev.callPackage (import ./emacs) { };
   amule = prev.callPackage (import ./amule) { };
   digikam = nixpkgsUnstable.digikam;
-  cura = nixpkgsUnstable.cura;
+  #cura = nixpkgsUnstable.cura;
   qutebrowser = import ./qutebrowser { pkgs = prev; };
   #firefox-unwrapped = nixpkgsUnstable.firefox-unwrapped;
   xdg-desktop-portal = nixpkgsUnstable.xdg-desktop-portal;
@@ -30,5 +30,7 @@ in
   v4l2loopback-dc = prev.callPackage (import ./v4l2loopback-dc) { kernel = prev.linux; };
   slack = import ./slack { pkgs = prev; };
   google-chrome = import ./google-chrome { pkgs = prev; };
+  nixFromMaster = import ./nix-from-master { nix = nixpkgsUnstable.nix; pkgs = prev; };
+  nix = nixpkgsUnstable.nix;
   # then, call packages with `final.callPackage`
 }

pkgs/emacs/default.nix

@@ -12,6 +12,7 @@ emacsWithPackages (
       aggressive-indent
       all-the-icons
       company
+      company-nixos-options
       dap-mode
       diff-hl
       envrc
@@ -25,6 +26,7 @@ emacsWithPackages (
       helm
       helm-ag
       helm-company
+      helm-nixos-options
       helm-projectile
       lispy
       lsp-haskell
@@ -34,6 +36,8 @@ emacsWithPackages (
       magit
       magit-delta
       nix-mode
+      nix-modeline
+      nixos-options
       notmuch
       org-download
       org-fragtog

pkgs/nix-from-master/default.nix

@@ -0,0 +1,9 @@
+{ nix, pkgs }:
+nix.overrideAttrs (old: {
+  src = pkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nix";
+    rev = "3ec979fa902c49e975a9af7dc2792fb197030e04";
+    hash = "sha256-mpFR1OrjayyVe8LpxJVaTLVIPPeTSIu7SDz/wXP78Vg=";
+  };
+})