matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: get rid of vars and move common to modules
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-11-22 23:15:13 -05:00
parent e8fff0bbd3
commit c43560ff95
35 changed files with 407 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
common/default.nix
View file

@ -1,147 +0,0 @@
{
config,
home-manager,
lib,
nh,
nixd,
pkgs,
self,
...
}: let
inherit (lib) attrValues filter findFirst isAttrs hasAttr mkIf mkOption types;
in {
imports = [
./vars
./modules
./packages.nix
self.nixosModules.borgbackup
self.nixosModules.tmux
{programs.tmux.enableCustomConf = true;}
home-manager.nixosModules.home-manager
];
boot.tmp.useTmpfs = true;
systemd.services.nix-daemon = {
environment.TMPDIR = "/home/nix-cache";
preStart = ''
mkdir -p ${config.systemd.services.nix-daemon.environment.TMPDIR}
'';
};
nix = {
package = let
nixdInput =
findFirst
(x: x.pname == "nix") {}
nixd.packages.${pkgs.system}.nixd.buildInputs;
throws = x: !(builtins.tryEval x).success;
hasVersion = x: isAttrs x && hasAttr "version" x;
nixVersions = filter (x: ! throws x && hasVersion x) (attrValues pkgs.nixVersions);
in
findFirst (x: x.version == nixdInput.version) {} nixVersions;
# Edit nix.conf
settings = {
# Store
keep-outputs = true;
keep-derivations = true;
auto-optimise-store = true;
# Commands
experimental-features = ["nix-command" "flakes"];
http-connections = 0; # unlimited for local cache
warn-dirty = false;
show-trace = true;
allow-import-from-derivation = true;
# remote building
trusted-users = ["matt" "nixremote"];
};
};
programs.nh = {
enable = true;
package = nh.packages.${pkgs.system}.default;
# weekly cleanup
clean = {
enable = true;
extraArgs = "--keep-since 30d";
};
};
services = {
fwupd.enable = true;
xserver.xkb = {
layout = "ca";
variant = "multix";
};
};
boot.supportedFilesystems = ["ext4" "xfs" "btrfs" "vfat" "ntfs"];
system.fsPackages = builtins.attrValues {
inherit
(pkgs)
btrfs-progs
nfs-utils
ntfs3g
xfsprogs
;
};
environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
environment.etc.npmrc.text = ''
fund = false
update-notifier = false
'';
environment.systemPackages = builtins.attrValues {
# Peripherals
inherit
(pkgs)
hdparm
pciutils
usbutils
rar
;
};
home-manager.users = let
inherit (config.vars) mainUser;
default = {
imports = [
# Make the vars be the same on Nix and HM
{
options.vars = mkOption {
type = types.attrs;
readOnly = true;
default = config.vars;
};
}
{
programs.bash = {
sessionVariables = rec {
FLAKE = config.environment.variables.FLAKE;
NH_FLAKE = FLAKE;
};
shellAliases.nh = "env -u FLAKE nh";
};
}
];
home.stateVersion = config.system.stateVersion;
};
in {
greeter = mkIf (config.services.greetd.enable) default;
${mainUser} = default;
};
}

8
common/modules/default.nix
View file

@ -1,8 +0,0 @@
{...}: {
imports = [
./cachix.nix
./locale.nix
./locate.nix
./global.nix
];
}

23
common/modules/global.nix
View file

@ -1,23 +0,0 @@
{
config,
lib,
nixpkgs,
...
}: let
inherit (config.sops.secrets) access-token;
inherit (lib) hasAttr optionalString;
in {
# Minimize dowloads of indirect nixpkgs flakes
nix = {
registry.nixpkgs.flake = nixpkgs;
nixPath = ["nixpkgs=${nixpkgs}"];
extraOptions =
optionalString (hasAttr "sops" config)
"!include ${access-token.path}";
};
# Global hm settings
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}

116
common/packages.nix
View file

