Deploying to template from @ 87b31e6 🚀

dmadisetti · Oct 22, 2023 · 98123c7 · 98123c7
1 parent ab2effc
commit 98123c7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/dot/vim/plugins.vim b/dot/vim/plugins.vim
@@ -90,7 +90,7 @@ Plug 'cybrown-zoox/vim-pbtxt'
 Plug 'dag/vim-fish', {'for': 'fish'}
 
 " Why no %
-Plug 'chrisbra/matchit' ", {'for': ['fish', 'bash', 'shell', 'zsh']}
+" Plug 'chrisbra/matchit' ", {'for': ['fish', 'bash', 'shell', 'zsh']}
 
 " Sure, why not
 " Plug 'neoclide/coc.nvim', {'branch': 'release'}

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -72,7 +72,7 @@
     grub2-themes.inputs.nixpkgs.follows = "nixpkgs";
 
     # Hyprland is **such** eye candy
-    hyprland.url = github:hyprwm/Hyprland/v0.30.0;
+    hyprland.url = github:hyprwm/Hyprland/v0.31.0;
     hyprland.inputs.nixpkgs.follows = "nixpkgs";
     hyprland.inputs.systems.follows = "systems";
 

diff --git a/nix/common/getty.nix b/nix/common/getty.nix
@@ -6,7 +6,7 @@
       pkgs_rev = self.inputs.nixpkgs.shortRev or "dirty";
       dots_rev = self.shortRev or "dirty";
     in
-    lib.mkForce ''${sensitive.lib.getty pkgs_rev dots_rev}
+    lib.mkForce ''${if (sensitive.lib ? getty) then (sensitive.lib.getty pkgs_rev dots_rev) else ""}
 
 Run 'dots-help' or 'nixos-help' for more information.'';
 }
diff --git a/nix/common/harden.nix b/nix/common/harden.nix
@@ -31,5 +31,6 @@
     sudo.u2fAuth = true;
   };
 
-  security.pki.certificateFiles = lib.catAttrs "cert" (lib.attrValues sensitive.lib.certificates);
+  security.pki.certificateFiles = (if (sensitive.lib ? "certificates") then
+  (lib.catAttrs "cert" (lib.attrValues sensitive.lib.certificates)) else []);
 }
diff --git a/nix/machines/gce.nix b/nix/machines/gce.nix
@@ -13,7 +13,6 @@ rec {
   users.users."${user}".initialHashedPassword = sensitive.lib.hashed;
   environment.sessionVariables = { IS_GCE = "1"; };
 
-
   # Great idea from cole-h/nixos-config, meaning we don't have to provide root
   # to anyone, and can deploy remotely.
   security.sudo.extraRules = [