anthonycicc/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Wiki Activity

yeet nix-doom-emacs it's kinda stinky

Browse source
This commit is contained in:
Anthony Cicchetti 2024-02-16 16:07:39 -05:00
parent 45dc2ddfe1
commit b12b2812e7
5 changed files with 47 additions and 483 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

463
nix/home-manager/flake.lock generated
View file

@ -24,152 +24,6 @@
"type": "github" "type": "github"
} }
}, },
"doom-emacs": {
"flake": false,
"locked": {
"lastModified": 1662497747,
"narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=",
"owner": "doomemacs",
"repo": "doomemacs",
"rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac",
"type": "github"
},
"original": {
"owner": "doomemacs",
"repo": "doomemacs",
"rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac",
"type": "github"
}
},
"doom-snippets": {
"flake": false,
"locked": {
"lastModified": 1694887483,
"narHash": "sha256-KlKhruPSLPSKqUnr5/U65arm16VrY9ORzm+XKNZhpTQ=",
"owner": "doomemacs",
"repo": "snippets",
"rev": "f022984ee1318a4015d5d081b3c3dab5a60dc6ff",
"type": "github"
},
"original": {
"owner": "doomemacs",
"repo": "snippets",
"type": "github"
}
},
"emacs-overlay": {
"flake": false,
"locked": {
"lastModified": 1676366521,
"narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501",
"type": "github"
}
},
"emacs-so-long": {
"flake": false,
"locked": {
"lastModified": 1575031854,
"narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=",
"owner": "hlissner",
"repo": "emacs-so-long",
"rev": "ed666b0716f60e8988c455804de24b55919e71ca",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "emacs-so-long",
"type": "github"
}
},
"evil-escape": {
"flake": false,
"locked": {
"lastModified": 1588439096,
"narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=",
"owner": "hlissner",
"repo": "evil-escape",
"rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "evil-escape",
"type": "github"
}
},
"evil-markdown": {
"flake": false,
"locked": {
"lastModified": 1626852210,
"narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
"owner": "Somelauw",
"repo": "evil-markdown",
"rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
"type": "github"
},
"original": {
"owner": "Somelauw",
"repo": "evil-markdown",
"type": "github"
}
},
"evil-org-mode": {
"flake": false,
"locked": {
"lastModified": 1607203864,
"narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=",
"owner": "hlissner",
"repo": "evil-org-mode",
"rev": "a9706da260c45b98601bcd72b1d2c0a24a017700",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "evil-org-mode",
"type": "github"
}
},
"evil-quick-diff": {
"flake": false,
"locked": {
"lastModified": 1575189609,
"narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=",
"owner": "rgrinberg",
"repo": "evil-quick-diff",
"rev": "69c883720b30a892c63bc89f49d4f0e8b8028908",
"type": "github"
},
"original": {
"owner": "rgrinberg",
"repo": "evil-quick-diff",
"type": "github"
}
},
"explain-pause-mode": {
"flake": false,
"locked": {
"lastModified": 1595842060,
"narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=",
"owner": "lastquestion",
"repo": "explain-pause-mode",
"rev": "2356c8c3639cbeeb9751744dbe737267849b4b51",
"type": "github"
},
"original": {
"owner": "lastquestion",
"repo": "explain-pause-mode",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -186,22 +40,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -221,24 +59,6 @@
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -253,23 +73,6 @@
"type": "github" "type": "github"
} }
}, },
"format-all": {
"flake": false,
"locked": {
"lastModified": 1581716637,
"narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
"owner": "lassik",
"repo": "emacs-format-all-the-code",
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github"
},
"original": {
"owner": "lassik",
"repo": "emacs-format-all-the-code",
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -318,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707919853, "lastModified": 1708031129,
"narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "043ba285c6dc20f36441d48525402bcb9743c498", "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,50 +174,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-doom-emacs": {
"inputs": {
"doom-emacs": "doom-emacs",
"doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay",
"emacs-so-long": "emacs-so-long",
"evil-escape": "evil-escape",
"evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"format-all": "format-all",
"nix-straight": "nix-straight",
"nixpkgs": [
"nixpkgs"
],
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
"org-contrib": "org-contrib",
"org-yt": "org-yt",
"php-extras": "php-extras",
"revealjs": "revealjs",
"rotate-text": "rotate-text",
"sln-mode": "sln-mode",
"ts-fold": "ts-fold",
"ws-butler": "ws-butler"
},
"locked": {
"lastModified": 1701264882,
"narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"rev": "f7413022370f24bb53cb450bfb2803233510113e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-doom-emacs",
"type": "github"
}
},
"nix-flake-tests": { "nix-flake-tests": {
"locked": { "locked": {
"lastModified": 1677844186, "lastModified": 1677844186,
@ -473,25 +232,9 @@
"type": "github" "type": "github"
} }
}, },
"nix-straight": {
"flake": false,
"locked": {
"lastModified": 1696948727,
"narHash": "sha256-6fQamWVIyeLoFSJl1WKcIl+LUdZluzFla4H+4Z5Cv2E=",
"owner": "codingkoi",
"repo": "nix-straight.el",
"rev": "c64edbf49598453bd85dae1acef9a0f9d294185d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-straight.el",
"type": "github"
}
},
"nixneovim": { "nixneovim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"haumea": "haumea", "haumea": "haumea",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
@ -593,11 +336,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1707939175, "lastModified": 1708116870,
"narHash": "sha256-D1xan0lgxbmXDyzVqXTiSYHLmAMrMRdD+alKzEO/p3w=", "narHash": "sha256-SvU5JCzlb0ZWNO2XgyTMsrDHkaeMpETm80pt8CWw4MI=",
"owner": "nixOS", "owner": "nixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f7e8132daca31b1e3859ac0fb49741754375ac3d", "rev": "1d1f1553a842d2062104e313bdf3eadd4e7f16db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,102 +382,6 @@
"type": "github" "type": "github"
} }
}, },
"nose": {
"flake": false,
"locked": {
"lastModified": 1400604510,
"narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=",
"owner": "emacsattic",
"repo": "nose",
"rev": "f8528297519eba911696c4e68fa88892de9a7b72",
"type": "github"
},
"original": {
"owner": "emacsattic",
"repo": "nose",
"type": "github"
}
},
"ob-racket": {
"flake": false,
"locked": {
"lastModified": 1584656173,
"narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=",
"owner": "xchrishawk",
"repo": "ob-racket",
"rev": "83457ec9e1e96a29fd2086ed19432b9d75787673",
"type": "github"
},
"original": {
"owner": "xchrishawk",
"repo": "ob-racket",
"type": "github"
}
},
"org": {
"flake": false,
"locked": {
"lastModified": 1695726851,
"narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9",
"type": "github"
},
"original": {
"owner": "emacs-straight",
"repo": "org-mode",
"type": "github"
}
},
"org-contrib": {
"flake": false,
"locked": {
"lastModified": 1694946041,
"narHash": "sha256-X/HFG6NZe5BY00KvGbcsIuf9R6Lg8x7Uhd0Y5+Q3qZU=",
"owner": "emacsmirror",
"repo": "org-contrib",
"rev": "5eabbf22bdd4523c922a30787e98ee66c24221aa",
"type": "github"
},
"original": {
"owner": "emacsmirror",
"repo": "org-contrib",
"type": "github"
}
},
"org-yt": {
"flake": false,
"locked": {
"lastModified": 1527381913,
"narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=",
"owner": "TobiasZawada",
"repo": "org-yt",
"rev": "40cc1ac76d741055cbefa13860d9f070a7ade001",
"type": "github"
},
"original": {
"owner": "TobiasZawada",
"repo": "org-yt",
"type": "github"
}
},
"php-extras": {
"flake": false,
"locked": {
"lastModified": 1573312690,
"narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=",
"owner": "arnested",
"repo": "php-extras",
"rev": "d410c5af663c30c01d461ac476d1cbfbacb49367",
"type": "github"
},
"original": {
"owner": "arnested",
"repo": "php-extras",
"type": "github"
}
},
"poetry2nix": { "poetry2nix": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -791,64 +438,15 @@
"type": "github" "type": "github"
} }
}, },
"revealjs": {
"flake": false,
"locked": {
"lastModified": 1695738029,
"narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=",
"owner": "hakimel",
"repo": "reveal.js",
"rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757",
"type": "github"
},
"original": {
"owner": "hakimel",
"repo": "reveal.js",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"devenv": "devenv", "devenv": "devenv",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-doom-emacs": "nix-doom-emacs",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixneovim": "nixneovim", "nixneovim": "nixneovim",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
} }
}, },
"rotate-text": {
"flake": false,
"locked": {
"lastModified": 1322962747,
"narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=",
"owner": "debug-ito",
"repo": "rotate-text.el",
"rev": "48f193697db996855aee1ad2bc99b38c6646fe76",
"type": "github"
},
"original": {
"owner": "debug-ito",
"repo": "rotate-text.el",
"type": "github"
}
},
"sln-mode": {
"flake": false,
"locked": {
"lastModified": 1423727528,
"narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=",
"owner": "sensorflo",
"repo": "sln-mode",
"rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c",
"type": "github"
},
"original": {
"owner": "sensorflo",
"repo": "sln-mode",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -863,53 +461,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"ts-fold": {
"flake": false,
"locked": {
"lastModified": 1695278494,
"narHash": "sha256-O4NcUC1u08W8ZslqoA/i+iTaLotKwheURXQWBxLLMFc=",
"owner": "jcs-elpa",
"repo": "ts-fold",
"rev": "70b2c79ff4daa7351d4e2917b0343b9a18d4d4f2",
"type": "github"
},
"original": {
"owner": "jcs-elpa",
"repo": "ts-fold",
"type": "github"
}
},
"ws-butler": {
"flake": false,
"locked": {
"lastModified": 1634511126,
"narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=",
"owner": "hlissner",
"repo": "ws-butler",
"rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "ws-butler",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

25
nix/home-manager/flake.nix
View file

@ -1,6 +1,11 @@
{ {
description = "Home Manager configuration of acicchetti"; description = "Home Manager configuration of acicchetti";
nixConfig = {
extra-substituters = ["https://devenv.cachix.org"];
extra-trusted-public-keys = ["devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="];
};
inputs = { inputs = {
# Specify the source of Home Manager and Nixpkgs. # Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixOS/nixpkgs"; nixpkgs.url = "github:nixOS/nixpkgs";
@ -16,13 +21,10 @@
url = "github:Mic92/nix-index-database"; url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-doom-emacs = { # emacs-overlay = {
url = "github:nix-community/nix-doom-emacs"; # url = "github:nix-community/emacs-overlay";
inputs = { # inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs"; # };
nix-straight.url = "github:codingkoi/nix-straight.el/codingkoi/apply-librephoenixs-fix";
};
};
nixneovim = { nixneovim = {
url = "github:nixneovim/nixneovim"; url = "github:nixneovim/nixneovim";
inputs = { inputs = {
@ -37,8 +39,8 @@
nixpkgs, nixpkgs,
home-manager, home-manager,
devenv, devenv,
nix-doom-emacs,
nix-index-database, nix-index-database,
# emacs-overlay,
nixneovim, nixneovim,
... ...
}: let }: let
@ -51,7 +53,10 @@
import nixpkgs { import nixpkgs {
inherit system; inherit system;
config = {allowUnfree = true;}; config = {allowUnfree = true;};
overlays = [nixneovim.overlays.default]; overlays = [
nixneovim.overlays.default
# emacs-overlay.overlays.default
];
} }
); );
@ -60,7 +65,7 @@
pkgs = pkgs."${system}"; pkgs = pkgs."${system}";
modules = [ modules = [
{ {
imports = [nixneovim.nixosModules.default nix-doom-emacs.hmModule]; imports = [nixneovim.nixosModules.default];
home.packages = [devenv.packages."${system}".devenv]; home.packages = [devenv.packages."${system}".devenv];
} }
nix-index-database.hmModules.nix-index nix-index-database.hmModules.nix-index

17
nix/home-manager/home.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
caches,
... ...
}: let }: let
inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
@ -159,14 +160,14 @@ in {
enable = false; enable = false;
}; };
programs.doom-emacs = { # programs.doom-emacs = {
enable = true; # enable = true;
doomPrivateDir = ../../emacs/emacs.doom; # doomPrivateDir = ../../emacs/emacs.doom;
emacsPackage = # emacsPackage =
if isDarwin # if isDarwin
then pkgs.emacs # then pkgs.emacs
else pkgs.emacs; # else pkgs.emacs;
}; # };
imports = [ imports = [
./modules/packages ./modules/packages

23
nix/home-manager/modules/files.nix
View file

@ -3,15 +3,22 @@
lib, lib,
config, config,
... ...
}: { }: let
home.file.".ideavimrc".source = ../../../ideavim/ideavimrc; repo_root = "../../..";
xdg.configFile."erdtree/.erdtreerc".source = ../../../erdtree/erdtreerc; in {
xdg.configFile."ov/config.yaml".source = ../../../ov/ov-less.yaml; home.file.".ideavimrc".source = ./${repo_root}/ideavim/ideavimrc;
home.file."bin/git-sync".source = ../../../git-sync; xdg.configFile."erdtree/.erdtreerc".source = ./${repo_root}/erdtree/erdtreerc;
xdg.configFile."kitty/kitty.conf".source = ../../../kitty/kitty.conf; xdg.configFile."ov/config.yaml".source = ./${repo_root}/ov/ov-less.yaml;
xdg.configFile."lsd/config.yaml".source = ../../../lsd/config.yaml; home.file."bin/git-sync".source = ./${repo_root}/git-sync;
xdg.configFile."kitty/kitty.conf".source = ./${repo_root}/kitty/kitty.conf;
xdg.configFile."lsd/config.yaml".source = ./${repo_root}/lsd/config.yaml;
home.file.".cargo/config.toml".source = pkgs.substituteAll { home.file.".cargo/config.toml".source = pkgs.substituteAll {
src = ../../../cargo/config.toml.nixtemplate; src = ./${repo_root}/cargo/config.toml.nixtemplate;
profileDir = config.home.profileDirectory; profileDir = config.home.profileDirectory;
}; };
xdg.configFile = {
"doom/init.el".source = ./${repo_root}/emacs/emacs.doom/init.el;
"doom/config.el".source = ./${repo_root}/emacs/emacs.doom/config.el;
"doom/packages.el".source = ./${repo_root}/emacs/emacs.doom/packages.el;
};
} }

2
nix/home-manager/modules/packages/default.nix
View file

@ -12,7 +12,6 @@
else [pkgs.keka]; else [pkgs.keka];
in { in {
imports = [ imports = [
./emacs.nix
./git.nix ./git.nix
./neovim.nix ./neovim.nix
./starship.nix ./starship.nix
@ -32,6 +31,7 @@ in {
docker-client docker-client
dogdns dogdns
erdtree erdtree
emacs
fd fd
ffmpeg_6 ffmpeg_6
gawkInteractive gawkInteractive