From 4fc4666e803bc513a209f42acd377e66a0cd3bca Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Tue, 7 Jul 2026 18:12:00 +0100 Subject: [PATCH] put modules in sidonia, put sidonia's nixConfig.nix into configuration.nix --- common/os/configuration.nix | 31 ++++++----- flake.lock | 104 ++++++++++++++++++------------------ flake.nix | 16 +----- 3 files changed, 71 insertions(+), 80 deletions(-) diff --git a/common/os/configuration.nix b/common/os/configuration.nix index 6e34155..662df55 100644 --- a/common/os/configuration.nix +++ b/common/os/configuration.nix @@ -1,7 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, @@ -16,12 +12,25 @@ in catppuccin.cache.enable = lib.mkDefault true; - nix.settings = { - auto-optimise-store = true; - trusted-users = [ cfg.userName ]; - fallback = lib.mkDefault true; + nix = { + settings = { + auto-optimise-store = true; + trusted-users = [ cfg.userName ]; + fallback = lib.mkDefault true; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + extraOptions = '' + !include access-tokens.conf + ''; }; + home-manager.sharedModules = [ + { nix = { inherit (config.nix) extraOptions; }; } + ]; + # Enable Graphics hardware.graphics = { enable = true; @@ -118,12 +127,6 @@ in lfs.enable = true; }; - # Enable experimental features - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - nixpkgs.config.allowUnfree = true; # List packages installed in system profile. To search, run: diff --git a/flake.lock b/flake.lock index 115aa06..458805e 100644 --- a/flake.lock +++ b/flake.lock @@ -135,11 +135,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1783042965, - "narHash": "sha256-fbgOnmm34aDiNkZdtVBR9gEWXsw0agjxbBJVDSroVZo=", + "lastModified": 1783367201, + "narHash": "sha256-/ibzswTrAp1yW0GStFZGyRl6KO+wb9wZIUZWH4bz3ww=", "owner": "helix-editor", "repo": "helix", - "rev": "2868367c80019d8ec54ec52b84d3e4f7a2f94814", + "rev": "14d6bc0febed9c692048271a8ae2362ac969c6e0", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1782704057, - "narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=", + "lastModified": 1783221248, + "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "868d0a692de703c2de98fab61968e4e310b7c28e", + "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", "type": "github" }, "original": { @@ -195,11 +195,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1783123730, - "narHash": "sha256-QbTdquZaVN7ZVH4EJgpQTeqrdkwnJrN1TgQJFa3f/tc=", + "lastModified": 1783394043, + "narHash": "sha256-1jWBKskcjfXcTuh0E8v4uVuo0rsTL5YLubvqSLK4sNc=", "ref": "refs/heads/main", - "rev": "c7d0c5f85ff82a71ef10c27591367708af693c26", - "revCount": 137, + "rev": "ebe4769031de2fb6065464738da631da494a9234", + "revCount": 138, "type": "git", "url": "https://codeberg.org/BANanaD3V/niri-nix" }, @@ -234,11 +234,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1781781064, - "narHash": "sha256-Ii/koEm/sRyg65qbAQWqEgboSEIhdH0EL4KglAc14p0=", + "lastModified": 1783248941, + "narHash": "sha256-citgYJbvR1iUKXpiWlFq3NO+fw6hXGL3Qk1ampU7lhA=", "owner": "YaLTeR", "repo": "niri", - "rev": "49fc6117fd6c043adaa2ead316b82db5ed735d36", + "rev": "a30ca7983b2f1fc3ddeb209b3fe18fa78e0dbd25", "type": "github" }, "original": { @@ -256,11 +256,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1783050940, - "narHash": "sha256-BFZC8m0nGDCd0qOS2Cdxtqd7GMFMrtTmyXZvBdBdulY=", + "lastModified": 1783397047, + "narHash": "sha256-aXPvDeF7F0sKg2MWglAtSz6h1R6a9+V7Y2k24At2Q9o=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "da3a957db19f500140443846cd122879e98ff792", + "rev": "ed748d3593082a7e02d2c49b7643ecac3a7efde4", "type": "github" }, "original": { @@ -272,6 +272,7 @@ "nix-monitored": { "inputs": { "nixpkgs": [ + "sidonia", "nixpkgs" ] }, @@ -294,11 +295,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1783050290, - "narHash": "sha256-4TYFxweErHBg/XvZJYGOxhTLGufuFGiHB5FGXo/r11E=", + "lastModified": 1783396462, + "narHash": "sha256-0Q3WQGlhzTb6QAXnmleX55Pqn+La4lcXupW1ElN/gZI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ca0203653d5e5c50e9e64c98d66a021b824a6da6", + "rev": "98798c612761584740eed894f3ca1e1a1a856ac0", "type": "github" }, "original": { @@ -333,11 +334,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1783110515, - "narHash": "sha256-i80dD06MtZmIfGpgPSD4yCEtpXF2CASDr3uOgQixcXE=", + "lastModified": 1783308613, + "narHash": "sha256-v4GmLeVssYeSTZomJgVp34Scqop/Y4RvVOrZnPvQYKU=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "6a1cb530fa27bc06ee595b9e6eeb1611a5229911", + "rev": "6387d6cdbb7b623cfe9eb29654038e1624b2ad5c", "type": "github" }, "original": { @@ -348,11 +349,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782847225, - "narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=", + "lastModified": 1783148766, + "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd", + "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", "type": "github" }, "original": { @@ -409,11 +410,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1782847225, + "narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd", "type": "github" }, "original": { @@ -441,11 +442,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { @@ -463,11 +464,11 @@ ] }, "locked": { - "lastModified": 1783126154, - "narHash": "sha256-z4weM83Xv/xy/U2rsbYgaXtAk4UnaC+p4iXkYSOrwP0=", + "lastModified": 1783434244, + "narHash": "sha256-htyNZPgi5ZfT8CpALQ7MpwU2odWNL/jifoQQ/S4WVQ4=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "0b3eab82c33a258564b366d3c19cab0094a4cd7f", + "rev": "b57faefe739b69a07199763eb98e85102c402d0b", "type": "github" }, "original": { @@ -484,11 +485,11 @@ ] }, "locked": { - "lastModified": 1783109477, - "narHash": "sha256-15DiO9torrhPQEuCDeFTeQqfl+7XWM6Ww8ioEU2fDfA=", + "lastModified": 1783267606, + "narHash": "sha256-GhnfGnxzD1Fp1sbY0I2b9gNIBT298dw8ijk5s5ffZIo=", "owner": "noctalia-dev", "repo": "noctalia-greeter", - "rev": "d897aff628d9ad980a6709a17c4679679e42aaf5", + "rev": "48fc6d22b54efd62df83e3d1266feb89c291115a", "type": "github" }, "original": { @@ -534,10 +535,8 @@ "inputs": { "moppkgs": "moppkgs", "nix-minecraft": "nix-minecraft", - "nix-monitored": "nix-monitored", "nixpkgs": "nixpkgs_2", "sidonia": "sidonia", - "sops-nix": "sops-nix", "unstable": "unstable" } }, @@ -640,6 +639,7 @@ ], "niri": "niri", "niri-legacy": "niri-legacy", + "nix-monitored": "nix-monitored", "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": [ "nixpkgs" @@ -648,6 +648,7 @@ "noctalia": "noctalia", "noctalia-greeter": "noctalia-greeter", "scopebuddy": "scopebuddy", + "sops-nix": "sops-nix", "stextCatppuccin": "stextCatppuccin", "stextPackageControl": "stextPackageControl", "unstable": [ @@ -656,11 +657,11 @@ "zen-browser": "zen-browser" }, "locked": { - "lastModified": 1783174875, - "narHash": "sha256-qAU9wqvAdMaV14xy/P9s3LKfpBLYbqrIWQqHMahTD7s=", + "lastModified": 1783444252, + "narHash": "sha256-NdR4TYeD3jWQFBDLSE7AiGCsCpWACFZMcDVsbm8wUKE=", "owner": "Mop-u", "repo": "sidonia", - "rev": "f45a5af17e77c787469533dfeacebb7d757f7690", + "rev": "31be1782e5e3bf05c2b1bfb5fee4154a4293f8ba", "type": "github" }, "original": { @@ -672,15 +673,16 @@ "sops-nix": { "inputs": { "nixpkgs": [ + "sidonia", "nixpkgs" ] }, "locked": { - "lastModified": 1783104586, - "narHash": "sha256-vSLKc7m34/g5xH4dwmNZSqxc5OcHeE3qiG3EIz6bJKs=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1ebd41717762d837d5115f7108522c29cdb00fbb", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { @@ -775,11 +777,11 @@ }, "unstable": { "locked": { - "lastModified": 1782959384, - "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { @@ -817,11 +819,11 @@ ] }, "locked": { - "lastModified": 1783063269, - "narHash": "sha256-XVOopPVgoWPlhuJajUYNTK/M9j/L/llD6vdH5JE9EKs=", + "lastModified": 1783371882, + "narHash": "sha256-Z0ESbxSeHR5p3CD1LLVKttX2vaPPnjNfZbqCJlQgcF8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b86380c97016a1c79f535f286a34c0f5b4270a1b", + "rev": "9357f05e60643b057038ff3f89c87d4a1d08cae1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 41561b9..7f5dc25 100644 --- a/flake.nix +++ b/flake.nix @@ -13,30 +13,16 @@ inputs.moppkgs.follows = "moppkgs"; }; - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-minecraft = { url = "github:Infinidoge/nix-minecraft"; inputs.nixpkgs.follows = "nixpkgs"; }; - - nix-monitored = { - url = "github:ners/nix-monitored"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs: { nixosConfigurations = inputs.sidonia.mkSidonia ./hosts { specialArgs = { inherit inputs; }; - modules = [ - inputs.sops-nix.nixosModules.sops - inputs.nix-monitored.nixosModules.default - ./common - ]; + modules = [ ./common ]; }; }; } -- 2.54.0