tstarr/dotfiles
1
0
Fork 0
mirror of https://github.com/starr-dusT/dotfiles.git synced 2025-02-18 18:57:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

migrate to combined home/normal modules

Browse Source
This commit is contained in:
Tyler Starr 2024-09-28 21:30:32 -07:00
parent 13e38bc327
commit db02ef369c
14 changed files with 48 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
provision/home-modules/default.nix
View File

@ -1,4 +0,0 @@
{ ... }:
{
imports = [ ./desktop ];
}

23
provision/home-modules/desktop/kitty.nix
View File

@ -1,23 +0,0 @@
{ config, lib, pkgs, user, ... }:
let cfg = config.modules.desktop.kitty;
in {
options.modules.desktop.kitty.enable = lib.mkEnableOption "kitty";
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
nerdfonts
];
programs.kitty = {
enable = true;
theme = "Gruvbox Dark";
font.name = "JetBrainsMono Nerd Font";
shellIntegration.mode = "no-cursor";
settings = {
disable_ligatures = "never";
cursor_shape = "block";
linux_display_server = "x11";
};
};
};
}

18
provision/hosts/bulwark/configuration.nix
View File

@ -26,35 +26,23 @@
browser.enable = true;
};
devel = {
engineering.enable = false;
notes.enable = true;
python.enable = false;
tooling.enable = false;
};
gaming = {
steam.enable = true;
emulation.enable = true;
misc.enable = true;
};
programs = {
kitty.enable = true;
};
services = {
jellyfin.enable = false;
peripherals.enable = false;
samba-client.enable = true;
virt-manager.enable = false;
};
system = {
nipr.enable = true;
ssh.enable = true;
terminal.enable = true;
wireguard-client.enable = false;
};
};
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
}

11
provision/hosts/bulwark/default.nix
View File

@ -1,11 +1,11 @@
{ lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
specialArgs = { inherit user inputs home-manger; };
modules = [
../default # shared by all configs
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # bulwark specific
./configuration.nix # bulwark specific
./hardware.nix
../../modules
agenix.nixosModules.default
@ -13,11 +13,6 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

12
provision/hosts/kestrel/configuration.nix
View File

@ -52,8 +52,10 @@
emulation.enable = true;
misc.enable = true;
};
programs = {
kitty.enable = true;
};
services = {
jellyfin.enable = false;
peripherals.enable = true;
samba-client.enable = true;
virt-manager.enable = true;
@ -71,12 +73,4 @@
};
};
};
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
}

11
provision/hosts/kestrel/default.nix
View File

@ -1,11 +1,11 @@
{ lib, system, user, inputs, agenix, home-manager, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
specialArgs = { inherit user inputs home-manager; };
modules = [
../default # shared by all configs
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # kestrel specific
./configuration.nix # kestrel specific
./hardware.nix
../../modules
agenix.nixosModules.default
@ -13,11 +13,6 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

16
provision/hosts/shivan/configuration.nix
View File

@ -35,13 +35,10 @@
python.enable = true;
tooling.enable = true;
};
gaming = {
steam.enable = false;
emulation.enable = false;
misc.enable = false;
programs = {
kitty.enable = true;
};
services = {
jellyfin.enable = false;
peripherals.enable = true;
samba-client.enable = true;
virt-manager.enable = false;
@ -50,15 +47,6 @@
nipr = true;
ssh.enable = true;
terminal.enable = true;
wireguard-client.enable = false;
};
};
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
}

11
provision/hosts/shivan/default.nix
View File

@ -1,11 +1,11 @@
{ lib, system, user, inputs, agenix, home-manager, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
specialArgs = { inherit user inputs home-manager; };
modules = [
../default # shared by all configs
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # shivan specific
./configuration.nix # shivan specific
./hardware.nix
../../modules
agenix.nixosModules.default
@ -13,11 +13,6 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

8
provision/hosts/torus/configuration.nix
View File

@ -104,12 +104,4 @@
ssh.enable = true;
};
};
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = false;
};
};
};
}

11
provision/hosts/torus/default.nix
View File

@ -1,11 +1,11 @@
{ lib, system, user, inputs, agenix, home-manager, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
specialArgs = { inherit user inputs home-manager; };
modules = [
../default # shared by all configs
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # torus specific
./configuration.nix # torus specific
./hardware.nix
../../modules
agenix.nixosModules.default
@ -13,11 +13,6 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

9
provision/hosts/wsl/default.nix
View File

@ -1,9 +1,9 @@
{ lib, system, user, inputs, agenix, home-manager, nixos-wsl, ... }:
{
inherit system;
specialArgs = { inherit user inputs nixos-wsl; };
specialArgs = { inherit user inputs nixos-wsl home-manger; };
modules = [
../default # shared by all configs
../default # shared by all configs
./configuration.nix # wsl specific
../../modules
agenix.nixosModules.default
@ -11,11 +11,6 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

2
provision/modules/default.nix
View File

@ -1,4 +1,4 @@
{ ... }:
{
imports = [ ./desktop ./devel ./gaming ./system ./services ];
imports = [ ./desktop ./devel ./gaming ./programs ./system ./services ];
}

0
provision/home-modules/desktop/default.nix → provision/modules/programs/default.nix
View File

25
provision/modules/programs/kitty.nix Normal file
View File

@ -0,0 +1,25 @@
{ config, lib, pkgs, user, inputs, home-manager, ... }:
let cfg = config.modules.programs.kitty;
in {
options.modules.programs.kitty.enable = lib.mkEnableOption "kitty";
config = lib.mkIf cfg.enable {
home-manager.users.${user} = {
home.packages = with pkgs; [
nerdfonts
];
programs.kitty = {
enable = true;
theme = "Gruvbox Dark";
font.name = "JetBrainsMono Nerd Font";
shellIntegration.mode = "no-cursor";
settings = {
disable_ligatures = "never";
cursor_shape = "block";
linux_display_server = "x11";
};
};
};
};
}