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

bunch of sliming down

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-03-18 18:01:46 -05:00
parent aacf05e59d
commit 8b2a1b1f4f
21 changed files with 992 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/general/fonts.nix
View file

@ -1,5 +1,7 @@
{
pkgs,
lib,
config,
...
}:
let
@ -14,9 +16,27 @@ let
pkgs.nerd-fonts.jetbrains-mono
else
(pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
ccfg = import ../config.nix;
cfg_path = [
ccfg.custom_config_key
"general"
];
cfg = lib.attrsets.getAttrFromPath cfg_path config;
in
{
config = {
options =
{ }
// lib.attrsets.setAttrByPath cfg_path {
jetbrainsMonoFont = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Enable jetbrains mono font";
};
};
config = lib.mkIf cfg.jetbrainsMonoFont {
fonts.packages = [ jetbrainsMonoFont ];
};
}

2
common/general/shell/common.nix
View file

@ -24,8 +24,6 @@ with lib;
killall
hdparm
speedtest-cli
ffmpeg-full
appimage-run
];
environment.shellAliases = {

21
common/general/tty_caps_esc.nix
View file

@ -1,11 +1,28 @@
{
lib,
pkgs,
config,
...
}:
with lib;
let
ccfg = import ../config.nix;
cfg_path = [
ccfg.custom_config_key
"general"
];
cfg = lib.attrsets.getAttrFromPath cfg_path config;
in
{
config = {
options =
{ }
// lib.attrsets.setAttrByPath cfg_path {
ttyCapsEscape = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Enable caps for escape key";
};
};
config = lib.mkIf cfg.ttyCapsEscape {
services.xserver.xkb.options = "caps:escape";
console = {
earlySetup = true;

159
common/secrets/default.nix
View file

@ -1,91 +1,104 @@
{
config,
ragenix,
lib,
pkgs,
...
}:
let
ccfg = import ../config.nix;
cfg_path = [
ccfg.custom_config_key
"secrets"
];
cfg = lib.attrsets.getAttrFromPath cfg_path config;
users_cfg = config.${ccfg.custom_config_key}.users;
in
# TODO auto import secret files here
# secretsFile = (settings.secretsDir + /secrets.nix);
{
environment.systemPackages = [
ragenix.packages.${pkgs.system}.default
pkgs.rage
];
options =
{ }
// lib.attrsets.setAttrByPath cfg_path {
enable = lib.mkEnableOption "secrets";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [
ragenix.packages.${pkgs.system}.default
pkgs.rage
];
age = {
secrets =
# builtins.mapAttrs
# (name: _value: lib.nameValuePair (lib.removeSuffix ".age" name) {
# file = (settings.secretsDir + "/${name}");
# owner = lib.mkDefault users_cfg.primary;
# })
# (import secretsFile);
{
nix2github = {
file = ./secrets/nix2github.age;
owner = users_cfg.primary;
age = {
secrets =
# builtins.mapAttrs
# (name: _value: lib.nameValuePair (lib.removeSuffix ".age" name) {
# file = (settings.secretsDir + "/${name}");
# owner = lib.mkDefault users_cfg.primary;
# })
# (import secretsFile);
{
nix2github = {
file = ./secrets/nix2github.age;
owner = users_cfg.primary;
};
nix2bitbucket = {
file = ./secrets/nix2bitbucket.age;
owner = users_cfg.primary;
};
nix2gitjosh = {
file = ./secrets/nix2gitjosh.age;
owner = users_cfg.primary;
};
nix2h001 = {
file = ./secrets/nix2h001.age;
owner = users_cfg.primary;
};
nix2h002 = {
file = ./secrets/nix2h002.age;
owner = users_cfg.primary;
};
nix2joe = {
file = ./secrets/nix2joe.age;
owner = users_cfg.primary;
};
nix2gpdPocket3 = {
file = ./secrets/nix2gpdPocket3.age;
owner = users_cfg.primary;
};
nix2t = {
file = ./secrets/nix2t.age;
owner = users_cfg.primary;
};
nix2linode = {
file = ./secrets/nix2linode.age;
owner = users_cfg.primary;
};
nix2oracle = {
file = ./secrets/nix2oracle.age;
owner = users_cfg.primary;
};
nix2l002 = {
file = ./secrets/nix2l002.age;
owner = users_cfg.primary;
};
nix2lio = {
file = ./secrets/nix2lio.age;
owner = users_cfg.primary;
};
nix2oren = {
file = ./secrets/nix2oren.age;
owner = users_cfg.primary;
};
github_read_token = {
file = ./secrets/github_read_token.age;
owner = users_cfg.primary;
};
headscale_auth = {
file = ./secrets/headscale_auth.age;
owner = users_cfg.primary;
};
};
nix2bitbucket = {
file = ./secrets/nix2bitbucket.age;
owner = users_cfg.primary;
};
nix2gitjosh = {
file = ./secrets/nix2gitjosh.age;
owner = users_cfg.primary;
};
nix2h001 = {
file = ./secrets/nix2h001.age;
owner = users_cfg.primary;
};
nix2h002 = {
file = ./secrets/nix2h002.age;
owner = users_cfg.primary;
};
nix2joe = {
file = ./secrets/nix2joe.age;
owner = users_cfg.primary;
};
nix2gpdPocket3 = {
file = ./secrets/nix2gpdPocket3.age;
owner = users_cfg.primary;
};
nix2t = {
file = ./secrets/nix2t.age;
owner = users_cfg.primary;
};
nix2linode = {
file = ./secrets/nix2linode.age;
owner = users_cfg.primary;
};
nix2oracle = {
file = ./secrets/nix2oracle.age;
owner = users_cfg.primary;
};
nix2l002 = {
file = ./secrets/nix2l002.age;
owner = users_cfg.primary;
};
nix2lio = {
file = ./secrets/nix2lio.age;
owner = users_cfg.primary;
};
nix2oren = {
file = ./secrets/nix2oren.age;
owner = users_cfg.primary;
};
github_read_token = {
file = ./secrets/github_read_token.age;
owner = users_cfg.primary;
};
headscale_auth = {
file = ./secrets/headscale_auth.age;
owner = users_cfg.primary;
};
};
};
};
}