Formatted

flake.lock

@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1754603518,
+        "lastModified": 1754648724,
-        "narHash": "sha256-RXSbgFRmMqfjsCSxKI7nWJm+doxGckTQE8aaStHLy5I=",
+        "narHash": "sha256-rkv5hNteekFonbSBkIlCoRZfOD3QzWkI6iBBstDI2eU=",
         "ref": "refs/heads/master",
-        "rev": "b0dc530c108e38980daea9e93764cc255d8c18fb",
+        "rev": "0cdc3208f2aaa233c837c968583a79d45b968899",
-        "revCount": 56,
+        "revCount": 57,
         "type": "git",
         "url": "file:./azos-core"
       },

flake.nix

@@ -11,7 +11,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     #Music production nix
-    musnix  = { url = "github:musnix/musnix"; };
+    musnix = {url = "github:musnix/musnix";};
 
     azos-core = {
       url = "git+file:./azos-core";
@@ -62,6 +62,6 @@
     };
 
     #TODO this is probably unsupported
-    shells = forAllSystems (system: ((import ./shells) { pkgs= nixpkgs.legacyPackages.${system} // outputs.packages.${system} // outputs.azos-packages.${system};}));
+    shells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system} // outputs.packages.${system} // outputs.azos-packages.${system};}));
   };
 }

home-manager/home.nix

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

home-manager/lauretta-emacs.nix

