From c4e9be9523632b2d4a7c6b4eee75ca9bf386ebb4 Mon Sep 17 00:00:00 2001 From: geekiot Date: Fri, 3 Oct 2025 19:32:39 +0500 Subject: [PATCH 1/2] Lock: update lock file --- flake.lock | 113 +++++++++++++++-------------------------------------- 1 file changed, 31 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index e0ec93d..26b2753 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757929733, - "narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=", + "lastModified": 1759273174, + "narHash": "sha256-aHN6dAD72IsNvNlzU3nbV4DJRb1qPvURgWIzHeYsBbc=", "owner": "catppuccin", "repo": "nix", - "rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73", + "rev": "5f7dc8bab8af6ba612ef8dc7cd44e38ba6cfd51a", "type": "github" }, "original": { @@ -18,21 +18,6 @@ "type": "github" } }, - "flake-compat": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -57,11 +42,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 +62,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 +81,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 +96,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 +111,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -142,11 +127,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1758971854, - "narHash": "sha256-/aDyu8xdHxvQzdHfth6YVJ0dIwlz/5VzIpwNifhWBZI=", + "lastModified": 1759495986, + "narHash": "sha256-2Huw/ThdwFYBfqSaCflE8am0D1425t/h31rC7VNZAGg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "17000cf5b66f7c89efbe5c57f4b7b86e1fd74df3", + "rev": "54ce213af5829c39a4d370bd6422b8960b037e1e", "type": "github" }, "original": { @@ -205,11 +190,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 +206,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": { @@ -235,22 +220,6 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -261,8 +230,7 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-latest": "nixpkgs-latest", "nixpkgs-old": "nixpkgs-old", - "sops-nix": "sops-nix", - "zedless-editor": "zedless-editor" + "sops-nix": "sops-nix" } }, "rust-overlay": { @@ -291,11 +259,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": { @@ -318,25 +286,6 @@ "repo": "default", "type": "github" } - }, - "zedless-editor": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1754831523, - "narHash": "sha256-tkdq7WR0AvIy/eof2L2ELXKh6b73P7dcWcgJC7ww3aM=", - "owner": "zedless-editor", - "repo": "zedless", - "rev": "adb21022b5063757c035d851a0e458f8e4ae954b", - "type": "github" - }, - "original": { - "owner": "zedless-editor", - "repo": "zedless", - "type": "github" - } } }, "root": "root", From 5c59c0934d2c505cec18ab225da6e6c318c533eb Mon Sep 17 00:00:00 2001 From: geekiot Date: Fri, 3 Oct 2025 20:20:06 +0500 Subject: [PATCH 2/2] Clear (config): update flake & make server profile private. --- flake.lock | 71 ++++++++++++++++++++++++++----- flake.nix | 19 ++++++--- users/server/data/default.nix | 25 ----------- users/server/home/default.nix | 19 --------- users/server/host/default.nix | 27 ------------ users/server/packages/default.nix | 5 --- users/server/scripts/default.nix | 1 - 7 files changed, 74 insertions(+), 93 deletions(-) delete mode 100644 users/server/data/default.nix delete mode 100644 users/server/home/default.nix delete mode 100644 users/server/host/default.nix delete mode 100644 users/server/packages/default.nix delete mode 100644 users/server/scripts/default.nix diff --git a/flake.lock b/flake.lock index 26b2753..dc86faf 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759273174, - "narHash": "sha256-aHN6dAD72IsNvNlzU3nbV4DJRb1qPvURgWIzHeYsBbc=", + "lastModified": 1759502011, + "narHash": "sha256-kj9TNrReaJwKkGQO8YBTgSsJ2I/whbDKSxLkOr28vRY=", "owner": "catppuccin", "repo": "nix", - "rev": "5f7dc8bab8af6ba612ef8dc7cd44e38ba6cfd51a", + "rev": "d2e2bc9186631cc39df23b769864f7604eaa3195", "type": "github" }, "original": { @@ -18,6 +18,21 @@ "type": "github" } }, + "flake-compat": { + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -111,11 +126,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -127,11 +142,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1759495986, - "narHash": "sha256-2Huw/ThdwFYBfqSaCflE8am0D1425t/h31rC7VNZAGg=", + "lastModified": 1759501441, + "narHash": "sha256-ox+Ib54CHpjijGAd4RTlX1WDcLAN1ykxtXqqBkZsJI0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54ce213af5829c39a4d370bd6422b8960b037e1e", + "rev": "cf9a3a11f8d3ac7b612774148560d91ea4e40ac5", "type": "github" }, "original": { @@ -220,6 +235,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -230,7 +261,8 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-latest": "nixpkgs-latest", "nixpkgs-old": "nixpkgs-old", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "zedless-editor": "zedless-editor" } }, "rust-overlay": { @@ -286,6 +318,25 @@ "repo": "default", "type": "github" } + }, + "zedless-editor": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1754831523, + "narHash": "sha256-tkdq7WR0AvIy/eof2L2ELXKh6b73P7dcWcgJC7ww3aM=", + "owner": "zedless-editor", + "repo": "zedless", + "rev": "adb21022b5063757c035d851a0e458f8e4ae954b", + "type": "github" + }, + "original": { + "owner": "zedless-editor", + "repo": "zedless", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 03a62eb..6cbd12a 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; + }; }; } diff --git a/users/server/data/default.nix b/users/server/data/default.nix deleted file mode 100644 index cbab2e7..0000000 --- a/users/server/data/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/users/server/home/default.nix b/users/server/home/default.nix deleted file mode 100644 index d6ce947..0000000 --- a/users/server/home/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/users/server/host/default.nix b/users/server/host/default.nix deleted file mode 100644 index da3997d..0000000 --- a/users/server/host/default.nix +++ /dev/null @@ -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" - ]; - }; -} diff --git a/users/server/packages/default.nix b/users/server/packages/default.nix deleted file mode 100644 index d9e6834..0000000 --- a/users/server/packages/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib }: -{ - allowUnfree = false; - allowBroken = false; -} diff --git a/users/server/scripts/default.nix b/users/server/scripts/default.nix deleted file mode 100644 index 2fb07e0..0000000 --- a/users/server/scripts/default.nix +++ /dev/null @@ -1 +0,0 @@ -pkgs: { }