reaarrange again

This commit is contained in:
Daylin Morgan 2024-01-28 16:40:33 -06:00
parent c462c12e91
commit 6f00b5f93c
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
15 changed files with 51 additions and 47 deletions

View file

@ -5,16 +5,14 @@
... ...
}: { }: {
imports = with inputs.self.nixosModules; [ imports = with inputs.self.nixosModules; [
desktop
# hyprland
nix-ld nix-ld
virtualbox virtualbox
restic restic
]; ];
programs.hyprland.enable = true;
services.vpn.enable = true; cli.enable = true;
desktop.enable = true;
languages = { languages = {
misc = true; misc = true;
@ -23,7 +21,14 @@
tex = true; tex = true;
node = true; node = true;
}; };
cli.enable = true; environment.systemPackages = with pkgs; [
zk
rclone
quarto
];
programs.hyprland.enable = true;
services.vpn.enable = true;
services.restic.backups.gdrive = { services.restic.backups.gdrive = {
user = "daylin"; user = "daylin";
@ -32,30 +37,12 @@
paths = ["/home/daylin/stuff/" "/home/daylin/dev/"]; paths = ["/home/daylin/stuff/" "/home/daylin/dev/"];
}; };
environment.systemPackages = with pkgs; [
zk
rclone
quarto
];
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
users.users.daylin.extraGroups = [ users.users.daylin.extraGroups = [
"video" # backlight control via light
"audio" "audio"
]; ];
# users.users.daylin = {
# isNormalUser = true;
# shell = pkgs.zsh;
# extraGroups = [
# "wheel" # sudo
# "video" # backlight control via light
# "audio"
# ];
# };
} }

View file

@ -27,7 +27,7 @@ in rec {
nixosSystem { nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
[../modules/roles/common.nix] [../modules/common.nix]
++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}")); ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}"));
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };

View file

@ -1,4 +1,4 @@
{inputs, ...}: { {inputs, lib, ...}: {
imports = with inputs.self.nixosModules; [ imports = with inputs.self.nixosModules; [
users users
nix nix
@ -7,6 +7,16 @@
nvim nvim
vpn vpn
# gui
fonts
lock
qtile
hyprland
gui
vscode
# langs # langs
python python
misc misc
@ -14,4 +24,7 @@
tex tex
nim nim
]; ];
options.desktop.enable = lib.mkEnableOption "is desktop";
} }

17
modules/desktop/fonts.nix Normal file
View file

@ -0,0 +1,17 @@
{
inputs,
pkgs,
config,
lib,
...
}: let
inherit (lib) mkIf;
cfg = config.desktop;
in {
config = mkIf cfg.enable {
fonts.fontconfig.enable = true;
fonts.packages = with pkgs; [
(nerdfonts.override {fonts = ["FiraCode"];})
];
};
}

View file

@ -1,8 +1,14 @@
{ {
inputs, inputs,
pkgs, pkgs,
config,
lib,
... ...
}: { }: let
inherit (lib) mkIf;
cfg = config.desktop;
in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.wezterm.packages.${pkgs.system}.default inputs.wezterm.packages.${pkgs.system}.default
alacritty alacritty
@ -20,4 +26,5 @@
proprietaryCodecs = true; proprietaryCodecs = true;
}) })
]; ];
};
} }

View file

@ -1,6 +0,0 @@
{pkgs, ...}: {
fonts.fontconfig.enable = true;
fonts.packages = with pkgs; [
(nerdfonts.override {fonts = ["FiraCode"];})
];
}

View file

@ -1,14 +0,0 @@
{
inputs,
config,
lib,
...
}: {
imports = with inputs.self.nixosModules; [
fonts
gui
lock
vscode
hyprland
];
}