mirror of
https://github.com/Moe1369/nixos-config.git
synced 2024-10-18 04:14:08 +02:00
add global settings and import them
Some checks are pending
Flake.lock / build (push) Waiting to run
Some checks are pending
Flake.lock / build (push) Waiting to run
This commit is contained in:
parent
1c50d8558a
commit
f5763b39fe
@ -26,6 +26,7 @@
|
|||||||
specialArgs = {inherit user host;};
|
specialArgs = {inherit user host;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/${host}/system-imports.nix
|
./hosts/${host}/system-imports.nix
|
||||||
|
./global/system-imports.nix
|
||||||
jovian.nixosModules.jovian
|
jovian.nixosModules.jovian
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
@ -33,7 +34,10 @@
|
|||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.backupFileExtension = "backup";
|
home-manager.backupFileExtension = "backup";
|
||||||
home-manager.extraSpecialArgs = {inherit pkgs;};
|
home-manager.extraSpecialArgs = {inherit pkgs;};
|
||||||
home-manager.users.${user}.imports = [./hosts/${host}/user-imports.nix];
|
home-manager.users.${user}.imports = [
|
||||||
|
./hosts/${host}/user-imports.nix
|
||||||
|
./global/user-imports.nix
|
||||||
|
];
|
||||||
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
|
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
16
global/system-imports.nix
Normal file
16
global/system-imports.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[
|
||||||
|
# Packages
|
||||||
|
./system-packages/sys.pkg-dev.nix
|
||||||
|
# Settings
|
||||||
|
./system-settings/sys.set-boot.nix
|
||||||
|
./system-settings/sys.set-dev.nix
|
||||||
|
./system-settings/sys.set-locale.nix
|
||||||
|
./system-settings/sys.set-networking.nix
|
||||||
|
./system-settings/sys.set-system.nix
|
||||||
|
./system-settings/sys.set-updates.nix
|
||||||
|
./system-settings/sys.set-users.nix
|
||||||
|
];
|
||||||
|
}
|
9
global/system-packages/sys.pkg-dev.nix
Normal file
9
global/system-packages/sys.pkg-dev.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages =
|
||||||
|
(with pkgs; [
|
||||||
|
git
|
||||||
|
]);
|
||||||
|
}
|
6
global/system-settings/sys.set-boot.nix
Normal file
6
global/system-settings/sys.set-boot.nix
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
boot.initrd.verbose = false;
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
}
|
11
global/user-imports.nix
Normal file
11
global/user-imports.nix
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
# Home-Manager Packages
|
||||||
|
./user-packages/usr.pkg-dev.nix
|
||||||
|
# Home-Manager Settings
|
||||||
|
./user-settings/usr.set-dev.nix
|
||||||
|
./user-settings/usr.set-system.nix
|
||||||
|
];
|
||||||
|
}
|
6
global/user-packages/usr.pkg-dev.nix
Normal file
6
global/user-packages/usr.pkg-dev.nix
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
programs.git = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
}
|
@ -17,15 +17,9 @@
|
|||||||
./system-settings/sys.set-boot.nix
|
./system-settings/sys.set-boot.nix
|
||||||
./system-settings/sys.set-controller.nix
|
./system-settings/sys.set-controller.nix
|
||||||
./system-settings/sys.set-desktop.nix
|
./system-settings/sys.set-desktop.nix
|
||||||
./system-settings/sys.set-dev.nix
|
|
||||||
./system-settings/sys.set-filesystems.nix
|
./system-settings/sys.set-filesystems.nix
|
||||||
./system-settings/sys.set-hardware.nix
|
./system-settings/sys.set-hardware.nix
|
||||||
./system-settings/sys.set-locale.nix
|
|
||||||
./system-settings/sys.set-networking.nix
|
|
||||||
./system-settings/sys.set-steam.nix
|
./system-settings/sys.set-steam.nix
|
||||||
./system-settings/sys.set-system.nix
|
|
||||||
./system-settings/sys.set-systemd.nix
|
./system-settings/sys.set-systemd.nix
|
||||||
./system-settings/sys.set-updates.nix
|
|
||||||
./system-settings/sys.set-users.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
(with pkgs; [
|
(with pkgs; [
|
||||||
kdePackages.kate
|
kdePackages.kate
|
||||||
git
|
|
||||||
nil
|
nil
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
]);
|
]);
|
||||||
|
@ -2,11 +2,8 @@
|
|||||||
{
|
{
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.initrd.verbose = false;
|
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
boot.plymouth.enable = true;
|
boot.plymouth.enable = true;
|
||||||
boot.plymouth.theme = "bgrt";
|
boot.plymouth.theme = "bgrt";
|
||||||
boot.consoleLogLevel = 0;
|
boot.consoleLogLevel = 0;
|
||||||
|
@ -6,10 +6,8 @@
|
|||||||
./user-packages/usr.pkg-dev.nix
|
./user-packages/usr.pkg-dev.nix
|
||||||
./user-packages/usr.pkg-desktop.nix
|
./user-packages/usr.pkg-desktop.nix
|
||||||
# Home-Manager Settings
|
# Home-Manager Settings
|
||||||
./user-settings/usr.set-dotfiles.nix
|
|
||||||
./user-settings/usr.set-customization.nix
|
./user-settings/usr.set-customization.nix
|
||||||
./user-settings/usr.set-dev.nix
|
|
||||||
./user-settings/usr.set-desktop.nix
|
./user-settings/usr.set-desktop.nix
|
||||||
./user-settings/usr.set-system.nix
|
./user-settings/usr.set-dotfiles.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user