nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

treewide: alejandra -> nixfmt-rfc-style

Browse source
This commit is contained in:
Nikodem Rabuliński 2024-02-25 19:09:09 +01:00
parent d64c02e3da
commit 6558fdb739
51 changed files with 1108 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

45
wrappers/default.nix
View file

@ -1,26 +1,25 @@
{inputs, ...}: {
perSystem = {
pkgs,
inputs',
...
}: let
wrapped = inputs.wrapper-manager-hm-compat.lib {
inherit pkgs;
modules = [
# ./starship
./helix
# TODO: Enable again
# ./rash
./fish
./wezterm
];
specialArgs = {
inherit inputs inputs';
{ inputs, ... }:
{
perSystem =
{ pkgs, inputs', ... }:
let
wrapped = inputs.wrapper-manager-hm-compat.lib {
inherit pkgs;
modules = [
# ./starship
./helix
# TODO: Enable again
# ./rash
./fish
./wezterm
];
specialArgs = {
inherit inputs inputs';
};
};
all-packages = wrapped.config.build.packages;
in
{
packages = all-packages;
};
all-packages = wrapped.config.build.packages;
in {
packages =
all-packages;
};
}

53
wrappers/fish/default.nix
View file

@ -1,33 +1,40 @@
{ lib, pkgs, ... }:
{
lib,
pkgs,
...
}: {
wrappers.fish = {
basePackage = pkgs.fish;
wrapByDefault = false;
programs.fish = {config, ...}: {
extraWrapperFlags = "--inherit-argv0";
programs.fish =
{ config, ... }:
{
extraWrapperFlags = "--inherit-argv0";
prependFlags = let
# Can't rely on pathAdd because fish used as login shell will ignore the variables the wrapper sets up
path-add-lines =
lib.concatMapStringsSep "\n"
(pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
config.pathAdd;
config-fish = pkgs.writeText "config.fish" ''
${path-add-lines}
prependFlags =
let
# Can't rely on pathAdd because fish used as login shell will ignore the variables the wrapper sets up
path-add-lines =
lib.concatMapStringsSep "\n" (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
config.pathAdd;
config-fish = pkgs.writeText "config.fish" ''
${path-add-lines}
source ${./prompt.fish}
source ${./config.fish}
'';
in [
"-C"
"source ${config-fish}"
];
source ${./prompt.fish}
source ${./config.fish}
'';
in
[
"-C"
"source ${config-fish}"
];
pathAdd = with pkgs; [eza bat fzf ripgrep zoxide direnv];
};
pathAdd = with pkgs; [
eza
bat
fzf
ripgrep
zoxide
direnv
];
};
};
}

9
wrappers/helix/default.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.helix = {
enable = true;
settings = {
@ -25,8 +26,8 @@
{
name = "koka";
scope = "scope.koka";
file-types = ["kk"];
roots = [];
file-types = [ "kk" ];
roots = [ ];
indent = {
tab-width = 4;
unit = " ";
@ -43,5 +44,5 @@
};
};
wrappers.helix.pathAdd = [pkgs.nil];
wrappers.helix.pathAdd = [ pkgs.nil ];
}

103
wrappers/rash/default.nix
View file

@ -3,57 +3,58 @@
inputs',
config,
...
}: {
wrappers.rash = let
readlinePatched = pkgs.fetchFromGitHub {
owner = "nrabulinski";
repo = "readline";
rev = "8eb52c163d6ea7c3cec2cc6b1011ce00738942e1";
hash = "sha256-1yU0ZUBQqYEn85j4T2pLs02MTyJnO5BbYALIa88iomY=";
};
racket-with-libs = inputs'.racket.packages.racket.newLayer {
withRacketPackages = ps:
with ps; [
readline-gpl
(readline-lib.override {
src = "${readlinePatched}/readline-lib";
})
rash
threading
functional
racket-langserver
# TODO: Remove once dependency resolution is fixed
slideshow-lib
r5rs-lib
data-enumerate-lib
plot-lib
plot-gui-lib
plot-compat
srfi-lib
typed-racket-compatibility
future-visualizer-pict
macro-debugger-text-lib
profile-lib
images-gui-lib
];
buildInputs = with pkgs; [readline];
};
in {
basePackage = pkgs.writeShellScriptBin "rash-repl" ''
exec "${racket-with-libs}/bin/rash-repl" "$@"
'';
# TODO: Shell shouldn't overwrite this variable. Probably
env.XDG_CONFIG_HOME = {
value = pkgs.linkFarm "rash-config" {
"rash/rashrc" = ./rashrc;
"rash/rashrc.rkt" = ./rashrc.rkt;
}:
{
wrappers.rash =
let
readlinePatched = pkgs.fetchFromGitHub {
owner = "nrabulinski";
repo = "readline";
rev = "8eb52c163d6ea7c3cec2cc6b1011ce00738942e1";
hash = "sha256-1yU0ZUBQqYEn85j4T2pLs02MTyJnO5BbYALIa88iomY=";
};
force = true;
racket-with-libs = inputs'.racket.packages.racket.newLayer {
withRacketPackages =
ps: with ps; [
readline-gpl
(readline-lib.override { src = "${readlinePatched}/readline-lib"; })
rash
threading
functional
racket-langserver
# TODO: Remove once dependency resolution is fixed
slideshow-lib
r5rs-lib
data-enumerate-lib
plot-lib
plot-gui-lib
plot-compat
srfi-lib
typed-racket-compatibility
future-visualizer-pict
macro-debugger-text-lib
profile-lib
images-gui-lib
];
buildInputs = with pkgs; [ readline ];
};
in
{
basePackage = pkgs.writeShellScriptBin "rash-repl" ''
exec "${racket-with-libs}/bin/rash-repl" "$@"
'';
# TODO: Shell shouldn't overwrite this variable. Probably
env.XDG_CONFIG_HOME = {
value = pkgs.linkFarm "rash-config" {
"rash/rashrc" = ./rashrc;
"rash/rashrc.rkt" = ./rashrc.rkt;
};
force = true;
};
pathAdd = [
racket-with-libs
config.wrappers.starship.wrapped
];
};
pathAdd = [
racket-with-libs
config.wrappers.starship.wrapped
];
};
}

3
wrappers/wezterm/default.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
wrappers.wezterm = {
basePackage = pkgs.wezterm;
env.WEZTERM_CONFIG_FILE.value = ./config.lua;