Henry-Hiles/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes and formatting

Browse source
This commit is contained in:
Henry Hiles 2025-09-23 09:17:26 -04:00
commit 80cf48f1e8
No known key found for this signature in database
71 changed files with 746 additions and 1110 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/common/agenix.nix
View file

@ -2,14 +2,17 @@
dirUtils,
lib,
...
}: {
}:
{
age = {
identityPaths = [
"/home/quadradical/.ssh/id_ed25519"
];
secrets = lib.listToAttrs (map (path: {
name = lib.last (builtins.split "/" (toString path));
value.file = path;
}) (dirUtils.dirFiles ".age" ../../secrets));
secrets = lib.listToAttrs (
map (path: {
name = lib.last (builtins.split "/" (toString path));
value.file = path;
}) (dirUtils.dirFiles ".age" ../../secrets)
);
};
}

5
modules/common/backup.nix
View file

@ -1 +1,4 @@
{inputs, ...}: {environment.etc."backup".source = inputs.self;}
{ inputs, ... }:
{
environment.etc."backup".source = inputs.self;
}

5
modules/common/bat.nix
View file

@ -2,4 +2,7 @@
lib,
pkgs,
...
}: {environment.shellAliases.cat = "${lib.getExe pkgs.bat} --theme Nord";}
}:
{
environment.shellAliases.cat = "${lib.getExe pkgs.bat} --theme Nord";
}

6
modules/common/dns.nix
View file

@ -2,9 +2,9 @@
services.dnsproxy = {
enable = true;
settings = rec {
upstream = ["https://base.dns.mullvad.net/dns-query"];
listen-addrs = ["127.0.0.1"];
fallback = ["1.1.1.1"];
upstream = [ "https://base.dns.mullvad.net/dns-query" ];
listen-addrs = [ "127.0.0.1" ];
fallback = [ "1.1.1.1" ];
bootstrap = fallback;
};
};

7
modules/common/experimental.nix
View file

@ -1 +1,6 @@
{nix.settings.experimental-features = ["nix-command" "flakes"];}
{
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
}

5
modules/common/eza.nix
View file

@ -2,4 +2,7 @@
lib,
pkgs,
...
}: {environment.shellAliases.ls = "${lib.getExe pkgs.eza} --all --icons --hyperlink --group-directories-first --color=always";}
}:
{
environment.shellAliases.ls = "${lib.getExe pkgs.eza} --all --icons --hyperlink --group-directories-first --color=always";
}

185
modules/common/fastfetch.nix
View file

@ -2,97 +2,102 @@
pkgs,
lib,
...
}: {
environment.shellAliases.neofetch = let
color = "#4E94E4";
in "${lib.getExe pkgs.fastfetch} --config ${pkgs.writers.writeJSON "fastfetch.json" {
logo = {
height = 18;
type = "chafa";
source = ../../logo.png;
};
display = {
separator = " ";
color.keys = color;
};
modules = [
"break"
}:
{
environment.shellAliases.neofetch =
let
color = "#4E94E4";
in
"${lib.getExe pkgs.fastfetch} --config ${
pkgs.writers.writeJSON "fastfetch.json" {
logo = {
height = 18;
type = "chafa";
source = ../../logo.png;
};
display = {
separator = " ";
color.keys = color;
};
modules = [
"break"
{
type = "custom";
format = "{#${color}}┌─────────{#} Hardware Information {#${color}}──────────";
}
{
type = "cpu";
key = "├";
}
{
type = "gpu";
key = "├─󰍹";
}
{
type = "board";
key = "├";
}
{
type = "custom";
format = "{#${color}}┌─────────{#} Hardware Information {#${color}}──────────";
}
{
type = "cpu";
key = "├";
}
{
type = "gpu";
key = "├─󰍹";
}
{
type = "board";
key = "├";
}
{
type = "custom";
format = "{#${color}}├─────────{#} Software Information {#${color}}──────────";
}
{
type = "os";
key = "├";
}
{
type = "kernel";
key = "├";
}
{
type = "memory";
key = "├";
}
{
type = "disk";
key = "├";
}
{
type = "de";
key = "├";
}
{
type = "terminal";
key = "├󰆍";
}
{
type = "shell";
key = "├󰈺";
}
{
type = "font";
key = "├";
}
{
type = "wmtheme";
key = "├󰉼";
}
{
type = "icons";
key = "├";
}
{
type = "cursor";
key = "├󰇀";
}
{
type = "packages";
key = "├󰏖";
}
{
type = "custom";
format = "{#${color}}└────────────────────────────────────────";
}
{
type = "custom";
format = "{#${color}}├─────────{#} Software Information {#${color}}──────────";
}
{
type = "os";
key = "├";
}
{
type = "kernel";
key = "├";
}
{
type = "memory";
key = "├";
}
{
type = "disk";
key = "├";
}
{
type = "de";
key = "├";
}
{
type = "terminal";
key = "├󰆍";
}
{
type = "shell";
key = "├󰈺";
}
{
type = "font";
key = "├";
}
{
type = "wmtheme";
key = "├󰉼";
}
{
type = "icons";
key = "├";
}
{
type = "cursor";
key = "├󰇀";
}
{
type = "packages";
key = "├󰏖";
}
{
type = "custom";
format = "{#${color}}└────────────────────────────────────────";
}
"break"
];
}}";
"break"
];
}
}";
}

