From: Dominik Kaiser Date: Mon, 21 Jul 2025 16:22:02 +0000 (+0200) Subject: Add musnix X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=e304bc396044f9064c3bfbc4c3add0bd5573d4be;p=config%2Fnixos.git Add musnix --- diff --git a/flake.lock b/flake.lock index 1a2afa7..913505a 100644 --- a/flake.lock +++ b/flake.lock @@ -41,7 +41,41 @@ "type": "github" } }, + "musnix": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1741303672, + "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", + "owner": "musnix", + "repo": "musnix", + "rev": "d56a15f30329f304151e4e05fa82264d127da934", + "type": "github" + }, + "original": { + "owner": "musnix", + "repo": "musnix", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -61,7 +95,8 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "musnix": "musnix", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index 1f8451b..1f392fc 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,9 @@ # Disko disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; + + # Musnix + musnix.url = "github:musnix/musnix"; }; outputs = { @@ -28,7 +31,10 @@ nixosConfigurations = { sol = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [./hosts/sol/configuration.nix]; + modules = [ + inputs.musnix.nixosModules.musnix + ./hosts/sol/configuration.nix + ]; }; luna = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; diff --git a/hosts/sol/configuration.nix b/hosts/sol/configuration.nix index 21c70df..32cc7ad 100644 --- a/hosts/sol/configuration.nix +++ b/hosts/sol/configuration.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix ../common/global + inputs.musnix.nixosModules.musnix ]; # Bootloader. @@ -53,7 +54,8 @@ # no need to redefine it in your config for now) #media-session.enable = true; }; - + musnix.enable = true; + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -61,7 +63,7 @@ users.users.dk = { isNormalUser = true; description = "Dominik Kaiser"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "audio" ]; packages = with pkgs; [ # thunderbird podman-compose