Nix: Tweaks

.nixos/lsp.nix → .nixos/dev.nix

@@ -9,7 +9,6 @@
     shellcheck
     terraform-ls
     gopls
-    docker-ls
     nixd
     yaml-language-server
     pylint
@@ -19,6 +18,20 @@
     nodePackages.bash-language-server
     nodePackages.vscode-html-languageserver-bin
     nodePackages.typescript-language-server
+    nodePackages_latest.vscode-json-languageserver-bin
+    docker-ls
+    dockerfile-language-server-nodejs
+    clang-tools
+    cmake-language-server
+    terraform
+    terraform-providers.aws
+    cmake
+    vscode-langservers-extracted
+    nodePackages.eslint
+    cppcheck
+    ninja
+    rocmPackages.llvm.clang
+    ccls
   ];
 }
 

.nixos/flake.nix

@@ -19,7 +19,7 @@
         ./network.nix
         ./gpu.nix
         ./services.nix
-        ./lsp.nix
+        ./dev.nix
         ./user.nix
       ];
     };

.nixos/system.nix

@@ -79,8 +79,8 @@
     i3
     ffmpeg
     i3ipc-glib
-    nodejs
     tmux
+    nodejs
     fish
     bat
     trash-cli
@@ -95,6 +95,8 @@
     postgresql
     wget
     libxkbcommon
+    libnotify
+    dmidecode
   ];
 
   # Package overrides.

.nixos/user.nix

@@ -7,15 +7,15 @@
     "/share/mime"
   ];
 
+  users.groups.alex = {};
   users.users.alex = {
-    isNormalUser = true;
     description = "Alexander van Zyl";
+    group = "alex";
+    isNormalUser = true;
     extraGroups = [ "networkmanager" "wheel" "docker"];
     packages = with pkgs; [
       gnome.adwaita-icon-theme
       xfce.thunar
-      terraform
-      terraform-providers.aws
       xournalpp
       shared-mime-info
       slack
@@ -80,7 +80,9 @@
   system.activationScripts.binbash = {
     deps = [ "binsh" ];
     text = ''
-         ln -s /bin/sh /bin/bash
+        if [ ! -f "/bin/bash" ]; then
+            ln -s "/bin/sh" "/bin/bash"
+        fi
     '';
   };