Fixing up

flake.lock

@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1754597893,
+        "lastModified": 1754603518,
-        "narHash": "sha256-D/wBAxdIvMTKpFQaLo39n0X8PAFIqFCeuJboxUpAyHA=",
+        "narHash": "sha256-RXSbgFRmMqfjsCSxKI7nWJm+doxGckTQE8aaStHLy5I=",
         "ref": "refs/heads/master",
-        "rev": "69d3dec18405dc350a81039ce657f4435b38b1f8",
+        "rev": "b0dc530c108e38980daea9e93764cc255d8c18fb",
-        "revCount": 55,
+        "revCount": 56,
         "type": "git",
         "url": "file:./azos-core"
       },
@@ -46,16 +46,13 @@
       "locked": {
         "lastModified": 1726989464,
         "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
-        "owner": "nix-community",
+        "path": "/nix/store/q1ss75nhmjiydyqw8lbzwbx7cqk8z0qq-source",
-        "repo": "home-manager",
         "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
-        "type": "github"
+        "type": "path"
       },
       "original": {
-        "owner": "nix-community",
+        "id": "home-manager",
-        "ref": "release-24.05",
+        "type": "indirect"
-        "repo": "home-manager",
-        "type": "github"
       }
     },
     "musnix": {

flake.nix

@@ -1,27 +1,15 @@
 {
-  description = "Your new nix config";
+  description = "Aner's NIX config for his systems!";
 
   inputs = {
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    # You can access packages and modules from different nixpkgs revs
-    # at the same time. Here's an working example:
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    # Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
 
-    # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    # TODO: Add any other flake you might need
-    # hardware.url = "github:nixos/nixos-hardware";
-
-    # Shameless plug: looking for a way to nixify your themes and make
-    # everything match nicely? Try nix-colors!
-    # nix-colors.url = "github:misterio77/nix-colors";
-
     #Music production nix
     musnix  = { url = "github:musnix/musnix"; };
 
@@ -38,78 +26,42 @@
     ...
   } @ inputs: let
     inherit (self) outputs;
-    # Supported systems for your flake packages, shell, etc.
     systems = [
       "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
       "x86_64-darwin"
     ];
-    # This is a function that generates an attribute by calling a function you
-    # pass to it, with each system as an argument
     forAllSystems = nixpkgs.lib.genAttrs systems;
   in {
-    # Your custom packages
-    # Accessible through 'nix build', 'nix shell', etc
-
-    #OLD CODE
-    # packages = forAllSystems (system: ((import ./pkgs) {pkgs= nixpkgs.legacyPackages.${system};}));
-    #NEW CODE
-    # azos-packages = forAllSystems (system: (inputs.azos-core.azos-packages.${system}));
-    # Formatter for your nix files, available through 'nix fmt'
-    # Other options beside 'alejandra' include 'nixpkgs-fmt'
     formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
 
-    # Your custom packages and modifications, exported as overlays
     overlays = import ./overlays {inherit inputs;};
-    # Reusable nixos modules you might want to export
-    # These are usually stuff you would upstream into nixpkgs
     azos-core.nixosModules = inputs.azos-core.nixosModules.nixosModules;
     nixosModules = import ./modules/nixos;
-    # Reusable home-manager modules you might want to export
-    # These are usually stuff you would upstream into home-manager
     azos-core.homeManagerModules = inputs.azos-core.nixosModules.homeManagerModules;
     homeManagerModules = import ./modules/home-manager;
 
-    #OLD CODE
+    #Systems configured
-    # homeManagerModules = import ./modules/home-manager;
-
-    # NixOS configuration entrypoint
-    # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
-      # FIXME replace with your hostname
+      #Lauretta - laptop
       lauretta = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
-          # > Our main nixos configuration file <
-          #We need to musnix here
           ./nixos/configuration.nix
         ];
       };
+
+      #Test VM
       vm = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
-          # > Our main nixos configuration file <
-
           ./nixos/configuration-vm.nix
         ];
       };
     };
 
-    # Standalone home-manager configuration entrypoint
+    #TODO this is probably unsupported
-    # Available through 'home-manager --flake .#your-username@your-hostname'
-    # homeConfigurations = {
-    #   # FIXME replace with your username@hostname
-    #   "aner@lauretta" = home-manager.lib.homeManagerConfiguration {
-    #     pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-    #     extraSpecialArgs = {inherit inputs outputs;};
-    #     modules = [
-    #       # > Our main home-manager configuration file <
-    #       ./home-manager/home.nix
-    #     ];
-    #   };
-    # };
-
     shells = forAllSystems (system: ((import ./shells) { pkgs= nixpkgs.legacyPackages.${system} // outputs.packages.${system} // outputs.azos-packages.${system};}));
   };
 }

home-manager/home.nix

@@ -15,19 +15,19 @@
     ./lauretta-emacs.nix
   ];
 
