Fixes for procul, fixed fonts.conf

config/hardware/procul.nix

@@ -22,7 +22,7 @@
     loader.grub = {
       enable = true;
       version = 2;
-      device = "/dev/sdb";
+      device = "/dev/disk/by-id/ata-WDC_WD5000AAKS-75A7B2_WD-WCASY5933784";
     };
 
     runSize = "50%";

config/host-config/procul.nix

@@ -50,11 +50,14 @@ in {
 
   networking.firewall.allowedTCPPorts = [ 80 443 ];
 
-  users.users = {
+  users = {
-    gituser = {
+    users = {
-      isSystemUser = true;
+      gituser = {
-      group = "nogroup";
+        isSystemUser = true;
+        group = "nogroup";
+      };
     };
+    groups = { acme = { members = [ "nginx" ]; }; };
   };
 
   informis.cl-gemini = {

config/users.nix

@@ -13,8 +13,10 @@
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDoWkjyeIfgwm0b78weToVYOQSD0RQ0qbNzpsN5NokbIFv2/980kLtnYrQEgIJ/JwMLlT3uJYacbCT5/a6Fb8oLxNpj0AF1EKaWZ3Rrlg72Sq+9SEwJwWWmZizX83sovMwUBMaUp6jWLhAhPpzBW5pfc5YWoc89wxGbELSwzgt5EgHbSJgvDnaHSp3fVaY01wfDXbL/oO160iNe7wv2HLMZu/FkWBkIjz6HmoGJJzYM89bUpHbyYG28lmCHB/8UPog5/BsjOn3/qupgf4zh6mMdMsXLvbR2jVwVjxcEMj9N5nCvc+Y3oi7Mij6VNrWbhkaAJMEzeMhWYrF3/pFQxUqG37aK3d0gw9kp5tMDLIlAPX4y1lfA87pIzoa0+Alql0CJQA1IJvp9SFG7lBmSthWQLmZvwwfoGg/ZjF6rOgsVoZ8TizpQnydWJDr6NboU9LL9Oa64OM5Rs0AU3cR2UbOF4QIcWFJ/7oDe3dOnfZ8QYqx9eXJyxoAUpDanaaTHYBiAKkeOBwQU+MVLKCcONKw9FZclf/1TpDB5b3/JeUFANjHQTv0UXA4YYU7iCx6H7XB4qwwtU9O19CGQYYfCfULX12/fRpYJw6VJaQWyyU4Bn5dk/dcB2nGI36jwbLMfhbUTIApujioAnd/GQIMakHEZ1+syPhMx9BxMkZb99B0A1Q== openpgp:0x4EC95B64"
       ];
       home-directory = "/home/niten";
-      home-manager-config =
+      home-manager-config = import ../home-manager/niten.nix {
-        import ../home-manager/niten.nix { inherit config lib pkgs; };
+        inherit config lib pkgs;
+        homedir = "/home/niten";
+      };
       k5login = [
         "niten/root@FUDO.ORG"
         "niten/admin@FUDO.ORG"
@@ -469,8 +471,10 @@
       uid = 10115;
       primary-group = "informis";
       common-name = "Viator";
-      home-manager-config =
+      home-manager-config = import ../home-manager/niten.nix {
-        import ../home-manager/niten.nix { inherit config lib pkgs; };
+        inherit config lib pkgs;
+        homedir = "/home/informis/viator";
+      };
       ldap-hashed-passwd = "{SSHA}dF/5NGkafL8M1kpa3LYZKdh0Pc7a02gA";
       login-hashed-passwd =
         "$6$a1q2Duoe35hd5$IaZGXPfqyGv9uq5DQm7DZq0vIHsUs39sLktBiBBqMiwl/f/Z4jSvNZLJp9DZJYe5u2qGBYh1ca.jsXvQA8FPZ/";

flake.nix

@@ -1,9 +1,12 @@
-{
+let target-version = "21.05";
+
+in {
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-21.05";
+    nixpkgs.url = "nixpkgs/nixos-${target-version}";
-    home-manager.url = "github:nix-community/home-manager/release-21.05";
+    home-manager.url =
+      "github:nix-community/home-manager/release-${target-version}";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -17,9 +20,6 @@
       hosts = map hostname-from-file (attrNames (filterAttrs is-nix-file
         (filterAttrs is-regular-file (builtins.readDir ./config/hosts))));
 
-      pkgs = import nixpkgs { config = { allowUnfree = true; }; };
-      lib = nixpkgs.lib;
-
     in {
       nixConfigurations = mapAttrs (host: hostOpts:
         lib.nixosSystem {

home-manager/niten.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, homedir, ... }:
 
 with lib;
 let
@@ -12,8 +12,8 @@ let
 
   doom-emacs-config = pkgs.fetchgit {
     url = "https://git.fudo.org/niten/doom-emacs.git";
-    rev = "272271650db3abd911923a12442f5e8ce4c6eb6c";
+    rev = "6fdc2b5d0d97e49b59e1fc06cf7930b4e488e70b";
-    sha256 = "1iw2layh7gh7r5zshdznnnpxwhik2nl7432s7m66yb33prg78h9w";
+    sha256 = "06zj8r000m8bjfpgwljaz5s563xg6cfva85i75ianh97209p1j0a";
   };
 
   doom-emacs = pkgs.callPackage (pkgs.fetchgit {
@@ -21,13 +21,23 @@ let
     rev = "3893c50877a9d2d5d4aeee524ba1539f22115f1f";
     sha256 = "1jz8mxh143a4470mq303ng6dh3bxi6mcppqli4z0m13qhqssh4fx";
   }) {
-    doomPrivateDir = "${doom-emacs-config}/";
+    doomPrivateDir = "${pkgs.doom-emacs-config}";
+    extraPackages = with pkgs.emacsPackages; [ elpher use-package ];
     emacsPackagesOverlay = self: super: {
       irony = super.irony.overrideAttrs (esuper: {
         buildInputs = esuper.buildInputs
           ++ [ pkgs.cmake pkgs.libclang pkgs.clang ];
       });
-      spinner = super.spinner.overrideAttrs (esuper: { version = "1.7.4"; });
+      spinner = let version = "1.7.4";
+      in pkgs.emacsPackages.trivialBuild {
+        inherit version;
+        pname = "spinner";
+        src = builtins.fetchTarball {
+          url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
+          sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
+        };
+        buildPhase = ":";
+      };
     };
   };
 
@@ -62,9 +72,9 @@ let
     clojure
     cmake
     curl
-    # doom-emacs
+    doom-emacs
-    doom-emacs-config
+    # doom-emacs-config
-    doomEmacsInit
+    # doomEmacsInit
     enca
     file
     fortune
@@ -122,6 +132,10 @@ let
     castor
   ];
 
+  hm = (import <home-manager/modules/lib> { inherit lib; });
+
+  ensure-directories = [ ".emacs.d/.local/etc/eshell" ];
+
 in {
   programs = {
     bash = { enable = true; };
@@ -154,15 +168,16 @@ in {
       ".local/share/openttd/baseset" =
         mkIf enable-gui { source = "${pkgs.openttd-data}/data"; };
 
-      ".doom.d" = {
+      ".doom.d" = { source = pkgs.doom-emacs-config; };
-        source = pkgs.doom-emacs-config;
-        onChange = "${pkgs.doomEmacsInit}/bin/doom-emacs-init.sh";
-      };
 
       # For nixified emacs
-      # ".emacs.d/init.el".text = ''
+      ".emacs.d/init.el".text = ''
-      #   (load "default.el")
+        (load "default.el")
-      # '';
+
+        (setq package-archives nil)
+        ;; (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
+        (package-initialize)
+      '';
 
       ".xsessions" = {
         executable = true;
@@ -188,5 +203,16 @@ in {
 
       HISTCONTROL = "ignoredups:ignorespace";
     };
+
+    # activation = let
+    #   ensure-dir-script = dir: ''
+    #     $DRY_RUN_CMD [[ -d "${dir}" ]] || mkdir -p "${dir}"
+    #   '';
+    #   ensure-dirs-script =
+    #     concatStringsSep "\n" (map ensure-dir-script ensure-directories);
+    # in hm.dag.entryAfter [ "writeBoundary" ] ensure-dirs-script;
   };
+
+  systemd.user.tmpfiles.rules =
+    map (dir: "d ${homedir}/${dir} 700 niten - - -") ensure-directories;
 }

live-disk.nix

@@ -60,17 +60,39 @@ in {
     useGlobalPkgs = true;
 
     users = {
-      niten = {
+      niten = import ./home-manager/niten.nix {
-        home = {
+        inherit config lib pkgs;
-          file = {
+        homedir = "/home/niten";
-            ".doom.d" = {
-              source = pkgs.doom-emacs-config;
-              recursive = true;
-              onChange = "${pkgs.doomEmacsInit}/bin/doom-emacs-init.sh";
-            };
-          };
-        };
       };
     };
   };
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  console.useXkbConfig = true;
+
+  service.xserver = {
+    layout = "us";
+    xkbVariant = "dvp";
+    xkbOptions = "ctrl:nocaps";
+  };
+
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
+  programs = {
+    ssh = {
+      startAgent = true;
+
+      package = pkgs.openssh_gssapi;
+
+      extraConfig = ''
+        GSSAPIAuthentication yes
+        GSSAPIDelegateCredentials yes
+      '';
+    };
+  };
 }