opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor(nixos): extract Home Manager modules

Browse source
This commit is contained in:
Oliver Davies 2023-11-07 06:39:10 +00:00
parent 2968f5396d
commit ec23fb1431
5 changed files with 110 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
system/nixos/default.nix
View file

@ -14,7 +14,7 @@ inputs.nixpkgs.lib.nixosSystem {
extraSpecialArgs = { inherit inputs desktop self username; };
useGlobalPkgs = true;
useUserPackages = true;
users."${username}" = import ./home-manager.nix;
users."${username}" = import ./home-manager;
};
}

8
system/nixos/home-manager.nix → system/nixos/home-manager/default.nix
View file

@ -1,9 +1,9 @@
{ inputs, config, desktop, pkgs, self, username, ... }:
{ config, desktop, inputs, pkgs, self, username, ... }:
let
desktop-config = import ./home-manager-desktop.nix { inherit config inputs pkgs; };
shared-config = import ../shared/home-manager.nix { inherit inputs pkgs self username; };
shared-packages = import ../shared/home-manager-packages.nix { inherit inputs pkgs; };
desktop-config = import ./desktop.nix { inherit config inputs pkgs; };
shared-config = import ../../shared/home-manager.nix { inherit inputs pkgs self username; };
shared-packages = import ../../shared/home-manager-packages.nix { inherit inputs pkgs; };
in
{
imports = if desktop then [ desktop-config shared-config ] else [ shared-config ];

13
system/nixos/home-manager/desktop.nix Normal file
View file

@ -0,0 +1,13 @@
{ config, inputs, pkgs }:
{
imports = [
./modules/alacritty.nix
./modules/sway.nix
];
xdg.configFile.wallpaper = {
source = ../../../config/wallpaper;
recursive = true;
};
}

28
system/nixos/home-manager/modules/alacritty.nix Normal file
View file

@ -0,0 +1,28 @@
{
programs.alacritty = {
enable = true;
settings = {
window.opacity = 0.9;
window.padding = {
x = 15;
y = 15;
};
font = {
size = 16.0;
bold.style = "Regular";
bolditalic.style = "Regular";
italic.style = "Regular";
normal.family = "AnonymicePro Nerd Font Mono";
offset.y = 12;
glyph_offset.y = 6;
};
shell = { program = "zsh"; };
};
};
}

160
system/nixos/home-manager-desktop.nix → system/nixos/home-manager/modules/sway.nix
View file

@ -1,4 +1,4 @@
{ config, inputs, pkgs }:
{ config, inputs, pkgs, ... }:
{
services.swayidle = {
@ -34,6 +34,66 @@
};
};
programs.i3status-rust = {
enable = true;
bars = {
default = {
blocks = [
{
block = "net";
format = " $ip ";
}
{
block = "battery";
format = " $icon $percentage $time ";
}
{
block = "cpu";
}
{
block = "memory";
format = " $icon $mem_total_used_percents.eng(w:2) ";
format_alt = " $icon_swap $swap_used_percents.eng(w:2) ";
}
{
block = "disk_space";
path = "/";
info_type = "available";
alert_unit = "GB";
interval = 20;
warning = 20.0;
alert = 10.0;
format = " $icon $available.eng(w:2) ";
}
{
block = "time";
interval = 1;
format = " $timestamp.datetime(f:'%F %T') ";
}
];
settings = {
theme = {
theme = "plain";
overrides = {
critical_bg = "#222222";
good_bg = "#222222";
good_fg = "#ffffff";
idle_bg = "#222222";
idle_fg = "#ffffff";
info_bg = "#222222";
info_fg = "#ffffff";
separator_bg = "#222222";
warning_bg = "#222222";
warning_fg = "#ffffff";
};
};
};
};
};
};
wayland.windowManager.sway = {
enable = true;
@ -55,7 +115,7 @@
fonts = {
names = [ "JetBrainsMono Nerd Font Mono" ];
size = 16.0;
size = 12.0;
};
statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
@ -64,9 +124,9 @@
];
gaps = {
inner = 10;
inner = 0;
smartBorders = "on";
smartGaps = true;
# smartGaps = true;
};
input = {
@ -134,96 +194,4 @@
for_window [app_id="zoom" title="Zoom - Free Account"] floating disable
'';
};
programs.i3status-rust = {
enable = true;
bars = {
default = {
blocks = [
{
block = "net";
format = " $ip ";
}
{
block = "battery";
format = " $icon $percentage $time ";
}
{
block = "cpu";
}
{
block = "memory";
format = " $icon $mem_total_used_percents.eng(w:2) ";
format_alt = " $icon_swap $swap_used_percents.eng(w:2) ";
}
{
block = "disk_space";
path = "/";
info_type = "available";
alert_unit = "GB";
interval = 20;
warning = 20.0;
alert = 10.0;
format = " $icon $available.eng(w:2) ";
}
{
block = "time";
interval = 1;
format = " $timestamp.datetime(f:'%F %T') ";
}
];
settings = {
theme = {
theme = "plain";
overrides = {
critical_bg = "#222222";
good_bg = "#222222";
good_fg = "#ffffff";
idle_bg = "#222222";
idle_fg = "#ffffff";
info_bg = "#222222";
info_fg = "#ffffff";
separator_bg = "#222222";
warning_bg = "#222222";
warning_fg = "#ffffff";
};
};
};
};
};
};
xdg.configFile.wallpaper = {
source = ../../config/wallpaper;
recursive = true;
};
programs.alacritty = {
enable = true;
settings = {
window.opacity = 0.9;
window.padding = {
x = 15;
y = 15;
};
font = {
size = 16.0;
bold.style = "Regular";
bolditalic.style = "Regular";
italic.style = "Regular";
normal.family = "IntoneMono Nerd Font Mono";
offset.y = 12;
glyph_offset.y = 6;
};
shell = { program = "zsh"; };
};
};
}