@@ -1,11 +1,14 @@
-{ lib, config, pkgs, azos-utils, ... }:
-let
-  localPkgName = "azos-emacs-lauretta";
-in
 {
+  lib,
+  config,
+  pkgs,
+  azos-utils,
+  ...
+}: let
+  localPkgName = "azos-emacs-lauretta";
+in {
   #Set config
   config = {
-
     azos.emacs.enabledSuites = [localPkgName];
 
     #Base emacs suite definition

modules/home-manager/audio.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.home-audio.enable;
 in {

modules/home-manager/discord.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.discord.enable;
 in {

modules/home-manager/encryption.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.encryption.enable;
 in {

modules/home-manager/git.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.git-config.enable;
 in {
@@ -10,8 +14,7 @@ in {
   };
 
   config = lib.mkIf isEnabled {
-
+    home.packages = with pkgs; [pass-git-helper unzip];
-      home.packages = with pkgs; [ pass-git-helper unzip ];
 
     programs.git = {
       enable = true;
@@ -26,7 +29,6 @@ in {
       extraConfig = {
         credential.helper = "!pass-git-helper $@";
       };
-
     };
     home.file.".config/pass-git-helper/git-pass-mapping.ini".source =
       ./pass-git-mapping.ini;

modules/home-manager/kubernetes.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.kubectl.enable;
 in {

modules/home-manager/mail.nix

@@ -1,6 +1,10 @@
 #https://xeiaso.net/talks/asg-2023-nixos/ example
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.mail.enable;
   default_account_params = {
@@ -11,7 +15,9 @@ let
       create = "maildir";
     };
   };
-  default_gmail_params = default_account_params // {
+  default_gmail_params =
+    default_account_params
+    // {
       # lieer.enable = true;
       # lieer.sync.enable = true;
       flavor = "gmail.com";
@@ -25,7 +31,9 @@ let
       certificatesFile = "/etc/ssl/certs/ca-certificates.crt";
     };
   };
-  default_gmail_smtp = default_smtp // {
+  default_gmail_smtp =
+    default_smtp
+    // {
       host = "smtp.gmail.com";
     };
 in {
@@ -36,7 +44,7 @@ in {
   };
 
   config = lib.mkIf isEnabled {
-      programs= {
+    programs = {
       notmuch = {
         enable = true;
         hooks = {
@@ -55,19 +63,25 @@ in {
     };
     services.lieer.enable = true;
     accounts.email.accounts = {
-        gmail = default_gmail_params // {
+      gmail =
+        default_gmail_params
+        // {
           address = "anerisgreat@gmail.com";
           userName = "anerisgreat";
           # smtp = default_gmail_smtp;
           passwordCommand = "pass gmail.com/mbsync-anerisgreat";
         };
-        bgu = default_gmail_params // {
+      bgu =
+        default_gmail_params
+        // {
           address = "anerz@post.bgu.ac.il";
           userName = "anerz@post.bgu.ac.il";
           # smtp = default_gmail_smtp;
           passwordCommand = "pass post.bgu.ac.il/mbsync-anerz";
         };
-        zakobar = default_account_params // {
+      zakobar =
+        default_account_params
+        // {
           address = "aner@zakobar.com";
           msmtp.enable = true;
 
@@ -81,13 +95,14 @@ in {
           #     create = "maildir";
           # };
 
-          smtp = default_smtp // {
+          smtp =
+            default_smtp
+            // {
               port = 587;
               host = "mail.privateemail.com";
             };
           passwordCommand = "pass zakobar.com/mail/aner";
         };
-
     };
   };
 }

modules/home-manager/mpris-proxy.nix

@@ -1,6 +1,10 @@
 #https://xeiaso.net/talks/asg-2023-nixos/ example
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.mpris-proxy.enable;
 in {

modules/home-manager/qutebrowser-config.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.qutebrowser-config.enable;
 in {

modules/home-manager/reaper.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.reaper.enable;
 in {

modules/home-manager/spotify.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.spotify.enable;
 in {

modules/home-manager/zoom.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.zoom.enable;
 in {

modules/nixos/audio.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.hardware-audio.enable;
 in {

modules/nixos/bluetooth.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.bluetooth.enable;
 in {

modules/nixos/default.nix

@@ -1,4 +1,3 @@
 {
   imports = [./audio.nix ./bluetooth.nix ./steam.nix];
 }
-

modules/nixos/steam.nix

@@ -1,5 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   isEnabled =
     config.azos.steam.enable;
 in {

nixos/configuration-vm.nix

@@ -15,7 +15,7 @@
       x = 1280;
       y = 1024;
     };
-virtualisation.qemu.options = [
+    virtualisation.qemu.options = [
       # Better display option
       "-vga virtio"
       "-display gtk,zoom-to-fit=false"
@@ -25,7 +25,7 @@ virtualisation.qemu.options = [
       "-device virtio-serial-pci"
       "-device virtserialport,chardev=ch1,id=ch1,name=com.redhat.spice.0"
     ];
-};
+  };
   imports = [
     inputs.home-manager.nixosModules.home-manager
     outputs.nixosModules
@@ -71,7 +71,7 @@ virtualisation.qemu.options = [
   boot.loader.efi.canTouchEfiVariables = true;
 
   home-manager = {
-    extraSpecialArgs = { inherit inputs outputs; };
+    extraSpecialArgs = {inherit inputs outputs;};
     users = {
       # Import your home-manager configuration
       aner = import ../home-manager/home.nix;
@@ -90,7 +90,6 @@ virtualisation.qemu.options = [
     };
   };
 
-
   # 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 = {

nixos/configuration.nix

@@ -1,8 +1,12 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-
 {
-  imports =
+  inputs,
-    [
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
     ./lauretta-hardware-configuration.nix
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
     inputs.musnix.nixosModules.musnix
@@ -72,7 +76,7 @@
     isNormalUser = true;
     description = "Aner Zakobar";
     #Audio group for audio config, video group necessary for backlight.
-    extraGroups = [ "networkmanager" "wheel" "audio" "video"];
+    extraGroups = ["networkmanager" "wheel" "audio" "video"];
     packages = with pkgs; [];
   };
 
@@ -82,7 +86,7 @@
   };
 
   home-manager = {
-    extraSpecialArgs = {inherit inputs outputs pkgs; };
+    extraSpecialArgs = {inherit inputs outputs pkgs;};
     users = {
       aner = import ../home-manager/home.nix;
     };
@@ -103,5 +107,4 @@
   programs.light.enable = true;
 
   system.stateVersion = "24.11"; # Did you read the comment?
-
 }

nixos/lauretta-hardware-configuration.nix

@@ -1,32 +1,36 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7";
+    device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7";
     fsType = "btrfs";
-      options = [ "subvol=@" ];
+    options = ["subvol=@"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/BF2B-E467";
+    device = "/dev/disk/by-uuid/BF2B-E467";
     fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = ["fmask=0077" "dmask=0077"];
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/cea8ee1e-925c-4f5f-9ec8-7e39103d40da"; }
+    {device = "/dev/disk/by-uuid/cea8ee1e-925c-4f5f-9ec8-7e39103d40da";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

overlays/default.nix

@@ -1,12 +1,14 @@
 # This file defines overlays
 {inputs, ...}: {
-  addpkgs = final: _prev: (import ../pkgs {pkgs = final.pkgs; });
+  addpkgs = final: _prev: (import ../pkgs {pkgs = final.pkgs;});
-
 
   #Current overlay is for helm, to disable binary, so no conflict
   modifications = final: prev: {
     helm = prev.helm.overrideAttrs (oldAttrs: rec {
-      patches = oldAttrs.patches or [] ++ [
+      patches =
+        oldAttrs.patches
+        or []
+        ++ [
           ./helm.patch
         ];
     });

pkgs/azos-emacs-lauretta.nix

@@ -1,7 +1,7 @@
 {
   orgTrivialBuild,
   epkgs,
-  pkgs
+  pkgs,
 }:
 orgTrivialBuild {
   pname = "azos-emacs-lauretta";

pkgs/default.nix

@@ -1,8 +1,6 @@
-{ pkgs } @ args:
+{pkgs} @ args: let
-let
   inherit args;
   localEmacsPkg = pkgs.localEmacsPkg;
-in
+in {
-{
   azos-emacs-lauretta = localEmacsPkg ./azos-emacs-lauretta.nix;
 }

shells/debugTex/default.nix

@@ -1,12 +1,11 @@
-{ pkgs } @ args :
+{pkgs} @ args: let
-let
   testfile = builtins.readfile ./test.org;
 in
-pkgs.mkShell {
+  pkgs.mkShell {
     name = "tex-debug";
     buildInputs = [
       pkgs.azos-tex
       # ((pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (
       #       pkgs.azos-emacs-editor))
     ];
-}
+  }

shells/default.nix

@@ -1,4 +1,3 @@
-{ pkgs } @ args:
+{pkgs} @ args: {
-{
   debugTex = import ./debugTex args;
 }