diff --git a/azos-core b/azos-core index ff36a2a..585df87 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit ff36a2a9b53603802c7bc1ba49aff826bc0e9477 +Subproject commit 585df87d537867b8193b70ffe4cb1b201291e22b diff --git a/flake.lock b/flake.lock index 8720089..edce465 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745386585, - "narHash": "sha256-KOb8RuZMAlQg1U1CAvnpNy/reUs9wuDnMBkIJ+RbQu4=", + "lastModified": 1745406072, + "narHash": "sha256-BrpSzlkjkSVEdL3BHHaNnwuUZ719iK6aOTM7o7JAXxM=", "ref": "refs/heads/master", - "rev": "ff36a2a9b53603802c7bc1ba49aff826bc0e9477", - "revCount": 40, + "rev": "585df87d537867b8193b70ffe4cb1b201291e22b", + "revCount": 41, "type": "git", "url": "file:./azos-core" }, @@ -58,13 +58,31 @@ "type": "github" } }, + "musnix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1741303672, + "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", + "owner": "musnix", + "repo": "musnix", + "rev": "d56a15f30329f304151e4e05fa82264d127da934", + "type": "github" + }, + "original": { + "owner": "musnix", + "repo": "musnix", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745392233, + "narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64", "type": "github" }, "original": { @@ -107,6 +125,22 @@ } }, "nixpkgs_2": { + "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_3": { "locked": { "lastModified": 1735563628, "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", @@ -126,8 +160,9 @@ "inputs": { "azos-core": "azos-core", "home-manager": "home-manager", + "musnix": "musnix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/flake.nix b/flake.nix index 5215220..2c380ff 100755 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,9 @@ # everything match nicely? Try nix-colors! # nix-colors.url = "github:misterio77/nix-colors"; + #Music production nix + musnix = { url = "github:musnix/musnix"; }; + azos-core = { url = "git+file:./azos-core"; flake = true; @@ -79,6 +82,7 @@ specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < + #We need to musnix here ./nixos/configuration.nix ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 4d113dd..ee9bfa3 100755 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -17,9 +17,9 @@ nixpkgs = { overlays = [ inputs.azos-core.overlays.addpkgs - # outputs.overlays.additions - # outputs.overlays.modifications - # outputs.overlays.unstable-packages + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages ]; config = { allowUnfree = true; @@ -37,38 +37,11 @@ azos.suites.exwm.enable = true; azos.name = "Aner Zakobar"; - # TODO: Set your username home = { username = "aner"; homeDirectory = "/home/aner"; }; - # xsession = { - # windowManager.command = '' - # exec ${pkgs.i3}/bin/i3 - # ''; - # # windowManager.command = "exec ${config.programs.emacs.package}/bin/emacs -l \"${config.programs.emacs.extraConfig} (azos/exwm/load-exwm)\""; - # enable = true; - # #Keybvoard rate - # # initExtra = '' - # # xset r rate 200 100 - # # ''; - # }; - # services.xserver.windowManager.myExwm = { - # enable = true; - # enableDefaultConfig = false; - # executable = config.programs.emacs.package; - # loadScript = ''(require 'azos-emacs-exwm)''; - # }; - - # home.packages = with pkgs; [ - # # steam - # pandoc - # offlineimap #emailing - # liberation_ttf #fonts - # graphviz #graphing - # ]; - # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 7a38a06..55ac945 100755 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,3 +1,12 @@ { - imports = [./mail.nix ./encryption.nix ./kubernetes.nix ./git.nix ./mpris-proxy.nix ./qutebrowser-config.nix ./audio.nix]; + imports = [ + ./mail.nix + ./encryption.nix + ./kubernetes.nix + ./git.nix + ./mpris-proxy.nix + ./qutebrowser-config.nix + ./audio.nix + ./reaper.nix + ]; } diff --git a/modules/home-manager/kubernetes.nix b/modules/home-manager/kubernetes.nix index 9b7bdc5..5127f4c 100755 --- a/modules/home-manager/kubernetes.nix +++ b/modules/home-manager/kubernetes.nix @@ -12,7 +12,7 @@ in { config = lib.mkIf isEnabled { home.packages = with pkgs; [ kubectl - kubernetes-helm + # kubernetes-helm velero ]; }; diff --git a/modules/home-manager/reaper.nix b/modules/home-manager/reaper.nix new file mode 100755 index 0000000..41efb10 --- /dev/null +++ b/modules/home-manager/reaper.nix @@ -0,0 +1,21 @@ +{ lib, config, pkgs, ... }: +let + isEnabled = + config.azos.reaper.enable; +in { + options.azos.reaper.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; + + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + reaper + helm #TODO this synth had better work + surge + lsp-plugins + vital + ]; + }; +} diff --git a/modules/nixos/audio.nix b/modules/nixos/audio.nix index 1d4bc0e..7a57f7c 100644 --- a/modules/nixos/audio.nix +++ b/modules/nixos/audio.nix @@ -12,5 +12,6 @@ in { config = lib.mkIf isEnabled { hardware.pulseaudio.enable = true; environment.systemPackages = with pkgs; [pavucontrol]; + musnix.enable = true; }; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 2e3f388..9ae4b37 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480 + inputs.musnix.nixosModules.musnix inputs.home-manager.nixosModules.home-manager outputs.nixosModules outputs.azos-core.nixosModules diff --git a/overlays/default.nix b/overlays/default.nix index 99f666c..a13ea3c 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ # This file defines overlays {inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ./pkgs {pkgs = final;}; + additions = final: _prev: import ../pkgs {pkgs = final;}; # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really.