various updates

nixos/common/common.nix

@@ -57,12 +57,8 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  nixpkgs.config.permittedInsecurePackages = [
-                 "nodejs-14.21.3"
-                 "openssl-1.1.1t"
-                 "nodejs-16.20.0"
-               ];
-
+  nixpkgs.config.permittedInsecurePackages =
+    [ "nodejs-14.21.3" "openssl-1.1.1t" "nodejs-16.20.0" ];
 
   # Limit the systemd journal to 100 MB of disk or the
   # last 7 days of logs, whichever happens first.

nixos/common/desktop/default.nix

@@ -3,7 +3,7 @@
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot.enable = lib.mkDefault true;
       efi.canTouchEfiVariables = true;
       efi.efiSysMountPoint = "/boot/efi";
     };
@@ -38,7 +38,9 @@
   services.printing.enable = true;
 
   # Global Packages
-  environment.systemPackages = with pkgs; [ wireguard-tools sbctl ];
+  environment = {
+    systemPackages = with pkgs; [ wireguard-tools sbctl ];
+  };
 
   # Enable sound with pipewire.
   sound.enable = true;
@@ -83,6 +85,18 @@
     remotePlay.openFirewall = true;
   };
 
+  programs.adb.enable = true;
+
+  # Debloat
+  documentation = {
+    enable = false;
+    doc.enable = false;
+    man.enable = false;
+    info.enable = false;
+    nixos.enable = false;
+  };
+  system.disableInstallerTools = true;
+
   # Networking
   networking.networkmanager.enable = true;
   networking.firewall.checkReversePath = false;

nixos/common/desktop/home.nix

@@ -59,6 +59,8 @@ in {
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
     };
+
+    difftastic.enable = true;
   };
 
   programs.tmux = {

nixos/common/hm-modules/nvim.nix

@@ -11,11 +11,16 @@ in {
 
       globals = { mapleader = " "; };
 
+      options = { number = true; };
+
       maps.normal = {
         "<leader>ff" = "<cmd>lua require('telescope.builtin').find_files()<cr>";
         "<leader>fg" = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
+
         "<C-_>" =
           "<cmd>lua require('Comment.api').toggle.linewise.current()<cr>"; # map ctrl+/ to commenting code
+
+        "g=" = "<cmd>lua vim.lsp.buf.format{async=true}<cr>";
       };
 
       extraPlugins = with pkgs.vimPlugins; [ catppuccin-nvim luasnip ];
@@ -26,6 +31,19 @@ in {
 
       plugins = {
         bufferline.enable = true;
+        null-ls = {
+          enable = true;
+          sources = {
+            formatting.nixpkgs_fmt.enable = true;
+            code_actions.shellcheck.enable = true;
+            code_actions.statix.enable = true;
+            diagnostics = {
+              statix.enable = true;
+              deadnix.enable = true;
+              shellcheck.enable = true;
+            };
+          };
+        };
         nix.enable = true;
         treesitter = {
           enable = true;
@@ -47,8 +65,8 @@ in {
         comment-nvim = { enable = true; };
         lsp = {
           enable = true;
+          servers.nil_ls.enable = true;
           servers.rust-analyzer.enable = true;
-          servers.rnix-lsp.enable = true;
           servers.pyright.enable = true;
           servers.elixirls.enable = true;
           servers.clangd.enable = true;

nixos/common/users/default.nix

@@ -23,6 +23,8 @@
   programs.neovim = {
     enable = true;
     viAlias = true;
+    vimAlias = true;
+    defaultEditor = true;
   };
 
   # Disable sudo prompt for `wheel` users.