Compare commits

...

2 commits

7 changed files with 43 additions and 113 deletions

60
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1757929733,
"narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=",
"lastModified": 1759502011,
"narHash": "sha256-kj9TNrReaJwKkGQO8YBTgSsJ2I/whbDKSxLkOr28vRY=",
"owner": "catppuccin",
"repo": "nix",
"rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73",
"rev": "d2e2bc9186631cc39df23b769864f7604eaa3195",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1757982959,
"narHash": "sha256-b2a0ikawsIBcqwM05mv4tjsn0YfptAEcdEcTNhOD8Pk=",
"lastModified": 1759201995,
"narHash": "sha256-3STv6fITv8Ar/kl0H7vIA7VV0d2gyLh8UL0BOiVacXg=",
"owner": "helix-editor",
"repo": "helix",
"rev": "c0921202a0a9f9e3003a845824d3365e2f08467f",
"rev": "bfcbef10c513108c7b43317569416c2eefc4ed44",
"type": "github"
},
"original": {
@ -77,11 +77,11 @@
]
},
"locked": {
"lastModified": 1757997814,
"narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=",
"lastModified": 1759337100,
"narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5820376beb804de9acf07debaaff1ac84728b708",
"rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
"type": "github"
},
"original": {
@ -96,11 +96,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1757987448,
"narHash": "sha256-ltDT7EIfLHV42p99HnDfDviC8jN7tcOed1qsLEFypl8=",
"lastModified": 1759456736,
"narHash": "sha256-ex3cyTe8G8im2LwxWzb6894MKsQ/Eh48zIoWSm90bhM=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "e496568b0e69d9d54c8cfef96ed1370952ad9786",
"rev": "7a5ffd8bfce663427169220ea020c8046964dd31",
"type": "github"
},
"original": {
@ -111,11 +111,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1757943327,
"narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
"lastModified": 1759261527,
"narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
"rev": "e087756cf4abbe1a34f3544c480fc1034d68742f",
"type": "github"
},
"original": {
@ -126,11 +126,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1756266583,
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
"lastModified": 1759381078,
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
"type": "github"
},
"original": {
@ -142,11 +142,11 @@
},
"nixpkgs-latest": {
"locked": {
"lastModified": 1758971854,
"narHash": "sha256-/aDyu8xdHxvQzdHfth6YVJ0dIwlz/5VzIpwNifhWBZI=",
"lastModified": 1759501441,
"narHash": "sha256-ox+Ib54CHpjijGAd4RTlX1WDcLAN1ykxtXqqBkZsJI0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "17000cf5b66f7c89efbe5c57f4b7b86e1fd74df3",
"rev": "cf9a3a11f8d3ac7b612774148560d91ea4e40ac5",
"type": "github"
},
"original": {
@ -205,11 +205,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1757967192,
"narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=",
"lastModified": 1759417375,
"narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0d7c15863b251a7a50265e57c1dca1a7add2e291",
"rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c",
"type": "github"
},
"original": {
@ -221,11 +221,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1757746433,
"narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
"lastModified": 1758976413,
"narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
"rev": "e3a3b32cc234f1683258d36c6232f150d57df015",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1758425756,
"narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
"lastModified": 1759188042,
"narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
"rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d",
"type": "github"
},
"original": {

View file

@ -50,12 +50,12 @@
};
in
{
nixosConfigurations.template-hostname = makeConfig "thinkbook" {
hostName = "template-hostname";
userName = "template";
additionalOverlays = [ inputs.nix-vscode-extensions.overlays.default ];
systemArch = "x86_64-linux";
};
# nixosConfigurations.template-hostname = makeConfig "thinkbook" {
# hostName = "template-hostname";
# userName = "template";
# additionalOverlays = [ inputs.nix-vscode-extensions.overlays.default ];
# systemArch = "x86_64-linux";
# };
nixosConfigurations.book = makeConfig "thinkbook" {
hostName = "book";
@ -63,5 +63,12 @@
additionalOverlays = [ inputs.nix-vscode-extensions.overlays.default ];
systemArch = "x86_64-linux";
};
nixosConfigurations.minic = makeConfig "mini-pc" {
hostName = "minic";
userName = "guppy";
additionalOverlays = [ ];
systemArch = "x86_64-linux";
};
};
}

View file

@ -1,25 +0,0 @@
{
hostName,
userName,
systemArch,
deviceName,
}:
let
homeDir = "/home/${userName}";
in
{
user = {
name = userName;
email = "...";
};
paths = {
inherit homeDir;
};
device = {
name = deviceName;
hostName = hostName;
systemArch = systemArch;
};
}

View file

@ -1,19 +0,0 @@
{ userData, customFunctions, ... }:
let
userName = userData.user.name;
homeDirectory = userData.paths.homeDir;
in
{
imports = customFunctions.scan {
path = ./.;
exclude = [
./default.nix
];
};
home = {
inherit homeDirectory;
username = userName;
stateVersion = "25.05";
};
}

View file

@ -1,27 +0,0 @@
{ userData, customFunctions, ... }:
let
name = userData.user.name;
home = userData.paths.homeDir;
in
{
imports = customFunctions.scan {
path = ./.;
exclude = [ ./default.nix ];
};
host = {
version = "25.05";
};
users.users.${name} = {
inherit name home;
isNormalUser = true;
description = name;
createHome = true;
homeMode = "700";
extraGroups = [
# "networkmanager"
# "wheel"
];
};
}

View file

@ -1,5 +0,0 @@
{ lib }:
{
allowUnfree = false;
allowBroken = false;
}

View file

@ -1 +0,0 @@
pkgs: { }