Compare commits
2 Commits
df682cdebe
...
d654ab9463
| Author | SHA1 | Date | |
|---|---|---|---|
| d654ab9463 | |||
| eac8edecd9 |
@@ -246,6 +246,13 @@ For autocomplete
|
|||||||
(add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
|
(add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
** Direnv
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package direnv
|
||||||
|
:config
|
||||||
|
(direnv-mode))
|
||||||
|
#+end_src
|
||||||
|
|
||||||
** Lang support
|
** Lang support
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package inform7)
|
(use-package inform7)
|
||||||
|
|||||||
@@ -23,5 +23,6 @@
|
|||||||
};
|
};
|
||||||
go.enable = true;
|
go.enable = true;
|
||||||
password-store.enable = true;
|
password-store.enable = true;
|
||||||
|
direnv.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ in
|
|||||||
services = {
|
services = {
|
||||||
baremacs = {
|
baremacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.mymacs ./config/emacs/config.org;
|
package = pkgs.mymacs.override {
|
||||||
|
config = ./config/emacs/config.org;
|
||||||
|
};
|
||||||
defaultEditor = {
|
defaultEditor = {
|
||||||
enable = false;
|
enable = false;
|
||||||
editor = "emacsclient";
|
editor = "emacsclient";
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -4,15 +4,15 @@
|
|||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, emacsNativeComp
|
, emacsNativeComp
|
||||||
, conf ? null
|
, config ? null
|
||||||
|
, package ? emacsNativeComp
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert (conf != null);
|
assert (config != null);
|
||||||
|
|
||||||
emacsWithPackagesFromUsePackage {
|
emacsWithPackagesFromUsePackage {
|
||||||
config = conf;
|
inherit config package;
|
||||||
package = emacsNativeComp;
|
|
||||||
alwaysEnsure = true;
|
alwaysEnsure = true;
|
||||||
alwaysTangle = true;
|
alwaysTangle = true;
|
||||||
extraEmacsPackages = epkgs: with epkgs; [
|
extraEmacsPackages = epkgs: with epkgs; [
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
{ stdenv, fetchgit }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "gruvbox-icons";
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://github.com/sainnhe/gruvbox-material-gtk";
|
|
||||||
rev = "2418ff7988411c57f8974f14adeb70a64e7f25c1";
|
|
||||||
sha256 = "sha256-56Mu8zHcnB4++QXjAq3S7/UPvDB8DlpT14mAW3ketSY=";
|
|
||||||
};
|
|
||||||
dontBuild = true;
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/share
|
|
||||||
cp -r icons $out/share
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
{lib, stdenv, fetchFromGitHub, discord-rpc, cmake, libmpdclient}:
|
|
||||||
with lib;
|
|
||||||
stdenv.mkDerivation rec{
|
|
||||||
name = "mpd_discord_richpresence";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "justas-d";
|
|
||||||
repo = "mpd-rich-presence-discord";
|
|
||||||
rev = "ced628d3eaf3f18c5eff286b0955c605616348ee";
|
|
||||||
sha256 = "0vl31sdgxalbnc4d4fggzqs2vsssibn53pjm6wj596cfkfpdf4y3";
|
|
||||||
};
|
|
||||||
buildInputs = [
|
|
||||||
libmpdclient
|
|
||||||
cmake
|
|
||||||
discord-rpc
|
|
||||||
];
|
|
||||||
configurePhase = ''
|
|
||||||
cmake .
|
|
||||||
'';
|
|
||||||
buildPhase = ''
|
|
||||||
make
|
|
||||||
'';
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp mpd_discord_richpresence $out/bin/
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -2,10 +2,8 @@ final: prev:
|
|||||||
let
|
let
|
||||||
call = prev.callPackage; in
|
call = prev.callPackage; in
|
||||||
{
|
{
|
||||||
mpd_discord_richpresence = call ./mpd-rpc { };
|
|
||||||
customscripts = call ./customscripts { };
|
customscripts = call ./customscripts { };
|
||||||
gruvbox-icons = call ./gruvbox-icons { };
|
mymacs = call ./emacs { };
|
||||||
mymacs = c: call ./emacs { conf = c; };
|
|
||||||
tlauncher = call ./tlauncher { };
|
tlauncher = call ./tlauncher { };
|
||||||
simp1e-cursors = call ./simp1e { };
|
simp1e-cursors = call ./simp1e { };
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user