Compare commits

..

4 Commits

Author SHA1 Message Date
3ddeb31eeb Updated lockfiles 2025-05-15 11:31:16 -03:00
4fec531240 Fixed timezone 2025-05-15 11:29:05 -03:00
6d938bc278 Updated git information 2025-05-15 11:28:48 -03:00
6f3da94945 Enabled mutableUsers to fix password resetting on rebuild. 2025-05-15 11:28:31 -03:00
4 changed files with 44 additions and 42 deletions

60
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746729224, "lastModified": 1747274630,
"narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "85555d27ded84604ad6657ecca255a03fd878607", "rev": "ec7c109a4f794fce09aad87239eab7f66540b888",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -59,11 +59,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1747083103, "lastModified": 1747129300,
"narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", "rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -100,11 +100,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747069642, "lastModified": 1747297701,
"narHash": "sha256-a4TdGi/Ju8P3r5OIecNfM3LH3kccMY0dIo+EwiyphmM=", "narHash": "sha256-R8mFJL3lREsJNDqPHbsn03imKoH2ocpzgT2kKWsWYBM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "d642c9856003ed37ce34dab618abf37e3ade1061", "rev": "b6fff20c692d684d250a39453ed1853dd44c96ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -122,11 +122,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1747097775, "lastModified": 1747305716,
"narHash": "sha256-WYW1IpCnWSkTIO0oVv1r6rVP6SCZixmIZ3ftlm8Ern8=", "narHash": "sha256-joRBOBRVhK+0aRoOlKLDEh8UVyPQdO3kSehSFKtcd04=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix4vscode", "repo": "nix4vscode",
"rev": "c566a8cdd1e24591ed6644b918c4e474c0b49f8a", "rev": "df09be277f9a7e24f86bbdbac9fe1bf68f94ce2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -137,11 +137,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747083103, "lastModified": 1747129300,
"narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", "rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -169,11 +169,11 @@
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1747037616, "lastModified": 1747257696,
"narHash": "sha256-LRoT0AiI9kTK1pP8j0Va4geuE1YTtRwQuW/vLC3aaBY=", "narHash": "sha256-bKD2zezDqJBwrPgP5a05areWFTE3wHpEmo+9feEWCAY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40909cce0f2c3346ded03302b86228d8b292b9ce", "rev": "2589c813e138db4ecab0912798c0b65512dba1e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -185,11 +185,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746957726, "lastModified": 1747209494,
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "rev": "5d736263df906c5da72ab0f372427814de2f52f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -201,11 +201,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1746904237, "lastModified": 1747179050,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -217,11 +217,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1746957726, "lastModified": 1747209494,
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "rev": "5d736263df906c5da72ab0f372427814de2f52f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -313,11 +313,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747071553, "lastModified": 1747278581,
"narHash": "sha256-EMIzJ+F2DTuOSPD608HaAra9cah87Emz8GjYNGtxpLo=", "narHash": "sha256-2TzDRpuU3Ae5yEvt8HiNbgK/c6JogUqQGvTQq7Hj+iA=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "50065c8bee3f5c20d29bce19037447b2c2006c48", "rev": "8358d144bccc142fffff1743d1b2dd15e24f7f3a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,12 +1,15 @@
# git is core no matter what but additional settings may could be added made in optional/foo eg: development.nix # git is core no matter what but additional settings may could be added made in optional/foo eg: development.nix
{ {
pkgs, pkgs,
config,
lib,
... ...
}: }: {
{
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
userName = "Thomas Syms";
userEmail = "thomassyms@gmail.com";
ignores = [ ignores = [
".csvignore" ".csvignore"
@@ -20,6 +23,5 @@
# direnv # direnv
".direnv" ".direnv"
]; ];
}; };
} }

View File

@@ -1,6 +1,9 @@
# Core functionality for every nixos host # Core functionality for every nixos host
{ config, lib, ... }:
{ {
config,
lib,
...
}: {
# Database for aiding terminal-based programs # Database for aiding terminal-based programs
environment.enableAllTerminfo = true; environment.enableAllTerminfo = true;
# Enable firmware with a license allowing redistribution # Enable firmware with a license allowing redistribution
@@ -32,5 +35,5 @@
# #
# FIXME(starter): customize localization values as desired. # FIXME(starter): customize localization values as desired.
i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
time.timeZone = lib.mkDefault "America/Edmonton"; time.timeZone = lib.mkDefault "Canada/Atlantic";
} }

View File

@@ -4,13 +4,11 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: let
let
hostSpec = config.hostSpec; hostSpec = config.hostSpec;
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in in {
{ users.mutableUsers = true; # Only allow declarative credentials; Required for password to be set via sops during system activation!
users.mutableUsers = false; # Only allow declarative credentials; Required for password to be set via sops during system activation!
users.users.${hostSpec.username} = { users.users.${hostSpec.username} = {
home = "/home/${hostSpec.username}"; home = "/home/${hostSpec.username}";
isNormalUser = true; isNormalUser = true;
@@ -41,4 +39,3 @@ in
openssh.authorizedKeys.keys = config.users.users.${hostSpec.username}.openssh.authorizedKeys.keys; # root's ssh keys are mainly used for remote deployment. openssh.authorizedKeys.keys = config.users.users.${hostSpec.username}.openssh.authorizedKeys.keys; # root's ssh keys are mainly used for remote deployment.
}; };
} }