kiri/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate into variables

Browse Source
This commit is contained in:
kiri
2025-11-29 23:20:29 +01:00
parent 31bf80e451
commit ecbe87af9b
11 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hosts/altair/variables.nix
View File

@@ -1,4 +1,7 @@
{ config, ... }:
let
monitor = "desc:California Institute of Technology 0x1410";
in
{
config.var = {
hostname = "altair";
@@ -7,17 +10,17 @@
hyprland = {
workspace = [
"1, monitor:desc:California Institute of Technology 0x1410, persistent:true, default:true"
"2, monitor:desc:California Institute of Technology 0x1410, persistent:true"
"3, monitor:desc:California Institute of Technology 0x1410, persistent:true"
"1, monitor:${monitor}, persistent:true, default:true"
"2, monitor:${monitor}, persistent:true"
"3, monitor:${monitor}, persistent:true"
"11, monitor:desc:California Institute of Technology 0x1410, persistent:true"
"12, monitor:desc:California Institute of Technology 0x1410, persistent:true"
"13, monitor:desc:California Institute of Technology 0x1410, persistent:true"
"11, monitor:${monitor}, persistent:true"
"12, monitor:${monitor}, persistent:true"
"13, monitor:${monitor}, persistent:true"
];
monitor = [
"desc:California Institute of Technology 0x1410,3072x1920@120,auto,1.6"
"${monitor},3072x1920@120,auto,1.6"
];
};
};

20
hosts/polaris/variables.nix
View File

@@ -1,4 +1,8 @@
{ config, ... }:
let
monitor1 = "desc:LG Electronics LG ULTRAGEAR 103NTYT8R290";
monitor2 = "desc:LG Electronics LG ULTRAGEAR 103NTJJ8R332";
in
{
config.var = {
hostname = "polaris";
@@ -7,18 +11,18 @@
hyprland = {
workspace = [
"1, monitor:desc:LG Electronics LG ULTRAGEAR 103NTYT8R290, persistent:true, default:true"
"2, monitor:desc:LG Electronics LG ULTRAGEAR 103NTYT8R290, persistent:true"
"3, monitor:desc:LG Electronics LG ULTRAGEAR 103NTYT8R290, persistent:true"
"1, monitor:${monitor1}, persistent:true, default:true"
"2, monitor:${monitor1}, persistent:true"
"3, monitor:${monitor1}, persistent:true"
"11, monitor:desc:LG Electronics LG ULTRAGEAR 103NTJJ8R332, persistent:true, default:true"
"12, monitor:desc:LG Electronics LG ULTRAGEAR 103NTJJ8R332, persistent:true"
"13, monitor:desc:LG Electronics LG ULTRAGEAR 103NTJJ8R332, persistent:true"
"11, monitor:${monitor2}, persistent:true, default:true"
"12, monitor:${monitor2}, persistent:true"
"13, monitor:${monitor2}, persistent:true"
];
monitor = [
"desc:LG Electronics LG ULTRAGEAR 103NTYT8R290,2560x1440@144,0x0,1"
"desc:LG Electronics LG ULTRAGEAR 103NTJJ8R332,2560x1440@144,2560x0,1"
"${monitor1},2560x1440@144,0x0,1"
"${monitor2},2560x1440@144,2560x0,1"
];
};
};

4
modules/home-manager/bitwarden.nix
View File

@@ -1,10 +1,10 @@
{ pkgs, ... }:
{ pkgs, config, ... }:
{
programs.rbw = {
enable = true;
settings = {
base_url = "https://vault.jelles.net";
email = "mail@jelles.net";
email = config.var.email;
pinentry = pkgs.pinentry-gnome3;
};
};

16
modules/home-manager/git.nix
View File

@@ -1,8 +1,6 @@
# Git configuration
{config, ...}: let
username = config.var.git.username;
email = config.var.git.email;
in {
{ config, ... }:
{
programs.git = {
enable = true;
ignores = [
@@ -18,8 +16,8 @@ in {
"result-*"
];
settings = {
user.name = username;
user.email = email;
user.name = config.var.username;
user.email = config.var.email;
init.defaultBranch = "main";
pull.rebase = "false";
push.autoSetupRemote = true;
@@ -44,10 +42,8 @@ in {
st = "status";
br = "branch";
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
hist = ''
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
llog = ''
log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
};
};

2
modules/home-manager/nh.nix
View File

@@ -1,6 +1,6 @@
{config, ...}: {
programs.nh = {
enable = true;
flake = "/home/kiri/.config/nixos"; # Assuming this is the flake root
flake = config.var.configDirectory; # Assuming this is the flake root
};
}

4
modules/home-manager/nixCats/default.nix
View File

@@ -129,8 +129,8 @@ let
extra = {
nixdExtras = {
nixpkgs = ''import ${pkgs.path} {}'';
nixos_options = ''(builtins.getFlake "path:///home/kiri/.config/nixos").nixosConfigurations.${toString config.var.hostname}.options'';
home_manager_options = ''(builtins.getFlake "path:///home/kiri/.config/nixos").nixosConfigurations.${toString config.var.hostname}.options.home-manager.users.type.getSubOptions []'';
nixos_options = ''(builtins.getFlake "path://${config.var.configDirectory}").nixosConfigurations.${toString config.var.hostname}.options'';
home_manager_options = ''(builtins.getFlake "path://${config.var.configDirectory}").nixosConfigurations.${toString config.var.hostname}.options.home-manager.users.type.getSubOptions []'';
};
};
};

9
modules/home-manager/rclone.nix
View File

@@ -1,3 +1,4 @@
{ config, ... }:
{
programs.rclone = {
enable = true;
@@ -11,16 +12,16 @@
};
secrets = {
token = "/home/kiri/.config/rclone/gdrive_token";
token = "${config.xdg.configHome}/rclone/gdrive_token";
client_id = "/home/kiri/.config/rclone/gdrive_client_id";
client_secret = "/home/kiri/.config/rclone/gdrive_client_secret"; #TODO: sops?
client_id = "${config.xdg.configHome}/rclone/gdrive_client_id";
client_secret = "${config.xdg.configHome}/rclone/gdrive_client_secret"; # TODO: sops?
};
mounts = {
"/" = {
enable = true;
mountPoint = "/home/kiri/gdrive";
mountPoint = "${config.home.homeDirectory}/gdrive";
options = {
dir-cache-time = "5000h";

2
modules/home-manager/thunderbird.nix
View File

@@ -2,7 +2,7 @@
{
programs.thunderbird = {
enable = true;
profiles.kiri = {
profiles.${config.var.username} = {
isDefault = true;
withExternalGnupg = true;
settings = {

10
modules/nixos/caddy.nix
View File

@@ -1,4 +1,9 @@
{ inputs, pkgs, ... }:
{
inputs,
pkgs,
config,
...
}:
{
services.caddy = {
enable = true;
@@ -10,7 +15,8 @@
root * ${inputs.zentire-website.packages.${pkgs.stdenv.hostPlatform.system}.default}
file_server
'';
email = "mail@jelles.net";
email = config.var.email;
};
networking.firewall = {

5
modules/variables.nix
View File

@@ -17,10 +17,7 @@
numericLocale = "en_IE.UTF-8";
otherLocale = "nl_NL.UTF-8";
git = {
username = "kiri";
email = "mail@jelles.net";
};
email = "mail@jelles.net";
preferred = {
editor = "nvim";