From f034fa13e8323b21eefd9fb1e75e990efd35fbe4 Mon Sep 17 00:00:00 2001 From: Nicole Date: Fri, 1 May 2026 14:28:47 +0200 Subject: [PATCH] Refactoring & Update --- etc/nixos/configuration.nix | 2 + etc/nixos/flake.lock | 114 +++++++++++---------------------- etc/nixos/flake.nix | 63 +++++++++--------- etc/nixos/modules/programs.nix | 1 + 4 files changed, 73 insertions(+), 107 deletions(-) diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 811c608..2e9e008 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -45,6 +45,8 @@ in fsType = "ext4"; }; + nix.settings.access-tokens = [ "@/etc/nix/github-token" ]; + #░█▀▄░█▀█░█▀█░▀█▀░█░░░█▀█░█▀█░█▀▄░█▀▀░█▀▄ #░█▀▄░█░█░█░█░░█░░█░░░█░█░█▀█░█░█░█▀▀░█▀▄ diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock index 5ab2710..45a10f8 100644 --- a/etc/nixos/flake.lock +++ b/etc/nixos/flake.lock @@ -199,24 +199,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -379,28 +361,6 @@ "type": "github" } }, - "mango": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], - "scenefx": "scenefx" - }, - "locked": { - "lastModified": 1776999768, - "narHash": "sha256-RP7eVqbnQ/uNCXh0HH8SXRIerMlkyHco+wpI9oxon0U=", - "owner": "DreamMaoMao", - "repo": "mango", - "rev": "b9c6a2c1964cb59536c5d3e02d2ff981a7eb36d2", - "type": "github" - }, - "original": { - "owner": "DreamMaoMao", - "repo": "mango", - "type": "github" - } - }, "millennium": { "inputs": { "abseil-src": "abseil-src", @@ -627,21 +587,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1777428379, @@ -771,6 +716,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1776683584, + "narHash": "sha256-NuTLMrr10Tng72hurYG8jYQ4XKK8wnpJmOGcPiis96g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9dd5558b06dbdacbf635a3dd36dce1b1a7ee3a89", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1776877367, "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=", @@ -799,6 +760,24 @@ "type": "github" } }, + "opencode": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1777636623, + "narHash": "sha256-aTjYnSF6D3oy4CY2NVxPid2JmSP9qlDNJdnz2JUuGSo=", + "owner": "sst", + "repo": "opencode", + "rev": "16ddf5f559d8c52b23c6db7a046c3fda6a1d71f6", + "type": "github" + }, + "original": { + "owner": "sst", + "repo": "opencode", + "type": "github" + } + }, "plugin-loader-src": { "flake": false, "locked": { @@ -836,13 +815,13 @@ "root": { "inputs": { "affinity-nix": "affinity-nix", - "mango": "mango", "millennium": "millennium", "musnix": "musnix", "niri": "niri", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_6", "nixpkgs-unstable": "nixpkgs-unstable", + "opencode": "opencode", "solaar": "solaar", "spicetify-nix": "spicetify-nix" } @@ -864,27 +843,6 @@ "type": "github" } }, - "scenefx": { - "inputs": { - "nixpkgs": [ - "mango", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750785057, - "narHash": "sha256-tGX6j4W91rcb+glXJo43sjPI9zQvPotonknG1BdihR4=", - "owner": "wlrfx", - "repo": "scenefx", - "rev": "3a6cfb12e4ba97b43326357d14f7b3e40897adfc", - "type": "github" - }, - "original": { - "owner": "wlrfx", - "repo": "scenefx", - "type": "github" - } - }, "solaar": { "inputs": { "nixpkgs": [ @@ -909,7 +867,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "systems": "systems_2" }, "locked": { diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index 01b6c6c..ebb9eda 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -1,24 +1,17 @@ { description = "My Flake"; - inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - #nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-flatpak.url = "github:gmodena/nix-flatpak"; niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - #opencode.url = "github:sst/opencode"; - mango = { - url = "github:DreamMaoMao/mango"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + opencode.url = "github:sst/opencode"; musnix.url = "github:musnix/musnix"; solaar = { - #url = "https://flakehub.com/f/Svenum/Solaar-Flake/*.tar.gz"; # For latest stable version - url = "github:Svenum/Solaar-Flake/main"; # Uncomment line for latest unstable version + url = "github:Svenum/Solaar-Flake/main"; inputs.nixpkgs.follows = "nixpkgs"; }; affinity-nix = { @@ -27,26 +20,33 @@ millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; }; - - outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, mango, musnix, solaar, affinity-nix, millennium, spicetify-nix, ... } @inputs: - - let - system = "x86_64-linux"; - pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; }; - pkgs = import nixpkgs { - inherit system; - overlays = [ - (final: prev: { - unstable = nixpkgs-unstable.legacyPackages.${prev.system}; - }) - ]; - }; - + outputs = { self, + nixpkgs, + nixpkgs-unstable, + nix-flatpak, + niri, + musnix, + solaar, + affinity-nix, + millennium, + spicetify-nix, + opencode, + ... + } @inputs: + let + system = "x86_64-linux"; + pkgs-unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; }; + pkgs = import nixpkgs { + inherit system; + overlays = [ + (final: prev: { + unstable = nixpkgs-unstable.legacyPackages.${prev.stdenv.hostPlatform.system}; + }) + ]; + }; in { - # Define NixOS configuration nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; specialArgs = { inherit system; inherit inputs; @@ -54,16 +54,21 @@ }; modules = [ { - environment.systemPackages = [affinity-nix.packages.x86_64-linux.v3]; - nixpkgs.overlays = [ millennium.overlays.default ]; + nixpkgs.hostPlatform = system; + nixpkgs.overlays = [ millennium.overlays.default]; } niri.nixosModules.niri nix-flatpak.nixosModules.nix-flatpak - mango.nixosModules.mango musnix.nixosModules.musnix solaar.nixosModules.default spicetify-nix.nixosModules.spicetify ./configuration.nix + + ({ pkgs, ... }: { + nixpkgs.overlays = [ affinity-nix.overlays.default ]; + environment.systemPackages = [ pkgs.affinity-v3 ]; + }) + ]; }; }; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index 8e3ead3..049c9cc 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -180,6 +180,7 @@ in (callPackage ./pkgs/msty/default.nix {}) pkgs-unstable.lmstudio pkgs-unstable.opencode + #inputs.opencode.packages.${pkgs.system}.default # AUDIO AND DAW# helvum