Compare commits

..

No commits in common. "f034fa13e8323b21eefd9fb1e75e990efd35fbe4" and "0130210439556a10666a17035ff7671963e486ba" have entirely different histories.

4 changed files with 116 additions and 84 deletions

View file

@ -45,8 +45,6 @@ in
fsType = "ext4";
};
nix.settings.access-tokens = [ "@/etc/nix/github-token" ];
#░█▀▄░█▀█░█▀█░▀█▀░█░░░█▀█░█▀█░█▀▄░█▀▀░█▀▄
#░█▀▄░█░█░█░█░░█░░█░░░█░█░█▀█░█░█░█▀▀░█▀▄

View file

@ -199,6 +199,24 @@
"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"
@ -361,6 +379,28 @@
"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",
@ -495,11 +535,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1777633931,
"narHash": "sha256-306tONvDv0lhoT7Ge42ghjxPE2ndB3wTKwwtyZS2qJE=",
"lastModified": 1777542749,
"narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "c291d31da4a27a31b08fab5a468c086888095a3f",
"rev": "36130bc452e0a84c07761d2e176ae875b48eebf3",
"type": "github"
},
"original": {
@ -528,11 +568,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1777627080,
"narHash": "sha256-9xzxgWsZZRbiMDa6iSZfD1dZGlUvsHp2aawWM5LK6F8=",
"lastModified": 1777468255,
"narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "5f6f131b24826a01374d5cd87b281bd7ea181537",
"rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
"type": "github"
},
"original": {
@ -587,6 +627,21 @@
"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,
@ -716,22 +771,6 @@
}
},
"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=",
@ -760,24 +799,6 @@
"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": {
@ -815,13 +836,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"
}
@ -843,6 +864,27 @@
"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": [
@ -867,7 +909,7 @@
},
"spicetify-nix": {
"inputs": {
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_7",
"systems": "systems_2"
},
"locked": {

View file

@ -1,17 +1,24 @@
{
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";
#opencode.url = "github:sst/opencode";
mango = {
url = "github:DreamMaoMao/mango";
inputs.nixpkgs.follows = "nixpkgs";
};
musnix.url = "github:musnix/musnix";
solaar = {
url = "github:Svenum/Solaar-Flake/main";
#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
inputs.nixpkgs.follows = "nixpkgs";
};
affinity-nix = {
@ -20,33 +27,26 @@
millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
};
outputs = { self,
nixpkgs,
nixpkgs-unstable,
nix-flatpak,
niri,
musnix,
solaar,
affinity-nix,
millennium,
spicetify-nix,
opencode,
...
} @inputs:
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 { inherit system; config.allowUnfree = true; };
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.stdenv.hostPlatform.system};
unstable = nixpkgs-unstable.legacyPackages.${prev.system};
})
];
};
in
{
# Define NixOS configuration
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit system;
inherit inputs;
@ -54,21 +54,16 @@
};
modules = [
{
nixpkgs.hostPlatform = system;
environment.systemPackages = [affinity-nix.packages.x86_64-linux.v3];
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 ];
})
];
};
};

View file

@ -180,7 +180,6 @@ in
(callPackage ./pkgs/msty/default.nix {})
pkgs-unstable.lmstudio
pkgs-unstable.opencode
#inputs.opencode.packages.${pkgs.system}.default
# AUDIO AND DAW#
helvum
@ -202,11 +201,9 @@ in
];
# STEAM #
programs.steam = {
enable = true;
package = pkgs.millennium-steam;
#gamescopeSession.enable = true;
};
programs.steam.enable = true;
programs.steam.package = pkgs.millennium-steam;
programs.steam.gamescopeSession.enable = true;
programs.gamemode.enable = true;
# ISO mounting utils #