Merge branch 'main' into teutat3s

This commit is contained in:
teutat3s 2023-07-02 03:05:30 +02:00
commit 52e2fcff26
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
6 changed files with 31 additions and 21 deletions

View file

@ -69,7 +69,7 @@
allowUnfree = true;
};
supportedSystems = ["x86_64-linux" "aarch64-linux"];
supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
channels = {
nixos = {

View file

@ -3,7 +3,6 @@
config,
pkgs,
self,
inputs,
...
}:
with lib; let
@ -63,7 +62,6 @@ in {
inherit config;
inherit pkgs;
inherit self;
inherit inputs;
};
programs.fzf = import ./fzf {
inherit config;

View file

@ -1,20 +1,20 @@
{
format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#F85E84 bg:black))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
format = "$username$hostname$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#F85E84 bg:#000000))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
# Disable the blank line at the start of the prompt
add_newline = false;
# You can also replace your username with a neat symbol like  to save some space
username = {
show_always = true;
style_user = "bg:#9A348E";
style_root = "bg:#9A348E";
style_user = "bg:#000000 fg:#F85E84";
style_root = "bg:#F85E84 fg:#000000";
format = ''[$user ]($style)'';
};
hostname = {
ssh_only = false;
format = "@[$ssh_symbol$hostname]($style)";
disabled = false;
ssh_symbol = "";
trim_at = "";
style = "bg:#000000 fg:#F85E84";
};
character = {

View file

@ -1,15 +1,7 @@
final: prev: {
blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
#inherit (prev.sources.blesh-nvfetcher) version src;
version = "0.4.0-devel4";
src = prev.fetchFromGitHub {
owner = "akinomyoga";
repo = "ble.sh";
rev = "f16c0d807c8e1fe26fa5d990b561829382cbdc72";
hash = "sha256-+tcM1z9uD7WXA7CfHmTbcPRcZfmXZ+Y7y6Bj4QA3f+4=";
fetchSubmodules = true;
leaveDotGit = true;
};
inherit (prev.sources.blesh-nvfetcher) version src;
dontBuild = false;
buildInputs = [prev.git];
patchPhase = ''

View file

@ -1,6 +1,20 @@
# This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{
blesh-nvfetcher = {
pname = "blesh-nvfetcher";
version = "1afc616b890e487926897e5b3e3a33e0ad833cb3";
src = fetchFromGitHub {
owner = "akinomyoga";
repo = "ble.sh";
rev = "1afc616b890e487926897e5b3e3a33e0ad833cb3";
fetchSubmodules = true;
deepClone = false;
leaveDotGit = true;
sha256 = "sha256-gDxx7nDleS2HWIJWc208gcTzuRUEu/JCyepTuOJDAGo=";
};
date = "2023-06-29";
};
instant-nvim-nvfetcher = {
pname = "instant-nvim-nvfetcher";
version = "294b6d08143b3db8f9db7f606829270149e1a786";

View file

@ -34,3 +34,9 @@ fetch.github = "zeekay/vim-beautify"
[vim-apprentice-nvfetcher]
src.git = "https://github.com/romainl/Apprentice"
fetch.github = "romainl/Apprentice"
[blesh-nvfetcher]
src.git = "https://github.com/akinomyoga/ble.sh"
fetch.github = "akinomyoga/ble.sh"
git.fetchSubmodules = true
git.leaveDotGit = true