5
modules/common/fish.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.fish = {
enable = true;
interactiveShellInit = ''
@ -7,6 +8,6 @@
'';
};
environment.shells = [pkgs.fish];
environment.shells = [ pkgs.fish ];
users.defaultUserShell = pkgs.fish;
}

5
modules/common/free.nix
View file

@ -1 +1,4 @@
{pkgs, ...}: {environment.shellAliases.free = "${pkgs.procps}/bin/free -h";}
{ pkgs, ... }:
{
environment.shellAliases.free = "${pkgs.procps}/bin/free -h";
}

31
modules/common/git.nix
View file

@ -2,7 +2,8 @@
pkgs,
lib,
...
}: {
}:
{
programs.git = {
enable = true;
config = {
@ -12,9 +13,9 @@
signingKey = builtins.elemAt (import ../../secrets/keys.nix) 0;
};
url = {
"git@github.com:".insteadOf = ["https://github.com"];
"git@codeberg.org:".insteadOf = ["https://codeberg.org"];
"git@git.federated.nexus:".insteadOf = ["https://git.federated.nexus"];
"git@github.com:".insteadOf = [ "https://github.com" ];
"git@codeberg.org:".insteadOf = [ "https://codeberg.org" ];
"git@git.federated.nexus:".insteadOf = [ "https://git.federated.nexus" ];
};
init.defaultBranch = "main";
commit.gpgsign = true;
@ -23,16 +24,18 @@
};
};
environment = {
systemPackages = [pkgs.gh];
shellAliases = let
gitExe = lib.meta.getExe pkgs.git;
ghExe = lib.meta.getExe pkgs.gh;
in {
clone = "${ghExe} repo clone";
create = "${ghExe} repo create";
systemPackages = [ pkgs.gh ];
shellAliases =
let
gitExe = lib.meta.getExe pkgs.git;
ghExe = lib.meta.getExe pkgs.gh;
in
{
clone = "${ghExe} repo clone";
create = "${ghExe} repo create";
push = "${gitExe} push";
commit = "${gitExe} commit -am";
};
push = "${gitExe} push";
commit = "${gitExe} commit -am";
};
};
}

5
modules/common/micro.nix
View file

@ -1,6 +1,7 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
environment = {
systemPackages = [pkgs.micro];
systemPackages = [ pkgs.micro ];
sessionVariables.EDITOR = "micro";
};
}

3
modules/common/packages.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
fd
glib

2
modules/common/state-version.nix
View file

@ -1 +1 @@
{system.stateVersion = "23.11";}
{ system.stateVersion = "23.11"; }

5
modules/common/trash.nix
View file

@ -1 +1,4 @@
{pkgs, ...}: {environment.shellAliases.rm = "${pkgs.glib}/bin/gio trash";}
{ pkgs, ... }:
{
environment.shellAliases.rm = "${pkgs.glib}/bin/gio trash";
}

5
modules/common/users.nix
View file

@ -1,4 +1,5 @@
{config, ...}: {
{ config, ... }:
{
users = {
mutableUsers = false;
users = {
@ -7,7 +8,7 @@
isNormalUser = true;
hashedPasswordFile = config.age.secrets."password.age".path;
description = "QuadRadical";
extraGroups = ["wheel"];
extraGroups = [ "wheel" ];
};
};
};