emacs adjustments, path still broken

This commit is contained in:
Danilo Reyes 2025-02-27 21:49:20 -06:00
parent c286e42821
commit 784926ce46
3 changed files with 16 additions and 28 deletions

34
flake.lock generated
View File

@ -121,7 +121,7 @@
"inputs": { "inputs": {
"doomemacs": "doomemacs", "doomemacs": "doomemacs",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"nixpkgs": "nixpkgs", "nixpkgs": [],
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
@ -772,16 +772,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1740019556, "lastModified": 1739866667,
"narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dad564433178067be1fbdfcce23b546254b6d641", "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@ -846,22 +848,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixtendo-switch": { "nixtendo-switch": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
@ -958,7 +944,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"jawz-scripts": "jawz-scripts", "jawz-scripts": "jawz-scripts",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-small": "nixpkgs-small", "nixpkgs-small": "nixpkgs-small",
"nixpkgs11": "nixpkgs11", "nixpkgs11": "nixpkgs11",
"nixtendo-switch": "nixtendo-switch", "nixtendo-switch": "nixtendo-switch",

View File

@ -5,7 +5,10 @@
nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11"; nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
ucodenix.url = "github:e-tho/ucodenix"; ucodenix.url = "github:e-tho/ucodenix";
doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened"; doom-emacs = {
url = "github:marienz/nix-doom-emacs-unstraightened";
inputs.nixpkgs.follows = "";
};
jawz-scripts = { jawz-scripts = {
url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git"; url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@ -18,8 +18,8 @@
enable = true; enable = true;
package = pkgs.emacsWithDoom { package = pkgs.emacsWithDoom {
doomDir = ../../dotfiles/doom; doomDir = ../../dotfiles/doom;
doomLocalDir = "$HOME/.local/share/nix-doom"; doomLocalDir = "/home/jawz/.local/share/nix-doom";
emacs = pkgs.emacs-gtk; tangleArgs = "--all config.org";
extraPackages = extraPackages =
epkgs: epkgs:
let let
@ -70,6 +70,5 @@
}; };
defaultEditor = true; defaultEditor = true;
}; };
environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ];
}; };
} }