diff --git a/desktop/configuration.nix b/desktop/configuration.nix index 7539ed2..23cdbd6 100644 --- a/desktop/configuration.nix +++ b/desktop/configuration.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, ... }: @@ -11,12 +9,13 @@ ]; environment.shellAliases = { + boot = "sudo nixos-rebuild boot --flake ~/NixOS/.#nvidia"; rebuild = "sudo nixos-rebuild switch --flake ~/NixOS/.#nvidia"; - c = "nix-shell ~/nixos/shells/c.nix"; - js = "nix-shell ~/nixos/shells/js.nix"; - nix = "nix-shell ~/nixos/shells/nix.nix"; - rust = "nix-shell ~/nixos/shells/rust.nix"; - python = "nix-shell ~/nixos/shells/python.nix"; + c = "nix-shell ~/NixOS/shells/c.nix"; + js = "nix-shell ~/NixOS/shells/js.nix"; + nix = "nix-shell ~/NixOS/shells/nix.nix"; + rust = "nix-shell ~/NixOS/shells/rust.nix"; + python = "nix-shell ~/NixOS/shells/python.nix"; }; programs.steam.enable = true; diff --git a/flake.nix b/flake.nix index 1420c93..5ef733f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ outputs = { - self, disko, home-manager, nixpkgs, diff --git a/home.nix b/home.nix index 75b81e9..42eb8f4 100644 --- a/home.nix +++ b/home.nix @@ -10,6 +10,8 @@ fd nil nixd + nixfmt + package-version-server unzip ghostty flatpak diff --git a/nvidia/nvidia.nix b/nvidia/nvidia.nix index ce283b4..52982d7 100644 --- a/nvidia/nvidia.nix +++ b/nvidia/nvidia.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: { diff --git a/servers/black/configuration.nix b/servers/black/configuration.nix index 2483fc9..eb6c848 100644 --- a/servers/black/configuration.nix +++ b/servers/black/configuration.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, ... }: @@ -11,6 +9,7 @@ ]; environment.shellAliases = { + boot = "sudo nixos-rebuild boot --flake ~/NixOS/.#nvidia"; rebuild = "sudo nixos-rebuild switch --flake ~/NixOS/.#black"; }; diff --git a/shells/js.nix b/shells/js.nix index e69de29..9c8703d 100644 --- a/shells/js.nix +++ b/shells/js.nix @@ -0,0 +1,10 @@ +{ + pkgs ? import { }, +}: + +pkgs.mkShell { + buildInputs = with pkgs; [ + pnpm + typescript-language-server + ]; +}