woot, back up and running, the error was not at al related to nixvim...
This commit is contained in:
parent
0d0b074014
commit
39939714b7
5 changed files with 37 additions and 86 deletions
16
flake.nix
16
flake.nix
|
@ -59,16 +59,16 @@
|
|||
my = self.packages.${system};
|
||||
};
|
||||
|
||||
nvfetcher = final: prev: {
|
||||
sources =
|
||||
builtins.mapAttrs (_: p: p.src)
|
||||
((import ./packages/_sources/generated.nix) {
|
||||
inherit (final) fetchurl fetchgit fetchFromGitHub dockerTools;
|
||||
});
|
||||
};
|
||||
# nvfetcher = final: prev: {
|
||||
# sources =
|
||||
# builtins.mapAttrs (_: p: p.src)
|
||||
# ((import ./packages/_sources/generated.nix) {
|
||||
# inherit (final) fetchurl fetchgit fetchFromGitHub dockerTools;
|
||||
# });
|
||||
# };
|
||||
};
|
||||
|
||||
packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {});
|
||||
# packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {});
|
||||
|
||||
nixosModules =
|
||||
{
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
editors = {
|
||||
default = "nano";
|
||||
zed.enable = true;
|
||||
nvim.enable = true;
|
||||
nano.enable = true;
|
||||
};
|
||||
|
|
|
@ -12,13 +12,14 @@ in
|
|||
programs.nixvim = {
|
||||
enable = true;
|
||||
|
||||
options = {
|
||||
opts = {
|
||||
number = true;
|
||||
|
||||
shiftwidth = 2;
|
||||
};
|
||||
|
||||
# colorschemes.gruvbox.enable = true;
|
||||
# colorschemes.base16 = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
|
||||
colorschemes.everforest.enable = true;
|
||||
|
||||
plugins = {
|
||||
lualine.enable = true;
|
||||
|
@ -29,18 +30,17 @@ in
|
|||
servers = {
|
||||
tsserver.enable = true;
|
||||
lua-ls.enable = true;
|
||||
rust-analyzer.enable = true;
|
||||
rust-analyzer = {
|
||||
enable = true;
|
||||
installRustc = true;
|
||||
installCargo = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nvim-cmp = {
|
||||
cmp = {
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
sources = [
|
||||
{name = "nvim_lsp";}
|
||||
{name = "path";}
|
||||
{name = "buffer";}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
19
modules/desktop/editors/zed.nix
Normal file
19
modules/desktop/editors/zed.nix
Normal file
|
@ -0,0 +1,19 @@
|
|||
{ config, options, lib, pkgs, ... }:
|
||||
let
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.modules) mkIf;
|
||||
inherit (lib.attrsets) attrValues;
|
||||
|
||||
cfg = config.modules.desktop.editors.zed;
|
||||
in
|
||||
{
|
||||
options.modules.desktop.editors.zed = let
|
||||
inherit (lib.options) mkEnableOption;
|
||||
in { enable = mkEnableOption "zed"; };
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
user.packages = attrValues {
|
||||
inherit (pkgs) zed-editor;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,69 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gtk-engine-murrine,
|
||||
jdupes,
|
||||
sassc,
|
||||
accent ? ["default"],
|
||||
shade ? "dark",
|
||||
size ? "standard",
|
||||
}: let
|
||||
validAccents = ["default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey"];
|
||||
validShades = ["light" "dark"];
|
||||
validSizes = ["standard" "compact"];
|
||||
|
||||
single = x: lib.optional (x != null) x;
|
||||
pname = "Everforest";
|
||||
in
|
||||
lib.checkListOfEnum "${pname} Valid theme accent(s)" validAccents accent
|
||||
lib.checkListOfEnum "${pname} Valid shades" validShades (single shade)
|
||||
lib.checkListOfEnum "${pname} Valid sizes" validSizes (single size)
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "${pname}";
|
||||
version = "0-unstable-2024-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Everforest-GTK-Theme";
|
||||
rev = "bb3fc27a2468f0965a738d9d3b30c52a799572d2";
|
||||
hash = "sha256-sTHyH1pCq/d2JMmEppdQAc+P8a3y1lM+WQcW7nXEoPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [jdupes sassc];
|
||||
|
||||
propagatedUserEnvPkgs = [gtk-engine-murrine];
|
||||
|
||||
postPatch = ''
|
||||
find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do
|
||||
patchShebangs "$file"
|
||||
done
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/themes
|
||||
|
||||
./themes/install.sh \
|
||||
--name ${pname} \
|
||||
${toString (map (x: "--theme " + x) accent)} \
|
||||
${lib.optionalString (shade != null) ("--color " + shade)} \
|
||||
${lib.optionalString (size != null) ("--size " + size)} \
|
||||
--dest $out/share/themes
|
||||
|
||||
jdupes --quiet --link-soft --recurse $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK theme based on the Everforest colour palette";
|
||||
homepage = "https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue