diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix index bef3b9a..42c5ef3 100644 --- a/nixos-configurations/laptop/default.nix +++ b/nixos-configurations/laptop/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ config, ... }: { imports = [ diff --git a/nixos-configurations/server/default.nix b/nixos-configurations/server/default.nix index 6461187..e6c0f99 100644 --- a/nixos-configurations/server/default.nix +++ b/nixos-configurations/server/default.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, config, ... }: +{ inputs, pkgs, ... }: { imports = [ diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix index 1cbe549..2f850e0 100644 --- a/nixos-configurations/shared-desktop.nix +++ b/nixos-configurations/shared-desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { services = { @@ -31,15 +31,6 @@ home-manager.users.thiloho = { pkgs, lib, config, ... }: { programs = { - bash = { - enable = true; - shellAliases = { - rbs = "sudo nixos-rebuild switch --flake ."; - off = "sudo systemctl poweroff"; - cleanup = "nix store optimise && nix-collect-garbage -d && sudo nix store optimise && sudo nix-collect-garbage -d"; - listboots = "nix profile history --profile /nix/var/nix/profiles/system"; - }; - }; firefox = { enable = true; package = pkgs.firefox-devedition; @@ -53,6 +44,8 @@ ]; userSettings = { "editor.tabSize" = 2; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nil"; }; }; git = { @@ -74,6 +67,7 @@ ventoy-full psensor spotify + nil ]; }; }; diff --git a/nixos-configurations/shared.nix b/nixos-configurations/shared.nix index dd2bbbd..5964fef 100644 --- a/nixos-configurations/shared.nix +++ b/nixos-configurations/shared.nix @@ -26,6 +26,15 @@ home-manager.users.thiloho = { ... }: { programs = { + bash = { + enable = true; + shellAliases = { + rbs = "sudo nixos-rebuild switch --flake ."; + off = "sudo systemctl poweroff"; + cleanup = "nix store optimise && nix-collect-garbage -d && sudo nix store optimise && sudo nix-collect-garbage -d"; + listboots = "nix profile history --profile /nix/var/nix/profiles/system"; + }; + }; helix = { enable = true; defaultEditor = true; diff --git a/nixos-configurations/wsl/default.nix b/nixos-configurations/wsl/default.nix index cb04335..dd32be6 100644 --- a/nixos-configurations/wsl/default.nix +++ b/nixos-configurations/wsl/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, modulesPath, ... }: +{ pkgs, ... }: { wsl = {