From 5c59c0934d2c505cec18ab225da6e6c318c533eb Mon Sep 17 00:00:00 2001 From: geekiot Date: Fri, 3 Oct 2025 20:20:06 +0500 Subject: [PATCH] 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: { }