@ -1,116 +0,0 @@
inputs @ {
pkgs,
self,
...
}: {
nixpkgs.overlays =
(map (i: inputs.${i}.overlays.default) [
"discord-overlay"
"grim-hyprland"
"nixpkgs-wayland"
])
++ (builtins.attrValues {
inherit
(self.overlays)
xdg-desktop-portal-kde
;
});
environment.systemPackages =
(builtins.attrValues {
inherit
(self.packages.${pkgs.system})
pokemon-colorscripts
repl
;
inherit
(pkgs.nodePackages)
undollar
;
inherit (pkgs) alejandra;
# Archiving
inherit
(pkgs)
zip
unzip
p7zip
bzip2
gzip
gnutar
xz
;
# File management
inherit
(pkgs)
findutils
diffutils
util-linux
which
imagemagick
;
# Networking
inherit (pkgs.dig) dnsutils;
inherit
(pkgs)
arp-scan
openssh
rsync
wget
gnupg
;
# Misc CLI stuff
inherit
(pkgs)
hydra-check
killall
nix-output-monitor
nix-melt
progress
tree
gnugrep
gnused
;
# Expected Stuff
inherit
(pkgs)
hostname
man
perl
tzdata
;
})
++ [
# This could help as well: nix derivation show -r /run/current-system
(pkgs.writeShellApplication {
name = "listDerivs";
text = ''
exec nix-store --query --requisites /run/current-system | cut -d- -f2- | sort -u
'';
})
(pkgs.writeShellApplication {
name = "from";
runtimeInputs = builtins.attrValues {
inherit
(pkgs)
coreutils
which
;
};
text = ''
for var do
realpath "$(which "$var")"
done
'';
})
];
}

21
common/vars/default.nix
View file

@ -1,21 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib) mkDefault mkOption types;
cfg = config.vars;
in {
options.vars = {
mainUser = mkOption {
type = types.str;
description = ''
Username that was defined at the initial setup process
'';
};
};
config = {
environment.variables.FLAKE = mkDefault "/home/${cfg.mainUser}/.nix";
};
}

23
devices/README.md
View file

@ -14,26 +14,3 @@ This directory encompasses every device's main configuration file.
| `nos` | My custom built NAS |
| `servivi` | A gaming PC in a previous life, it is now used as a build farm and hosts game servers |
| `wim` | My 2-1 Lenovo Laptop that I use for uni |
## Global Vars
In every device's `default.nix`, you'll find these [settings](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/common/vars/default.nix)
```nix
# $FLAKE/devices/<name>/default.nix
vars = {
mainUser = "matt";
...
};
```
from these declared settings, I get access to global variables
that are different on each host using a 'let in' block:
```nix
let
inherit (config.vars) mainUser ...;
in {
...
```

11
devices/android/nix-on-droid.nix
View file