-  nixpkgs = {
+  # nixpkgs = {
-    overlays = [
+  #   overlays = [
-      inputs.azos-core.overlays.addpkgs
+  #     inputs.azos-core.overlays.addpkgs
-      outputs.overlays.additions
+  #     outputs.overlays.additions
-      outputs.overlays.modifications
+  #     outputs.overlays.modifications
-      outputs.overlays.unstable-packages
+  #     outputs.overlays.unstable-packages
-    ];
+  #   ];
-    config = {
+  #   config = {
-      allowUnfree = true;
+  #     allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
+  #     # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
+  #     allowUnfreePredicate = _: true;
-    };
+  #   };
-  };
+  # };
 
   programs.home-manager.enable = true;
 

modules/home-manager/reaper.nix

@@ -12,11 +12,7 @@ in {
     config = lib.mkIf isEnabled {
       home.packages = with pkgs; [
         reaper
-        # helm #TODO this synth had better work
+        helm #TODO this synth had better work
-        #TODO collision, would like to make this work.
-        #TODO we can overlay by simply removing the direct bin
-        #TODO which we don't need
-        #TODO but not urgent now
         surge
         lsp-plugins
         vital

nixos/configuration.backup.nix

@@ -1,83 +0,0 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  nixpkgs = {
-    overlays = [
-      # outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-    ];
-
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-    };
-  };
-
-  # This will add each flake input as a registry
-  # To make nix3 commands consistent with your flake
-  nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
-
-  # This will additionally add your inputs to the system's legacy channels
-  # Making legacy nix commands consistent as well, awesome!
-  nix.nixPath = ["/etc/nix/path"];
-  environment.etc =
-    lib.mapAttrs'
-    (name: value: {
-      name = "nix/path/${name}";
-      value.source = value.flake;
-    })
-    config.nix.registry;
-
-  nix.settings = {
-    experimental-features = "nix-command flakes";
-    auto-optimise-store = true;
-  };
-
-  # TODO: Set your hostname
-  networking.hostName = "your-hostname";
-
-  # TODO: This is just an example, be sure to use whatever bootloader you prefer
-  boot.loader.systemd-boot.enable = true;
-
-  users.users = {
-    # FIXME: Replace with your username
-    your-username = {
-      # TODO: You can set an initial password for your user.
-      # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install.
-      # Be sure to change it (using passwd) after rebooting!
-      initialPassword = "correcthorsebatterystaple";
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [
-        # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect
-      ];
-      # TODO: Be sure to add any other groups you need (such as networkmanager, audio, docker, etc)
-      extraGroups = ["wheel"];
-    };
-  };
-
-  # This setups a SSH server. Very important if you're setting up a headless system.
-  # Feel free to remove if you don't need it.
-  services.openssh = {
-    enable = true;
-    settings = {
-      # Forbid root login through SSH.
-      PermitRootLogin = "no";
-      # Use keys only. Remove if you want to SSH using password (not recommended)
-      PasswordAuthentication = false;
-    };
-  };
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "23.05";
-}

nixos/configuration.nix

@@ -1,13 +1,9 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { inputs, outputs, lib, config, pkgs, ... }:
 
 {
   imports =
     [
-      ./hardware-configuration.nix
+      ./lauretta-hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
       inputs.musnix.nixosModules.musnix
       inputs.home-manager.nixosModules.home-manager
@@ -22,11 +18,10 @@
   nixpkgs = {
     overlays = [
       inputs.azos-core.overlays.addpkgs
-      outputs.overlays.additions
+      outputs.overlays.addpkgs
       inputs.azos-core.overlays.qutebrowserdrm
-      # outputs.overlays.modifications
+      outputs.overlays.modifications
-      # outputs.overlays.unstable-packages
+      outputs.overlays.unstable-packages
-      # outputs.overlays.addpkgs
     ];
     config = {
       allowUnfree = true;
@@ -107,31 +102,6 @@
   services.upower.enable = true;
   programs.light.enable = true;
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.11"; # Did you read the comment?
 
 }

overlays/default.nix

@@ -1,15 +1,9 @@
 # This file defines overlays
 {inputs, ...}: {
-  # This one brings our custom packages from the 'pkgs' directory
+  addpkgs = final: _prev: (import ../pkgs {pkgs = final.pkgs; });
-  # additions = final: _prev: import ../pkgs {pkgs =
-  #   import ../azos-core/pkgs {pkgs = _prev; }; };
-  # additions = final: _prev: import inputs.azos-core.azos-pkgs {pkgs = final; }; 
-  additions = final: _prev: (import ../pkgs {pkgs = final.pkgs; });
 
 
-  # This one contains whatever you want to overlay
+  #Current overlay is for helm, to disable binary, so no conflict
-  # You can change versions, add patches, set compilation flags, anything really.
-  # https://nixos.wiki/wiki/Overlays
   modifications = final: prev: {
     helm = prev.helm.overrideAttrs (oldAttrs: rec {
       patches = oldAttrs.patches or [] ++ [