Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

nixos/common/default.nix

@@ -34,6 +34,8 @@
     enableUserServices = true;
   };
 
+  security.polkit.enable = lib.mkDefault true;
+
   # Nix Settings
   nix = {
     registry.nixpkgs.flake = inputs.nixpkgs;
@@ -74,9 +76,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  nixpkgs.config.permittedInsecurePackages =
-    [ "nodejs-16.20.2" "nodejs-14.21.3" "openssl-1.1.1w" ];
-
   # Limit the systemd journal to 100 MB of disk or the
   # last 7 days of logs, whichever happens first.
   services.journald.extraConfig = ''

nixos/common/hm-modules/vscode.nix

@@ -70,6 +70,7 @@ in {
           sumneko.lua
           davidlday.languagetool-linter
           serayuzgur.crates
+          skellock.just
         ];
     };
 

nixos/common/users/default.nix

@@ -1,32 +1,35 @@
 { config, pkgs, lib, ... }: {
   imports = [ ./laura.nix ./vivian.nix ./jonathan.nix ];
+  programs = {
 
-  # Setup ZSH to use grml config
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    syntaxHighlighting.enable = true;
-    interactiveShellInit = ''
-      source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
-      export FZF_DEFAULT_COMMAND="${pkgs.ripgrep}/bin/rg --files --follow"
-      source "${pkgs.fzf}/share/fzf/key-bindings.zsh"
-      source "${pkgs.fzf}/share/fzf/completion.zsh"
-      eval "$(${pkgs.zoxide}/bin/zoxide init zsh)"
-    '';
-    # otherwise it'll override the grml prompt
-    promptInit = "";
+    # Setup ZSH to use grml config
+    zsh = {
+      enable = true;
+      enableCompletion = true;
+      syntaxHighlighting.enable = true;
+      autosuggestions.enable = true;
+      interactiveShellInit = ''
+        source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
+        export FZF_DEFAULT_COMMAND="${pkgs.ripgrep}/bin/rg --files --follow"
+        source "${pkgs.fzf}/share/fzf/key-bindings.zsh"
+        source "${pkgs.fzf}/share/fzf/completion.zsh"
+        eval "$(${pkgs.zoxide}/bin/zoxide init zsh)"
+      '';
+      # otherwise it'll override the grml prompt
+      promptInit = "";
+    };
+
+    # Install Neovim and set it as alias for vi(m)
+    neovim = {
+      enable = true;
+      viAlias = true;
+      vimAlias = true;
+      defaultEditor = true;
+    };
   };
 
   environment.pathsToLink = [ "/share/zsh" ];
 
-  # Install Neovim and set it as alias for vi(m)
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    defaultEditor = true;
-  };
-
   # Disable sudo prompt for `wheel` users.
   security.sudo.wheelNeedsPassword = lib.mkDefault false;
 
@@ -41,11 +44,13 @@
 
   # Setup packages available everywhere
   environment.systemPackages = with pkgs; [
+    file
     fzf
     git
     htop
     ncdu
     psmisc
+    helix
     ripgrep
     rsync
     zoxide