From 3e844a05f602527630c12249573d88cd077a42cd Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 26 Dec 2025 21:57:17 +1000 Subject: [PATCH] cleanup --- flake.nix | 63 ++++++++++++------------------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/flake.nix b/flake.nix index aacc89c..ef5a606 100755 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,6 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - # -# { description = "SerenityOS"; ## Latest features:p @@ -77,27 +76,18 @@ ## Flake parts - https://github.com/hercules-ci/flake-parts flake-parts = { url = "github:hercules-ci/flake-parts"; }; - ## nixos generators - nixos-generators = { # https://github.com/nix-community/nixos-generators - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - ## Declarative disks - https://github.com/nix-community/disko - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ## Secrets management - https://github.com/Mic92/sops-nix sops-nix = { url = "github:Mic92/sops-nix"; }; ## Musnix - https://github.com/musnix/musnix musnix = { url = "github:musnix/musnix"; }; - ## Tidalcycles.nix - tidalcycles = { - url = "github:mitchmindtree/tidalcycles.nix"; + ## Nice-to-haves for gaming - https://github.com/fufexan/nix-gaming + nix-gaming = { url = "github:fufexan/nix-gaming"; }; + + ## Zoomer text editor - https://github.com/nix-community/nixvim + nixvim = { + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -110,15 +100,6 @@ ## Easy themeing - https://github.com/Misterio77/nix-colors nix-colors = { url = "github:misterio77/nix-colors"; }; - ## Zoomer text editor - https://github.com/nix-community/nixvim - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - ## Nice-to-haves for gaming - https://github.com/fufexan/nix-gaming - nix-gaming = { url = "github:fufexan/nix-gaming"; }; - ## Niri window manager - ## https://github.com/YaLTeR/niri ## https://github.com/sodiboo/niri-flake/ @@ -127,6 +108,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + ## Tidalcycles.nix + tidalcycles = { + url = "github:mitchmindtree/tidalcycles.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ## Boot animation #mac-style-plymouth = { # example setup I stole the code shamelessly from #url = "github:SergioRibera/s4rchiso-plymouth-theme"; @@ -143,11 +130,7 @@ }; - outputs = { self, nixpkgs, disko, sops-nix, musnix, nixos-generators, niri, - ## Disabled outputs - part of 'flakeification': enable and use correctly. - #lix, lix-module, flake-utils, flake-parts, - #nix-colors, home-manager, nixvim, - ... } + outputs = { self, nixpkgs, sops-nix, musnix, niri, ... } @inputs: let @@ -184,30 +167,10 @@ modules = [ sops-nix.nixosModules.sops musnix.nixosModules.musnix - disko.nixosModules.disko niri.nixosModules.niri ./core/hosts/hades ]; }; - - ## Laptop - needs work - persephone = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs outputs; - inherit label version; - inherit flakePath disksPath; - inherit primaryUser userDesc homeDir; - inherit wallpapersPath wallpaper; - }; - modules = [ - sops-nix.nixosModules.sops - musnix.nixosModules.musnix - disko.nixosModules.disko - ./hosts/persephone - ]; - }; - }; - }; }