Compare commits
2 Commits
518b3d8f91
...
248fbdf082
Author | SHA1 | Date |
---|---|---|
Sameer Rahmani | 248fbdf082 | |
Sameer Rahmani | 33965e2b28 |
|
@ -32,6 +32,7 @@
|
|||
# Gtk causes a flickering issue on WM mode
|
||||
withGTK3 = false;
|
||||
toolkit = "lucid";
|
||||
withTreeSitter = true;
|
||||
};
|
||||
|
||||
elispDepsFile = ./lisp/fg42/deps.el;
|
||||
|
|
|
@ -41,5 +41,6 @@
|
|||
(require 'fg42/cubes/bookmark)
|
||||
(require 'fg42/cubes/terraform)
|
||||
|
||||
|
||||
(provide 'fg42/cubes/all)
|
||||
;;; all.el ends here
|
||||
|
|
|
@ -56,6 +56,8 @@
|
|||
(require 'fg42/cubes/nix)
|
||||
(require 'fg42/cubes/julia)
|
||||
(require 'fg42/cubes/themes)
|
||||
(require 'fg42/cubes/verilog)
|
||||
|
||||
(when-wm
|
||||
(require 'fg42/cubes/wm))
|
||||
|
||||
|
|
|
@ -93,6 +93,7 @@ interactive `pyvenv-workon' function before `lsp'"
|
|||
:after (python lsp-mode)
|
||||
:hook
|
||||
(python-mode . (lambda ()
|
||||
(setq lsp-lens-enable nil)
|
||||
;; Pyls and pylsp can be annoying
|
||||
(add-to-list 'lsp-disabled-clients 'pyls)
|
||||
(add-to-list 'lsp-disabled-clients 'pylsp)
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
;;; PythonCubes --- The Python cubes for FG42 -*- lexical-binding: t; -*-
|
||||
;;
|
||||
;; Copyright (c) 2010-2024 Sameer Rahmani & Contributors
|
||||
;;
|
||||
;; Author: Sameer Rahmani <lxsameer@gnu.org>
|
||||
;; URL: https://devheroes.codes/FG42/FG42
|
||||
;; Version: 3.0.0
|
||||
;;
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation, either version 3 of the License, or
|
||||
;; (at your option) any later version.
|
||||
;;
|
||||
;; This program is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
;;
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
;;
|
||||
;;; Commentary:
|
||||
;;; Code:
|
||||
(require 'fpkg)
|
||||
(require 'fg42/cube)
|
||||
(require 'fg42/utils)
|
||||
|
||||
|
||||
(->cube verilog-mode
|
||||
"Add support for verilog and system verilog to FG42. More info at
|
||||
https://www.veripool.org/verilog-mode/")
|
||||
|
||||
(->cube verilog-ext
|
||||
"This package provides useful extensions on top of `verilog-mode' and `verilog-ts-mode'."
|
||||
:hook ((verilog-mode . verilog-ext-mode))
|
||||
:init
|
||||
(setq verilog-ext-eglot-default-server 've-svls)
|
||||
(setq verilog-ext-feature-list
|
||||
'(font-lock
|
||||
xref
|
||||
capf
|
||||
hierarchy
|
||||
eglot
|
||||
lsp
|
||||
flycheck
|
||||
beautify
|
||||
navigation
|
||||
template
|
||||
formatter
|
||||
compilation
|
||||
imenu
|
||||
which-func
|
||||
hideshow
|
||||
typedefs
|
||||
time-stamp
|
||||
block-end-comments
|
||||
ports))
|
||||
:config
|
||||
(require 'pkg-info)
|
||||
(setq verilog-ext-eglot-default-server 've-svls)
|
||||
(setq verilog-ext-lsp-mode-default-server 've-svls)
|
||||
(verilog-ext-eglot-set-server 've-svls)
|
||||
(verilog-ext-lsp-set-server 've-svls)
|
||||
(verilog-ext-mode-setup))
|
||||
|
||||
(provide 'fg42/cubes/verilog )
|
||||
;;; verilog.el ends here
|
|
@ -117,7 +117,9 @@
|
|||
smart-mode-line
|
||||
all-the-icons
|
||||
exwm
|
||||
)
|
||||
verilog-ext
|
||||
verilog-mode
|
||||
pkg-info)
|
||||
|
||||
(provide 'fg42/deps)
|
||||
;;; deps.el ends here
|
||||
|
|
51
nix/fg42.nix
51
nix/fg42.nix
|
@ -40,6 +40,12 @@
|
|||
gcc,
|
||||
ltex-ls,
|
||||
bash,
|
||||
|
||||
supportPython ? true,
|
||||
|
||||
verilogSupport ? true,
|
||||
svls,
|
||||
verilator,
|
||||
}:
|
||||
with builtins;
|
||||
let
|
||||
|
@ -49,13 +55,36 @@ let
|
|||
else getAttr pkg ourPackages;
|
||||
|
||||
emacsBundle = (emacsPackagesFor emacs).withPackages (epkgs:
|
||||
(map (x: getPkg epkgs x) elispPkgs)
|
||||
(map (x: getPkg epkgs x) elispPkgs) ++ [
|
||||
epkgs.treesit-grammars.with-all-grammars
|
||||
]
|
||||
);
|
||||
|
||||
maintainers = import ./maintainers.nix;
|
||||
|
||||
runtimeBins = [
|
||||
ripgrep
|
||||
git
|
||||
ltex-ls
|
||||
] ++ (lib.optional supportPython [
|
||||
python311
|
||||
# Python deps
|
||||
python311
|
||||
pyright
|
||||
|
||||
python3Packages.black
|
||||
python3Packages.pylint
|
||||
python3Packages.flake8
|
||||
]) ++ (lib.optional verilogSupport [
|
||||
svls
|
||||
verilator
|
||||
]);
|
||||
|
||||
paths = map (x: "${x}/bin/") (lib.lists.flatten runtimeBins);
|
||||
pathsStr = lib.strings.concatStrings (lib.strings.intersperse ":" paths);
|
||||
|
||||
in stdenv.mkDerivation (final: rec{
|
||||
pname = "fg42$";
|
||||
pname = "fg42";
|
||||
version = "4.0.0";
|
||||
|
||||
src = srcDir;
|
||||
|
@ -80,6 +109,7 @@ in stdenv.mkDerivation (final: rec{
|
|||
export FG42_HOME=${placeholder "out"}/share/fg42/
|
||||
export FG42_EMACSD=~/.fg42/v4/emacs.d
|
||||
export FG42_USE_NIX=true;
|
||||
export PATH=${pathsStr}:$PATH
|
||||
|
||||
LIBRARY_PATH="\$(${stdenv.cc}/bin/cc -print-file-name=libgccjit.so):\$LIBRARY_PATH" \
|
||||
FG42_WM=fales ${emacsBundle}/bin/emacs \
|
||||
|
@ -96,6 +126,7 @@ in stdenv.mkDerivation (final: rec{
|
|||
export FG42_HOME=${placeholder "out"}/share/fg42/
|
||||
export FG42_EMACSD=~/.fg42/v4/emacs.d
|
||||
export FG42_USE_NIX=true;
|
||||
export PATH=${pathsStr}:$PATH
|
||||
|
||||
# Disable access control for the current user.
|
||||
xhost +SI:localuser:$USER
|
||||
|
@ -127,15 +158,7 @@ in stdenv.mkDerivation (final: rec{
|
|||
${vazir-fonts}
|
||||
${fira-code}
|
||||
${nerdfonts}
|
||||
${ripgrep}
|
||||
${git}
|
||||
${ltex-ls}
|
||||
# Python deps
|
||||
${python311}/bin/python
|
||||
${pyright}
|
||||
${python3Packages.black}
|
||||
${python3Packages.pylint}
|
||||
${python3Packages.flake8}
|
||||
${lib.strings.concatLines paths}
|
||||
EOF
|
||||
|
||||
runHook postBuild
|
||||
|
@ -153,16 +176,10 @@ in stdenv.mkDerivation (final: rec{
|
|||
|
||||
buildInputs = [
|
||||
emacs
|
||||
texinfo
|
||||
emacsBundle
|
||||
ripgrep
|
||||
git
|
||||
texinfo
|
||||
vazir-fonts
|
||||
fira-code
|
||||
nerdfonts
|
||||
gcc
|
||||
ltex-ls
|
||||
bash
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in New Issue