Add missing vi and vim aliases

Makefile

@@ -7,11 +7,8 @@ MAKEFLAGS += --no-builtin-rules
 HOSTNAME ?= $(shell hostname)
 UNAME_S := $(shell uname -s)
 
-export NIXPKGS_ALLOW_UNFREE := 1
-
 ifeq ($(UNAME_S),Linux)
-	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \
-								--impure # Impure because of: https://discourse.nixos.org/t/vscode-remote-wsl-extension-works-on-nixos-without-patching-thanks-to-nix-ld/14615
+	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#'
 endif
 ifeq ($(UNAME_S),Darwin)
 	SWITCH_CMD := exec darwin-rebuild switch --flake .
@@ -27,7 +24,7 @@ update:
 	nix flake update
 	make
 	git add .
-	git commit -S -m "nix flake update: $$(TZ=UTC date +%Y-%m-%d_%H-%M-%S)"
+	git commit -S -m "nix flake update: $$(TZ=UTC date '+%Y-%m-%d %H:%M:%S %Z')"
 	git push
 
 fmt:

flake.lock

@@ -204,11 +204,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1708307464,
-        "narHash": "sha256-OloBg9ZCoPrPqy8/ZoaoRB4kza3lKhnI0LuZq5xldhg=",
+        "lastModified": 1708341091,
+        "narHash": "sha256-3R7doGV1AoB5VKFifEd5elj8t4cld6VpJRpn9NaYr1Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a332040396d7e3c47883e9c115c1da485712805e",
+        "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803",
         "type": "github"
       },
       "original": {
@@ -220,11 +220,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1708161998,
-        "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
+        "lastModified": 1708294118,
+        "narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "84d981bae8b5e783b3b548de505b22880559515f",
+        "rev": "e0da498ad77ac8909a980f07eff060862417ccf7",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -368,6 +368,8 @@ in {
 
     nixvim = {
       enable = true;
+      viAlias = true;
+      vimAlias = true;
       colorschemes.gruvbox.enable = true;
       keymaps = [
         {
@@ -419,7 +421,7 @@ in {
           #helm-ls.enable = true;
           jsonls.enable = true;
           pyright.enable = true;
-          rnix-lsp.enable = true;
+          nixd.enable = true;
           terraformls.enable = true;
           yamlls.enable = true;
         };
@@ -447,9 +449,6 @@ in {
           keymapsSilent = true;
         };
       };
-      extraPlugins = with pkgs.vimPlugins; [
-        nvim-lspconfig
-      ];
       options = {
         autoindent = true;
         backup = false;

modules/machines/hephaestus/hardware.nix

@@ -7,6 +7,8 @@
 }: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   boot.initrd.availableKernelModules = [
     "ahci"
     "nvme"

modules/overlays/default.nix

@@ -1,5 +1,4 @@
 final: prev: {
-  rfd = prev.callPackage ./rfd {};
   tmux-sessionizer = prev.callPackage ./tmux-sessionizer {};
   vpngate = prev.callPackage ./vpngate {};
 }

modules/packages/linux.nix

@@ -9,6 +9,7 @@
 in {
   environment.systemPackages = with pkgs; let
     linux = [
+      android-tools
       bitwarden
       chromium
       cryptsetup
@@ -36,7 +37,6 @@ in {
       kazam
       legendary-gl
       lm_sensors
-      logseq
       mullvad-vpn
       netdata
       nfs-utils
@@ -49,14 +49,12 @@ in {
       qemu
       rustup
       ryujinx
+      signal-desktop
       strace
       tailscale
       traceroute
-      unstable.android-studio
-      unstable.android-tools
       unstable.obsidian
-      unstable.signal-desktop
-      unstable.unityhub
+      unstable.logseq
       unstable.yuzu
       unstable.zoom-us
       usbutils

outputs.nix

@@ -10,7 +10,13 @@
 } @ inputs: {
   nixosConfigurations = let
     modulesDir = ./modules;
-    unstable = import nixpkgs-unstable {};
+    unstable = import nixpkgs-unstable {
+      system = "x86_64-linux";
+      config.allowUnfree = true;
+      config.permittedInsecurePackages = [
+        "electron-25.9.0" # caused by obsidian
+      ];
+    };
     defaultModules = [
       home-manager.nixosModules.home-manager
       ./modules/common/fonts.nix
@@ -71,7 +77,6 @@
     ];
   in {
     hephaestus = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
       specialArgs = {inherit unstable;};
       modules =
         [