@ -1,6 +1,6 @@
# FIXME: eval is broken
{
config,
lib,
self,
...
}: {
@ -35,15 +35,6 @@
# Global hm settings
home-manager.config = {
imports = [
# Make the vars be the same on Nix and HM
{
options.vars = lib.mkOption {
type = lib.types.attrs;
readOnly = true;
default = config.vars;
};
}
self.homeManagerModules.neovim
{programs.neovim.enable = true;}

14
devices/bbsteamie/default.nix
View file

@ -1,10 +1,8 @@
{
config,
mainUser,
self,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
# ------------------------------------------------
# Imports
# ------------------------------------------------
@ -13,6 +11,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.kmscon
self.nixosModules.plymouth
self.nixosModules.server
@ -24,8 +23,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "mariah";
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
@ -44,6 +41,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.server = {
user = mainUser;
sshd.enable = true;

3
devices/bbsteamie/modules/desktop/session-switching.nix
View file

@ -1,14 +1,13 @@
defaultSession: {
config,
lib,
mainUser,
pkgs,
...
}: {
config = let
inherit (lib) findFirst getExe mkForce;
inherit (config.vars) mainUser;
switch-session = pkgs.writeShellApplication {
name = "switch-session";

5
devices/bbsteamie/modules/desktop/steam.nix
View file

@ -1,13 +1,12 @@
defaultSession: {
config,
lib,
mainUser,
pkgs,
self,
...
}: {
config = let
inherit (config.vars) mainUser;
in {
config = {
# Normal Steam Stuff
programs.steam = {
enable = true;

14
devices/binto/default.nix
View file

@ -1,10 +1,8 @@
{
config,
mainUser,
self,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
# ------------------------------------------------
# Imports
# ------------------------------------------------
@ -13,6 +11,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.desktop
self.nixosModules.kmscon
self.nixosModules.server
@ -24,8 +23,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
@ -52,6 +49,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.desktop = {
user = mainUser;

2
devices/binto/modules/gpu-replay.nix
View file

@ -1,12 +1,12 @@
{
config,
lib,
mainUser,
pkgs,
self,
...
}: let
inherit (lib) concatStringsSep getExe removePrefix;
inherit (config.vars) mainUser;
inherit (self.packages.${pkgs.system}) gpu-screen-recorder gsr-kms-server;
hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;

11
devices/cluster/default.nix
View file

@ -1,10 +1,9 @@
deviceName: {
config,
mainUser,
self,
...
}: let
inherit (config.vars) mainUser;
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
in {
# ------------------------------------------------
@ -15,6 +14,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.kmscon
self.nixosModules.server
];
@ -25,8 +25,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
@ -54,6 +52,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.server = {
user = mainUser;
tailscale.enable = true;

4
devices/cluster/modules/caddy.nix
View file

@ -1,11 +1,11 @@
{
caddy-plugins,
pkgs,
config,
mainUser,
pkgs,
...
}: let
inherit (config.sops) secrets;
inherit (config.vars) mainUser;
inherit (config.networking) hostName;
caddy = caddy-plugins.packages.${pkgs.system}.default;

7
devices/cluster/modules/headscale/default.nix
View file

@ -1,5 +1,8 @@
{config, ...}: let
inherit (config.vars) mainUser;
{
config,
mainUser,
...
}: let
inherit (config.networking) hostName;
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;

2
devices/cluster/modules/unbound.nix
View file

@ -1,6 +1,7 @@
{
config,
lib,
mainUser,
...
}: let
inherit (lib) foldl isList mapAttrsToList mergeAttrsWithFunc remove unique;
@ -11,7 +12,6 @@
else b)) {}
list;
inherit (config.vars) mainUser;
inherit (config.networking) hostName;
serviviIP = "100.64.0.7";

14
devices/homie/default.nix
View file

@ -1,10 +1,8 @@
{
config,
mainUser,
self,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
# ------------------------------------------------
# Imports
# ------------------------------------------------
@ -13,6 +11,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.docker
self.nixosModules.kmscon
self.nixosModules.server
@ -24,8 +23,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
@ -45,6 +42,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.server = {
user = mainUser;
tailscale.enable = true;

5
devices/homie/modules/music/default.nix
View file

@ -1,10 +1,9 @@
{
config,
mainUser,
pkgs,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
hardware.bluetooth = {
enable = true;
powerOnBoot = true;

14
devices/nos/default.nix
View file

@ -1,10 +1,8 @@
{
config,
mainUser,
self,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
# ------------------------------------------------
# Imports
# ------------------------------------------------
@ -13,6 +11,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.docker
self.nixosModules.kmscon
self.nixosModules.server
@ -24,8 +23,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
@ -46,6 +43,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.server = {
user = mainUser;
tailscale.enable = true;

2
devices/nos/modules/jellyfin/default.nix
View file

@ -1,11 +1,11 @@
{
config,
jellyfin-flake,
mainUser,
lib,
...
}: let
inherit (lib) hasAttr optionals;
inherit (config.vars) mainUser;
optionalGroup = name:
optionals

3
devices/nos/modules/subtitles/default.nix
View file

@ -1,10 +1,9 @@
{
config,
mainUser,
pkgs,
...
} @ inputs: let
inherit (config.vars) mainUser;
convertMkv = pkgs.callPackage ./convert.nix {inherit pkgs;};
extractSubs = pkgs.callPackage ./extract-subs {inherit pkgs;};
sub-clean = pkgs.callPackage ./cleanup.nix {inherit pkgs;};

14
devices/servivi/default.nix
View file

@ -1,10 +1,8 @@
{
config,
mainUser,
self,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
# ------------------------------------------------
# Imports
# ------------------------------------------------
@ -13,6 +11,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.docker
self.nixosModules.kmscon
self.nixosModules.server
@ -24,8 +23,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "matt";
users.users = {
${mainUser} = {
isNormalUser = true;
@ -59,6 +56,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.server = {
user = mainUser;
tailscale.enable = true;

2
devices/servivi/modules/binary-cache.nix
View file

@ -1,10 +1,10 @@
{
config,
mainUser,
nix-fast-build,
pkgs,
...
}: let
inherit (config.vars) mainUser;
inherit (config.sops) secrets;
nix-fast-build-pkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {

6
devices/servivi/modules/minecraft.nix
View file

@ -1,11 +1,9 @@
{
config,
mainUser,
minix,
pkgs,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
imports = [minix.nixosModules.default];
environment.systemPackages = [

14
devices/wim/default.nix
View file

@ -1,11 +1,9 @@
{
config,
mainUser,
self,
pkgs,
...
}: let
inherit (config.vars) mainUser;
in {
}: {
# ------------------------------------------------
# Imports
# ------------------------------------------------
@ -14,6 +12,7 @@ in {
./modules
self.nixosModules.base
self.nixosModules.desktop
self.nixosModules.docker
self.nixosModules.kmscon
@ -27,8 +26,6 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
extraGroups = [
@ -62,6 +59,11 @@ in {
# ------------------------------------------------
# `Self` Modules configuration
# ------------------------------------------------
roles.base = {
enable = true;
user = mainUser;
};
roles.desktop = {
user = mainUser;

BIN
flake.lock
View file

Binary file not shown.

5
lib/flake/default.nix
View file

@ -32,15 +32,16 @@ inputs: rec {
mkNixOS = {
extraModules ? [],
cudaSupport ? false,
mainUser ? "matt",
}:
inputs.nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
specialArgs = inputs;
specialArgs = inputs // {inherit mainUser;};
modules =
[
(allowModularOverrides {inherit system cudaSupport;})
inputs.home-manager.nixosModules.home-manager
{home-manager.extraSpecialArgs = specialArgs;}
../../common
]
++ extraModules;
};

31
nixosModules/base/common-nix/default.nix Normal file
View file

@ -0,0 +1,31 @@
self: {
config,
lib,
...
}: let
inherit (lib) hasAttr mkIf optionalString;
inherit (self.inputs) nixpkgs;
inherit (config.sops.secrets) access-token;
cfg = config.roles.base;
in {
config = mkIf cfg.enable {
# Minimize dowloads of indirect nixpkgs flakes
nix = {
registry.nixpkgs.flake = nixpkgs;
nixPath = ["nixpkgs=${nixpkgs}"];
extraOptions =
optionalString (hasAttr "sops" config)
"!include ${access-token.path}";
};
# Global hm settings
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
};
# For accurate stack trace
_file = ./default.nix;
}

155
nixosModules/base/default.nix Normal file
View file

@ -0,0 +1,155 @@
self: {
config,
lib,
pkgs,
...
}: let
inherit (lib) attrValues filter findFirst isAttrs hasAttr mkDefault mkIf mkOption types;
inherit (self.inputs) home-manager nh nixd;
cfg = config.roles.base;
in {
imports = [
./locale
./locate
./substituters
(import ./common-nix self)
(import ./packages self)
self.nixosModules.borgbackup
self.nixosModules.tmux
home-manager.nixosModules.home-manager
];
options.roles.base = {
enable = mkOption {
type = types.bool;
default = true;
};
user = mkOption {
type = types.str;
};
};
config = mkIf (cfg.enable) {
environment.variables.FLAKE = mkDefault "/home/${cfg.user}/.nix";
programs.tmux.enableCustomConf = true;
boot.tmp.useTmpfs = true;
systemd.services.nix-daemon = {
environment.TMPDIR = "/home/nix-cache";
preStart = ''
mkdir -p ${config.systemd.services.nix-daemon.environment.TMPDIR}
'';
};
nix = {
package = let
nixdInput =
findFirst
(x: x.pname == "nix") {}
nixd.packages.${pkgs.system}.nixd.buildInputs;
throws = x: !(builtins.tryEval x).success;
hasVersion = x: isAttrs x && hasAttr "version" x;
nixVersions = filter (x: ! throws x && hasVersion x) (attrValues pkgs.nixVersions);
in
findFirst (x: x.version == nixdInput.version) {} nixVersions;
# Edit nix.conf
settings = {
# Store
keep-outputs = true;
keep-derivations = true;
auto-optimise-store = true;
# Commands
experimental-features = ["nix-command" "flakes"];
http-connections = 0; # unlimited for local cache
warn-dirty = false;
show-trace = true;
allow-import-from-derivation = true;
# remote building
trusted-users = ["matt" "nixremote"];
};
};
programs.nh = {
enable = true;
package = nh.packages.${pkgs.system}.default;
# weekly cleanup
clean = {
enable = true;
extraArgs = "--keep-since 30d";
};
};
services = {
fwupd.enable = true;
xserver.xkb = {
layout = "ca";
variant = "multix";
};
};
boot.supportedFilesystems = ["ext4" "xfs" "btrfs" "vfat" "ntfs"];
system.fsPackages = attrValues {
inherit
(pkgs)
btrfs-progs
nfs-utils
ntfs3g
xfsprogs
;
};
environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
environment.etc.npmrc.text = ''
fund = false
update-notifier = false
'';
environment.systemPackages = attrValues {
# Peripherals
inherit
(pkgs)
hdparm
pciutils
usbutils
rar
;
};
home-manager.users = let
default = {
imports = [
{
programs.bash = {
sessionVariables = rec {
FLAKE = config.environment.variables.FLAKE;
NH_FLAKE = FLAKE;
};
shellAliases.nh = "env -u FLAKE nh";
};
}
];
home.stateVersion = config.system.stateVersion;
};
in {
greeter = mkIf (config.services.greetd.enable) default;
${cfg.user} = default;
};
};
# For accurate stack trace
_file = ./default.nix;
}

0
common/modules/locale.nix → nixosModules/base/locale/default.nix
View file

18
common/modules/locate.nix → nixosModules/base/locate/default.nix
View file

@ -4,25 +4,27 @@
lib,
...
}: let
inherit (config.vars) mainUser;
inherit (lib) concatStringsSep getName;
baseCfg = config.roles.base;
cfg = config.services.locate;
locateGroup = lib.getName cfg.package.name;
locateGroup = getName cfg.package.name;
locate = "${cfg.package}/bin/locate";
updatedb = "${cfg.package}/bin/updatedb";
database = "/var/lib/locate/locatedb";
pruneFS = builtins.concatStringsSep " " cfg.pruneFS;
pruneNames = builtins.concatStringsSep " " cfg.pruneNames;
prunePaths = builtins.concatStringsSep " " cfg.prunePaths;
pruneFS = concatStringsSep " " cfg.pruneFS;
pruneNames = concatStringsSep " " cfg.pruneNames;
prunePaths = concatStringsSep " " cfg.prunePaths;
updatedbBin = ''
${updatedb} -o ${database} --prunefs "${pruneFS}" \
--prunepaths "${prunePaths}" --prunenames "${pruneNames}"
'';
in {
users.users.${mainUser}.extraGroups = [
users.users.${baseCfg.user}.extraGroups = [
locateGroup
];
@ -30,7 +32,7 @@ in {
systemd.services.locate = {
wantedBy = ["default.target"];
serviceConfig = {
User = mainUser;
User = baseCfg.user;
Group = locateGroup;
StateDirectory = "locate";
StateDirectoryMode = "0770";
@ -38,7 +40,7 @@ in {
};
};
home-manager.users.${mainUser}.programs.bash.shellAliases = {
home-manager.users.${baseCfg.user}.programs.bash.shellAliases = {
locate = "${pkgs.writeShellScriptBin "lct" ''
exec ${locate} -d ${database} "$@" 2> >(grep -v "/var/cache/locatedb")
''}/bin/lct";

126
nixosModules/base/packages/default.nix Normal file
View file

@ -0,0 +1,126 @@
self: {
config,
lib,
pkgs,
...
}: let
inherit (lib) attrValues mkIf;
cfg = config.roles.base;
in {
config = mkIf (cfg.enable) {
nixpkgs.overlays =
(map (i: self.inputs.${i}.overlays.default) [
"discord-overlay"
"grim-hyprland"
"nixpkgs-wayland"
])
++ (attrValues {
inherit
(self.overlays)
xdg-desktop-portal-kde
;
});
environment.systemPackages =
(attrValues {
inherit
(self.packages.${pkgs.system})
pokemon-colorscripts
repl
;
inherit
(pkgs.nodePackages)
undollar
;
inherit (pkgs) alejandra;
# Archiving
inherit
(pkgs)
zip
unzip
p7zip
bzip2
gzip
gnutar
xz
;
# File management
inherit
(pkgs)
findutils
diffutils
util-linux
which
imagemagick
;
# Networking
inherit (pkgs.dig) dnsutils;
inherit
(pkgs)
arp-scan
openssh
rsync
wget
gnupg
;
# Misc CLI stuff
inherit
(pkgs)
hydra-check
killall
nix-output-monitor
nix-melt
progress
tree
gnugrep
gnused
;
# Expected Stuff
inherit
(pkgs)
hostname
man
perl
tzdata
;
})
++ [
# This could help as well: nix derivation show -r /run/current-system
(pkgs.writeShellApplication {
name = "listDerivs";
text = ''
exec nix-store --query --requisites /run/current-system | cut -d- -f2- | sort -u
'';
})
(pkgs.writeShellApplication {
name = "from";
runtimeInputs = attrValues {
inherit
(pkgs)
coreutils
which
;
};
text = ''
for var do
realpath "$(which "$var")"
done
'';
})
];
};
# For accurate stack trace
_file = ./default.nix;
}

2
common/modules/cachix.nix → nixosModules/base/substituters/default.nix
View file

@ -18,7 +18,7 @@ in {
name = "rebuild-no-cache";
runtimeInputs = [config.programs.nh.package];
text = ''
nh os switch -- --option binary-caches "https://cache.nixos.org" "$@"
exec nh os switch -- --option binary-caches "https://cache.nixos.org" "$@"
'';
})
];

1
nixosModules/default.nix
View file

@ -1,4 +1,5 @@
self: {
base = import ./base self;
borgbackup = import ./borgbackup;
desktop = import ./desktop self;
docker = import ./docker self.inputs.khepri;

7
outputs.nix
View file

@ -73,7 +73,10 @@
extraModules = [./devices/binto];
};
bbsteamie = mkNixOS {extraModules = [./devices/bbsteamie];};
bbsteamie = mkNixOS {
mainUser = "mariah";
extraModules = [./devices/bbsteamie];
};
# NAS
nos = mkNixOS {
@ -117,7 +120,7 @@
live-image = mkNixOS {
extraModules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
{vars.mainUser = "nixos";}
# {vars.mainUser = "nixos";} FIXME: add default modules and stuff
];
};
};