Allowing multiple hosts
This commit is contained in:
parent
a208c8467e
commit
dfa933097e
6 changed files with 61 additions and 24 deletions
|
@ -59,7 +59,7 @@
|
||||||
specialArgs = {inherit inputs outputs;};
|
specialArgs = {inherit inputs outputs;};
|
||||||
modules = [
|
modules = [
|
||||||
# > Our main nixos configuration file <
|
# > Our main nixos configuration file <
|
||||||
./nixos/configuration.nix
|
./hosts/blackstar/nixos/configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -73,7 +73,7 @@
|
||||||
extraSpecialArgs = {inherit inputs outputs;};
|
extraSpecialArgs = {inherit inputs outputs;};
|
||||||
modules = [
|
modules = [
|
||||||
# > Our main home-manager configuration file <
|
# > Our main home-manager configuration file <
|
||||||
./home-manager/home.nix
|
./hosts/blackstar/home-manager/home.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
|
|
||||||
|
# Shared config
|
||||||
|
../../shared/shared_home.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
|
@ -25,6 +25,9 @@
|
||||||
|
|
||||||
# Import your generated (nixos-generate-config) hardware configuration
|
# Import your generated (nixos-generate-config) hardware configuration
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
# Shared config
|
||||||
|
../../shared/shared_config.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
@ -125,6 +128,9 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Set your time zone.
|
||||||
|
time.timeZone = "America/Los_Angeles";
|
||||||
|
|
||||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
|
@ -179,7 +185,7 @@
|
||||||
|
|
||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
|
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
package = config.boot.kernelPackages.nvidiaPackages.production;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Programs installed for all users
|
# Programs installed for all users
|
||||||
|
@ -198,26 +204,6 @@
|
||||||
python3
|
python3
|
||||||
lua
|
lua
|
||||||
git
|
git
|
||||||
(vscode-with-extensions.override {
|
|
||||||
vscodeExtensions = with vscode-extensions; [
|
|
||||||
dracula-theme.theme-dracula
|
|
||||||
yzhang.markdown-all-in-one
|
|
||||||
rust-lang.rust-analyzer
|
|
||||||
# jscearcy.rust-doc-viewer
|
|
||||||
# swellaby.vscode-rust-test-adapter
|
|
||||||
tamasfe.even-better-toml
|
|
||||||
ms-vsliveshare.vsliveshare
|
|
||||||
aaron-bond.better-comments
|
|
||||||
bbenoist.nix
|
|
||||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
|
||||||
{
|
|
||||||
name = "remote-ssh-edit";
|
|
||||||
publisher = "ms-vscode-remote";
|
|
||||||
version = "0.47.2";
|
|
||||||
sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
})
|
|
||||||
|
|
||||||
# game
|
# game
|
||||||
steam
|
steam
|
0
hosts/shared/home-manager/shared_home.nix
Normal file
0
hosts/shared/home-manager/shared_home.nix
Normal file
48
hosts/shared/nixos/shared_config.nix
Normal file
48
hosts/shared/nixos/shared_config.nix
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
{
|
||||||
|
inputs,
|
||||||
|
outputs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
||||||
|
# code
|
||||||
|
cargo rustc # Rust
|
||||||
|
jetbrains.rust-rover
|
||||||
|
jetbrains.rider
|
||||||
|
jetbrains.clion
|
||||||
|
jetbrains.pycharm-professional
|
||||||
|
vim
|
||||||
|
python3
|
||||||
|
lua
|
||||||
|
git
|
||||||
|
(vscode-with-extensions.override {
|
||||||
|
vscodeExtensions = with vscode-extensions; [
|
||||||
|
dracula-theme.theme-dracula
|
||||||
|
yzhang.markdown-all-in-one
|
||||||
|
rust-lang.rust-analyzer
|
||||||
|
# jscearcy.rust-doc-viewer
|
||||||
|
# swellaby.vscode-rust-test-adapter
|
||||||
|
tamasfe.even-better-toml
|
||||||
|
ms-vsliveshare.vsliveshare
|
||||||
|
aaron-bond.better-comments
|
||||||
|
bbenoist.nix
|
||||||
|
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||||
|
{
|
||||||
|
name = "remote-ssh-edit";
|
||||||
|
publisher = "ms-vscode-remote";
|
||||||
|
version = "0.47.2";
|
||||||
|
sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
})
|
||||||
|
# other
|
||||||
|
discord
|
||||||
|
|
||||||
|
# sys utils
|
||||||
|
gnupg ffmpeg unzip
|
||||||
|
mpv
|
||||||
|
];
|
||||||
|
}
|
Reference in a new issue