I can't believe it compiles. Time to reorder.
This commit is contained in:
+1
-1
Submodule azos-core updated: 18c1f08828...69d3dec184
Generated
+7
-7
@@ -6,11 +6,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748155468,
|
"lastModified": 1754597893,
|
||||||
"narHash": "sha256-/Ty1MVEMO1Wzu6CJzIUPuC2OL0rj7uepgfRD9EDDtXc=",
|
"narHash": "sha256-D/wBAxdIvMTKpFQaLo39n0X8PAFIqFCeuJboxUpAyHA=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "18c1f08828151210f0b81d4205ae6c659f9270ab",
|
"rev": "69d3dec18405dc350a81039ce657f4435b38b1f8",
|
||||||
"revCount": 47,
|
"revCount": 55,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:./azos-core"
|
"url": "file:./azos-core"
|
||||||
},
|
},
|
||||||
@@ -94,11 +94,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748037224,
|
"lastModified": 1751274312,
|
||||||
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
|
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
|
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
imports = [
|
imports = [
|
||||||
outputs.homeManagerModules
|
outputs.homeManagerModules
|
||||||
outputs.azos-core.homeManagerModules
|
outputs.azos-core.homeManagerModules
|
||||||
|
./lauretta-emacs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{ lib, config, pkgs, azos-utils, ... }:
|
||||||
|
let
|
||||||
|
localPkgName = "azos-emacs-lauretta";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
#Set config
|
||||||
|
config = {
|
||||||
|
|
||||||
|
azos.emacs.enabledSuites = [localPkgName];
|
||||||
|
|
||||||
|
#Base emacs suite definition
|
||||||
|
azos.emacs.pkgs = [pkgs.azos-emacs-lauretta];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -12,7 +12,11 @@ in {
|
|||||||
config = lib.mkIf isEnabled {
|
config = lib.mkIf isEnabled {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
reaper
|
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
|
surge
|
||||||
lsp-plugins
|
lsp-plugins
|
||||||
vital
|
vital
|
||||||
|
|||||||
@@ -21,10 +21,11 @@
|
|||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
overlays = [
|
overlays = [
|
||||||
outputs.overlays.modifications
|
|
||||||
outputs.overlays.unstable-packages
|
|
||||||
inputs.azos-core.overlays.addpkgs
|
inputs.azos-core.overlays.addpkgs
|
||||||
|
outputs.overlays.additions
|
||||||
inputs.azos-core.overlays.qutebrowserdrm
|
inputs.azos-core.overlays.qutebrowserdrm
|
||||||
|
# outputs.overlays.modifications
|
||||||
|
# outputs.overlays.unstable-packages
|
||||||
# outputs.overlays.addpkgs
|
# outputs.overlays.addpkgs
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
# This file defines overlays
|
# This file defines overlays
|
||||||
{inputs, ...}: {
|
{inputs, ...}: {
|
||||||
# This one brings our custom packages from the 'pkgs' directory
|
# This one brings our custom packages from the 'pkgs' directory
|
||||||
additions = final: _prev: import ../pkgs {pkgs = final;};
|
# 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
|
# This one contains whatever you want to overlay
|
||||||
# You can change versions, add patches, set compilation flags, anything really.
|
# You can change versions, add patches, set compilation flags, anything really.
|
||||||
|
|||||||
Executable
+15
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
orgTrivialBuild,
|
||||||
|
epkgs,
|
||||||
|
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
|
||||||
|
];
|
||||||
|
}
|
||||||
+2
-5
@@ -1,11 +1,8 @@
|
|||||||
{ pkgs } @ args:
|
{ pkgs } @ args:
|
||||||
let
|
let
|
||||||
inherit args;
|
inherit args;
|
||||||
emacs-pkg = pkgs.emacs;
|
localEmacsPkg = pkgs.localEmacsPkg;
|
||||||
epkgs = emacs-pkg.pkgs;
|
|
||||||
trivialBuild = epkgs.trivialBuild;
|
|
||||||
localEmacsPkg = (src: pkgs.callPackage src { orgTrivialBuild = pkgs.orgTrivialBuild; epkgs = epkgs; pkgs = pkgs; });
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
azos.emacs.exwm = localEmacsPkg ./azos-emacs-lauretta.nix;
|
azos-emacs-lauretta = localEmacsPkg ./azos-emacs-lauretta.nix;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
#+title: Aner's Emacs EXWM Configuration
|
||||||
|
#+property: header-args :results silent
|
||||||
|
|
||||||
|
* Base setup
|
||||||
|
** Require
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(require 'azos-emacs-base)
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
* Lauretta specific
|
||||||
|
|
||||||
|
** LLM
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package llm-refactoring
|
||||||
|
:init
|
||||||
|
(require 'llm-openai)
|
||||||
|
(setq llm-refactoring-provider (make-llm-openai :key "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")))
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
* Provide
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(provide 'azos-emacs-lauretta)
|
||||||
|
(add-hook 'after-init-hook (lambda () (require 'azos-emacs-lauretta)))
|
||||||
|
#+end_src
|
||||||
@@ -5,8 +5,8 @@ in
|
|||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
name = "tex-debug";
|
name = "tex-debug";
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgs.azos.tex
|
pkgs.azos-tex
|
||||||
# ((pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (
|
# ((pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (
|
||||||
# pkgs.azos.emacs.editor))
|
# pkgs.azos-emacs-editor))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user