From 2a3c5b76eeb8b57c5cf3f473b68f0d30d7fc8fe4 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Thu, 15 Jan 2026 19:53:27 -0600 Subject: [PATCH 1/6] feat: updated flake.lock --- flake.lock | 77 +++++++++++++++++------------------------------- flake.nix | 2 +- util/default.nix | 2 +- 3 files changed, 29 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 0e0008a..6116658 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1767911574, - "narHash": "sha256-JsYIPaTgbJHEb1rgzwS9H+c0hCy/Sr1WaxNgtvu6xro=", + "lastModified": 1768500104, + "narHash": "sha256-Xa8XJaydHKAhDCLyjdKcDKjFrGgdahNcVo1boGUdZKY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0d02843bec4ca8a16f7f08c25fe4e40cd829de0f", + "rev": "7e517454cd248c76046c3157b56662d223de29b1", "type": "gitlab" }, "original": { @@ -115,32 +115,11 @@ ] }, "locked": { - "lastModified": 1767909183, - "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=", + "lastModified": 1768512489, + "narHash": "sha256-jZi945d3e6DYhrw3K5Pew+QaL3qSgq3O6xiVaEVLgXs=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "impermanence", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "bba859cd85b90dd9e4e6fd44b2af4aa64ae801a1", "type": "github" }, "original": { @@ -204,9 +183,7 @@ "mcp-nixos": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1767822362, @@ -229,11 +206,11 @@ ] }, "locked": { - "lastModified": 1767718503, - "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", + "lastModified": 1768220509, + "narHash": "sha256-8wMrJP/Xk5Dkm0TxzaERLt3eGFEhHTWaJKUpK3AoL4o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", + "rev": "7b1d394e7d9112d4060e12ef3271b38a7c43e83b", "type": "github" }, "original": { @@ -270,11 +247,11 @@ ] }, "locked": { - "lastModified": 1767838417, - "narHash": "sha256-UJ6qBXzOh/FMYgP/OlM8QeKolpQYN0198onIu8oB6dM=", + "lastModified": 1768443224, + "narHash": "sha256-U2UHV+8Ygba2eFhFSnl15wMuKqNR884V2mo2fLO9wy0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4e92639f25e4f530990a99a32da696ee9117eb1e", + "rev": "151bb82df60a9ffcd2fef1116e4c9baf133b3ec5", "type": "github" }, "original": { @@ -285,11 +262,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1768499669, + "narHash": "sha256-jJr/zDxu5evfQxlXtMrFFF68/RNj1UrctS/eIsay4k0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "7297dfc69ae9b06e984a6f69900ce25e67c76f46", "type": "github" }, "original": { @@ -301,15 +278,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", - "owner": "nixos", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -332,11 +309,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -446,11 +423,11 @@ ] }, "locked": { - "lastModified": 1767826491, - "narHash": "sha256-WSBENPotD2MIhZwolL6GC9npqgaS5fkM7j07V2i/Ur8=", + "lastModified": 1768481291, + "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ea3adcb6d2a000d9a69d0e23cad1f2cacb3a9fbe", + "rev": "e085e303dfcce21adcb5fec535d65aacb066f101", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e935688..ae110da 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,7 @@ # MCP NixOS server for Claude Dev mcp-nixos = { url = "github:utensils/mcp-nixos"; - inputs.nixpkgs.follows = "nixpkgs"; + # Not following nixpkgs because aws-sam-translator doesn't support Python 3.14 yet }; # Noita Entangled Worlds package diff --git a/util/default.nix b/util/default.nix index 66e300b..246543d 100644 --- a/util/default.nix +++ b/util/default.nix @@ -10,7 +10,7 @@ nix-syncthing = inputs.nix-syncthing; disko = inputs.disko; impermanence = inputs.impermanence; - lix-module = inputs.lix-module; + # lix-module = inputs.lix-module; systems = [ "aarch64-darwin" From 66ed7e75ba73fbf8f0a6383bd470f1f55f7ee2d8 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Wed, 4 Feb 2026 17:40:31 -0600 Subject: [PATCH 2/6] fix: disabled IdentityFile config for ssh --- modules/home-manager-modules/openssh.nix | 6 +++--- nix-config-secrets | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/home-manager-modules/openssh.nix b/modules/home-manager-modules/openssh.nix index afc98dd..5f07491 100644 --- a/modules/home-manager-modules/openssh.nix +++ b/modules/home-manager-modules/openssh.nix @@ -52,9 +52,9 @@ addKeysToAgent = "confirm"; }; }; - extraConfig = lib.strings.concatLines ( - builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys - ); + # extraConfig = lib.strings.concatLines ( + # builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys + # ); }; systemd.user.services = builtins.listToAttrs ( diff --git a/nix-config-secrets b/nix-config-secrets index 6e90a73..22be815 160000 --- a/nix-config-secrets +++ b/nix-config-secrets @@ -1 +1 @@ -Subproject commit 6e90a73ed2e1e81ba37628fc5e5494a80d22b526 +Subproject commit 22be81505a49cd205e9b5c91f51af69c0b885ed3 From d7301886c6e42bda4fbb25cd1342d8cde1e8d4a8 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Sat, 7 Feb 2026 12:12:51 -0600 Subject: [PATCH 3/6] chore: added tasks to README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d29ba58..3ffeac8 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ nix multi user, multi system, configuration with `sops` secret management, `home - [ ] monitor configuration in `~/.config/monitors.xml` should be sym linked to `/run/gdm/.config/monitors.xml` (https://www.reddit.com/r/NixOS/comments/u09cz9/home_manager_create_my_own_symlinks_automatically/) - [ ] migrate away from flakes and move to npins - [ ] `host.users` should be redone so that we just extend the base `users.users` object. Right now we cant quite do this because we have weird circular dependencies with disko/impermanence (not sure which one) and home manger enabling/disabling users per devices +- [ ] Home manager impermanence is preventing updates to the latest version of the module ## Broken things - [ ] figure out steam vr things? @@ -102,7 +103,9 @@ nix multi user, multi system, configuration with `sops` secret management, `home - [ ] Penpot services (need to make this custom) - [ ] minecraft server with old world file - [ ] storj server +- [ ] XMR miner used to heat home based on smart thermostat - [ ] Create Tor guard/relay server +- [ ] Create i2P node - [ ] screeps server - [ ] mastodon instance From f86cba6d021c49f8b249884a9879eed4007528b5 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Sat, 7 Feb 2026 12:14:49 -0600 Subject: [PATCH 4/6] chore: added tasks to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3ffeac8..15ea0a3 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ nix multi user, multi system, configuration with `sops` secret management, `home ## Broken things - [ ] figure out steam vr things? - [ ] whisper was having issues +- [ ] auto loading of ssh agent keys that we auto generate per system ## Data Integrity - [ ] zfs email after scrubbing # TODO: test this From 468f1cb40f74ef062387593102d94ca3126f9c7f Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Sat, 7 Feb 2026 14:17:08 -0600 Subject: [PATCH 5/6] feat: added bookmark for Cyberia git --- .../home-manager/leyla/packages/firefox/bookmarks.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configurations/home-manager/leyla/packages/firefox/bookmarks.nix b/configurations/home-manager/leyla/packages/firefox/bookmarks.nix index 4210d1e..bd172e7 100644 --- a/configurations/home-manager/leyla/packages/firefox/bookmarks.nix +++ b/configurations/home-manager/leyla/packages/firefox/bookmarks.nix @@ -141,6 +141,12 @@ keyword = ""; tags = [""]; } + { + name = "Cyberia Git"; + url = "https://git.cyberia.club"; + keyword = ""; + tags = [""]; + } # Template # { # name = ""; From b9a746a98980998429eca5ac92af0e45e870944e Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Sat, 7 Feb 2026 14:31:51 -0600 Subject: [PATCH 6/6] feat: added Cyberia to leyla words --- configurations/home-manager/leyla/packages/vscode/user-words.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configurations/home-manager/leyla/packages/vscode/user-words.nix b/configurations/home-manager/leyla/packages/vscode/user-words.nix index bb99bbc..112269e 100644 --- a/configurations/home-manager/leyla/packages/vscode/user-words.nix +++ b/configurations/home-manager/leyla/packages/vscode/user-words.nix @@ -6,6 +6,7 @@ config.programs.vscode.profiles.default.userSettings = { "cSpell.userWords" = [ "leyla" + "Cyberia" ]; "cSpell.languageSettings" = [