diff --git a/azos-core b/azos-core index b0dc530..0cdc320 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit b0dc530c108e38980daea9e93764cc255d8c18fb +Subproject commit 0cdc3208f2aaa233c837c968583a79d45b968899 diff --git a/flake.lock b/flake.lock index f141d37..4072953 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754603518, - "narHash": "sha256-RXSbgFRmMqfjsCSxKI7nWJm+doxGckTQE8aaStHLy5I=", + "lastModified": 1754648724, + "narHash": "sha256-rkv5hNteekFonbSBkIlCoRZfOD3QzWkI6iBBstDI2eU=", "ref": "refs/heads/master", - "rev": "b0dc530c108e38980daea9e93764cc255d8c18fb", - "revCount": 56, + "rev": "0cdc3208f2aaa233c837c968583a79d45b968899", + "revCount": 57, "type": "git", "url": "file:./azos-core" }, diff --git a/flake.nix b/flake.nix index 86e02e1..8dd85bb 100755 --- a/flake.nix +++ b/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};})); }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index ce81752..5a4fe88 100755 --- a/home-manager/home.nix +++ b/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; diff --git a/home-manager/lauretta-emacs.nix b/home-manager/lauretta-emacs.nix index f268f74..e29214f 100644 --- a/home-manager/lauretta-emacs.nix +++ b/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 diff --git a/modules/home-manager/audio.nix b/modules/home-manager/audio.nix index 2bafb06..48972ae 100755 --- a/modules/home-manager/audio.nix +++ b/modules/home-manager/audio.nix @@ -1,15 +1,19 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.home-audio.enable; in { - options.azos.home-audio.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.home-audio.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - # home.packages = with pkgs; [pavucontrol]; - }; + config = lib.mkIf isEnabled { + # home.packages = with pkgs; [pavucontrol]; + }; } diff --git a/modules/home-manager/discord.nix b/modules/home-manager/discord.nix index 7b5714a..65f4ee6 100755 --- a/modules/home-manager/discord.nix +++ b/modules/home-manager/discord.nix @@ -1,17 +1,21 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.discord.enable; in { - options.azos.discord.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.discord.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - home.packages = with pkgs; [ - discord - ]; - }; + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + discord + ]; + }; } diff --git a/modules/home-manager/encryption.nix b/modules/home-manager/encryption.nix index e75d18b..511b5af 100755 --- a/modules/home-manager/encryption.nix +++ b/modules/home-manager/encryption.nix @@ -1,37 +1,41 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.encryption.enable; in { - options.azos.encryption.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; + options.azos.encryption.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; + + config = lib.mkIf isEnabled { + programs.password-store = { + enable = true; + settings = { + PASSWORD_STORE_KEY = "076AA297579A0064"; + }; }; - config = lib.mkIf isEnabled { - programs.password-store = { - enable = true; - settings = { - PASSWORD_STORE_KEY = "076AA297579A0064"; - }; - }; - - home.packages = with pkgs; [ - yubikey-personalization - pinentry-gtk2 - ]; - programs.gpg = { - enable = true; - }; - services.gpg-agent = { - enable = true; - enableSshSupport = true; - pinentryPackage = pkgs.pinentry-gtk2; - }; - - home.file.".ssh/config".source = ./ssh-config; - home.file.".ssh/gpg-as-ssh.pub".source = ./gpg-as-ssh.pub; - home.file.".gnupg/sshcontrol".source = ./sshcontrol; + home.packages = with pkgs; [ + yubikey-personalization + pinentry-gtk2 + ]; + programs.gpg = { + enable = true; }; + services.gpg-agent = { + enable = true; + enableSshSupport = true; + pinentryPackage = pkgs.pinentry-gtk2; + }; + + home.file.".ssh/config".source = ./ssh-config; + home.file.".ssh/gpg-as-ssh.pub".source = ./gpg-as-ssh.pub; + home.file.".gnupg/sshcontrol".source = ./sshcontrol; + }; } diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index 6a485c2..6b3a690 100755 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -1,34 +1,36 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.git-config.enable; in { - options.azos.git-config.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.git-config.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { + config = lib.mkIf isEnabled { + home.packages = with pkgs; [pass-git-helper unzip]; - home.packages = with pkgs; [ pass-git-helper unzip ]; - - programs.git = { - enable = true; - userName = "Aner Zakobar"; - userEmail = "aner@zakobar.com"; - - signing = { - key = "6D17E295C70E2674"; - signByDefault = true; - }; - - extraConfig = { - credential.helper = "!pass-git-helper $@"; - }; + programs.git = { + enable = true; + userName = "Aner Zakobar"; + userEmail = "aner@zakobar.com"; + signing = { + key = "6D17E295C70E2674"; + signByDefault = true; + }; + + extraConfig = { + credential.helper = "!pass-git-helper $@"; }; - home.file.".config/pass-git-helper/git-pass-mapping.ini".source = - ./pass-git-mapping.ini; }; + home.file.".config/pass-git-helper/git-pass-mapping.ini".source = + ./pass-git-mapping.ini; + }; } diff --git a/modules/home-manager/kubernetes.nix b/modules/home-manager/kubernetes.nix index 9b7bdc5..d40c4e7 100755 --- a/modules/home-manager/kubernetes.nix +++ b/modules/home-manager/kubernetes.nix @@ -1,19 +1,23 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.kubectl.enable; in { - options.azos.kubectl.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.kubectl.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - home.packages = with pkgs; [ - kubectl - kubernetes-helm - velero - ]; - }; + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + kubectl + kubernetes-helm + velero + ]; + }; } diff --git a/modules/home-manager/mail.nix b/modules/home-manager/mail.nix index e9221ad..c742c06 100755 --- a/modules/home-manager/mail.nix +++ b/modules/home-manager/mail.nix @@ -1,73 +1,87 @@ #https://xeiaso.net/talks/asg-2023-nixos/ example -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.mail.enable; default_account_params = { realName = "Aner Zakobar"; notmuch.enable = true; mbsync = { - enable = true; - create = "maildir"; + enable = true; + create = "maildir"; }; }; - default_gmail_params = default_account_params // { - # lieer.enable = true; - # lieer.sync.enable = true; - flavor = "gmail.com"; - # imap = { - # host = "mail.privateemail.com"; - # }; - }; + default_gmail_params = + default_account_params + // { + # lieer.enable = true; + # lieer.sync.enable = true; + flavor = "gmail.com"; + # imap = { + # host = "mail.privateemail.com"; + # }; + }; default_smtp = { tls = { enable = true; certificatesFile = "/etc/ssl/certs/ca-certificates.crt"; }; }; - default_gmail_smtp = default_smtp // { - host = "smtp.gmail.com"; - }; -in { - options.azos.mail.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; + default_gmail_smtp = + default_smtp + // { + host = "smtp.gmail.com"; }; +in { + options.azos.mail.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - programs= { - notmuch = { - enable = true; - hooks = { - preNew = "mbsync -a"; - }; - }; - mbsync = { - enable = true; - }; - msmtp = { - enable = true; - }; - lieer = { - enable = true; + config = lib.mkIf isEnabled { + programs = { + notmuch = { + enable = true; + hooks = { + preNew = "mbsync -a"; }; }; - services.lieer.enable = true; - accounts.email.accounts = { - gmail = default_gmail_params // { + mbsync = { + enable = true; + }; + msmtp = { + enable = true; + }; + lieer = { + enable = true; + }; + }; + services.lieer.enable = true; + accounts.email.accounts = { + 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 // { - port = 587; - host = "mail.privateemail.com"; - }; + smtp = + default_smtp + // { + port = 587; + host = "mail.privateemail.com"; + }; passwordCommand = "pass zakobar.com/mail/aner"; }; - - }; }; + }; } diff --git a/modules/home-manager/mpris-proxy.nix b/modules/home-manager/mpris-proxy.nix index 085eb36..f612b31 100755 --- a/modules/home-manager/mpris-proxy.nix +++ b/modules/home-manager/mpris-proxy.nix @@ -1,16 +1,20 @@ #https://xeiaso.net/talks/asg-2023-nixos/ example -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.mpris-proxy.enable; in { - options.azos.mpris-proxy.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.mpris-proxy.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - services.mpris-proxy.enable = true; - }; + config = lib.mkIf isEnabled { + services.mpris-proxy.enable = true; + }; } diff --git a/modules/home-manager/qutebrowser-config.nix b/modules/home-manager/qutebrowser-config.nix index 010bb63..b481db7 100755 --- a/modules/home-manager/qutebrowser-config.nix +++ b/modules/home-manager/qutebrowser-config.nix @@ -1,15 +1,19 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.qutebrowser-config.enable; in { - options.azos.qutebrowser-config.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.qutebrowser-config.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - home.file.".config/qutebrowser/config.py".source = ./qutebrowser-config.py; - }; + config = lib.mkIf isEnabled { + home.file.".config/qutebrowser/config.py".source = ./qutebrowser-config.py; + }; } diff --git a/modules/home-manager/reaper.nix b/modules/home-manager/reaper.nix index 41efb10..6d0dd0d 100755 --- a/modules/home-manager/reaper.nix +++ b/modules/home-manager/reaper.nix @@ -1,21 +1,25 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.reaper.enable; in { - options.azos.reaper.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + 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 - ]; - }; + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + reaper + helm #TODO this synth had better work + surge + lsp-plugins + vital + ]; + }; } diff --git a/modules/home-manager/spotify.nix b/modules/home-manager/spotify.nix index 4834657..bd202c0 100755 --- a/modules/home-manager/spotify.nix +++ b/modules/home-manager/spotify.nix @@ -1,17 +1,21 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.spotify.enable; in { - options.azos.spotify.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.spotify.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - home.packages = with pkgs; [ - spotify - ]; - }; + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + spotify + ]; + }; } diff --git a/modules/home-manager/zoom.nix b/modules/home-manager/zoom.nix index 6f08a97..e056d34 100755 --- a/modules/home-manager/zoom.nix +++ b/modules/home-manager/zoom.nix @@ -1,17 +1,21 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.zoom.enable; in { - options.azos.zoom.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.zoom.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - home.packages = with pkgs; [ - zoom-us - ]; - }; + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + zoom-us + ]; + }; } diff --git a/modules/nixos/audio.nix b/modules/nixos/audio.nix index 7a57f7c..ef7e0ce 100644 --- a/modules/nixos/audio.nix +++ b/modules/nixos/audio.nix @@ -1,17 +1,21 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.hardware-audio.enable; in { - options.azos.hardware-audio.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.hardware-audio.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - hardware.pulseaudio.enable = true; - environment.systemPackages = with pkgs; [pavucontrol]; - musnix.enable = true; - }; + config = lib.mkIf isEnabled { + hardware.pulseaudio.enable = true; + environment.systemPackages = with pkgs; [pavucontrol]; + musnix.enable = true; + }; } diff --git a/modules/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix index 1171f79..f3f2bde 100755 --- a/modules/nixos/bluetooth.nix +++ b/modules/nixos/bluetooth.nix @@ -1,16 +1,20 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.bluetooth.enable; in { - options.azos.bluetooth.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.bluetooth.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - services.blueman.enable = true; - hardware.bluetooth.enable = true; - }; + config = lib.mkIf isEnabled { + services.blueman.enable = true; + hardware.bluetooth.enable = true; + }; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index f079d50..6d72a04 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,4 +1,3 @@ { imports = [./audio.nix ./bluetooth.nix ./steam.nix]; } - diff --git a/modules/nixos/steam.nix b/modules/nixos/steam.nix index 6fbebab..855c0f6 100755 --- a/modules/nixos/steam.nix +++ b/modules/nixos/steam.nix @@ -1,15 +1,19 @@ -{ lib, config, pkgs, ... }: -let +{ + lib, + config, + pkgs, + ... +}: let isEnabled = config.azos.steam.enable; in { - options.azos.steam.enable = lib.mkOption { - default = true; - example = true; - type = lib.types.bool; - }; + options.azos.steam.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; - config = lib.mkIf isEnabled { - programs.steam.enable = true; - }; + config = lib.mkIf isEnabled { + programs.steam.enable = true; + }; } diff --git a/nixos/configuration-vm.nix b/nixos/configuration-vm.nix index a0a27ef..cc475a1 100755 --- a/nixos/configuration-vm.nix +++ b/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 = { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3eecdd2..f3709e9 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,15 +1,19 @@ -{ inputs, outputs, lib, config, pkgs, ... }: - { - imports = - [ - ./lauretta-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 - ]; + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + ./lauretta-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 + ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -58,8 +62,8 @@ # Configure keymap in X11 services.xserver = { xkb = { - layout = "us,il"; - variant = ""; + layout = "us,il"; + variant = ""; }; xkb.options = "grp:alt_shift_toggle"; }; @@ -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? - } diff --git a/nixos/lauretta-hardware-configuration.nix b/nixos/lauretta-hardware-configuration.nix index 7d1598f..d0bd76d 100755 --- a/nixos/lauretta-hardware-configuration.nix +++ b/nixos/lauretta-hardware-configuration.nix @@ -1,33 +1,37 @@ # 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 = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BF2B-E467"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/BF2B-E467"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/cea8ee1e-925c-4f5f-9ec8-7e39103d40da"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/cea8ee1e-925c-4f5f-9ec8-7e39103d40da";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/overlays/default.nix b/overlays/default.nix index f784983..20fb88f 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,14 +1,16 @@ # 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 [] ++ [ - ./helm.patch - ]; + patches = + oldAttrs.patches + or [] + ++ [ + ./helm.patch + ]; }); }; diff --git a/pkgs/azos-emacs-lauretta.nix b/pkgs/azos-emacs-lauretta.nix index d5b4448..429e29d 100755 --- a/pkgs/azos-emacs-lauretta.nix +++ b/pkgs/azos-emacs-lauretta.nix @@ -1,15 +1,15 @@ { orgTrivialBuild, epkgs, - pkgs + pkgs, }: orgTrivialBuild { - pname = "azos-emacs-lauretta"; - version = "0.1.6"; - src = ./elisp/azos-emacs-lauretta.org; - packageRequires = with epkgs; [ - pkgs.azos-emacs-base - pkgs.azos-emacs-station - llm - ]; + pname = "azos-emacs-lauretta"; + version = "0.1.6"; + src = ./elisp/azos-emacs-lauretta.org; + packageRequires = with epkgs; [ + pkgs.azos-emacs-base + pkgs.azos-emacs-station + llm + ]; } diff --git a/pkgs/default.nix b/pkgs/default.nix index de94215..1d55ef7 100755 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,8 +1,6 @@ -{ pkgs } @ args: -let +{pkgs} @ args: let inherit args; localEmacsPkg = pkgs.localEmacsPkg; -in -{ +in { azos-emacs-lauretta = localEmacsPkg ./azos-emacs-lauretta.nix; } diff --git a/shells/debugTex/default.nix b/shells/debugTex/default.nix index 99976f9..b0a9bcc 100755 --- a/shells/debugTex/default.nix +++ b/shells/debugTex/default.nix @@ -1,12 +1,11 @@ -{ pkgs } @ args : -let +{pkgs} @ args: 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)) ]; -} + } diff --git a/shells/default.nix b/shells/default.nix index 10f47b6..a46e351 100755 --- a/shells/default.nix +++ b/shells/default.nix @@ -1,4 +1,3 @@ -{ pkgs } @ args: -{ +{pkgs} @ args: { debugTex = import ./debugTex args; }