b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' into b12f

Browse source
This commit is contained in:
Benjamin Bädorf 2023-04-03 11:46:57 +02:00
parent 1918a3fd6e fd7f326376
commit dcb77f9056
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
15 changed files with 148 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.drone.yml
View file

@ -111,9 +111,8 @@ steps:
- nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256 - nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
- name: "Publish ISO" - name: "Publish ISO"
# custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/ # https://github.com/appleboy/drone-scp/pull/141 got merged, yay
# docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 . image: appleboy/drone-scp:1.6.5-linux-amd64
image: registry.greenbaum.cloud/library/drone-scp:v1.6.5
volumes: volumes:
- name: file-exchange - name: file-exchange
path: /var/nix/iso-cache path: /var/nix/iso-cache
@ -126,7 +125,7 @@ steps:
from_secret: iso_web_ssh_port from_secret: iso_web_ssh_port
key: key:
from_secret: iso_web_ssh_key from_secret: iso_web_ssh_key
target: /srv/www/os/download target: /data/srv/www/os/download
source: source:
- /var/nix/iso-cache/*.iso - /var/nix/iso-cache/*.iso
- /var/nix/iso-cache/*.iso.sha256 - /var/nix/iso-cache/*.iso.sha256
@ -148,6 +147,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 0c0994f0878cdb49172772f78c9a772f5c75830b49c1c22bd15db385fe857e17 hmac: 6aee0ffe22111bb629c0a79940bfbc3fa75f68c5ed5c4bba68abf6797b87a7ab
... ...

73
flake.lock
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677126346, "lastModified": 1680281360,
"narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=", "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "c2a71c83c70844c5e31db69347e86af080bcdad0", "rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673295039, "lastModified": 1680266963,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "rev": "99d4187d11be86b49baa3a1aec0530004072374f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1676257154, "lastModified": 1679738842,
"narHash": "sha256-eW3jymNLpdxS5fkp9NWKyNtgL0Gqtgg1vCTofKXDF1g=", "narHash": "sha256-CvqRbsyDW756EskojZptDU590rez29RcHDV3ezoze08=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2cb27c79117a2a75ff3416c3199a2dc57af6a527", "rev": "83110c259889230b324bb2d35bef78bf5f214a1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1677063315, "lastModified": 1680213900,
"narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "988cc958c57ce4350ec248d2d53087777f9e1949", "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,11 +356,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1677244726, "lastModified": 1680514745,
"narHash": "sha256-lwzie+EgYjPianeH82eb0mEDPOmOcXqlOR5lBZ7dkkM=", "narHash": "sha256-5RUDdGhHxKKgHzzroHXuQkEu5S0lNxWyvxyzK6PHCCg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "566169a4eaca1513d4fd396c239367b869fcdb0c", "rev": "d846d8e2ec0461a141c01087d304502ddb341664",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,11 +372,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1636849918, "lastModified": 1679187309,
"narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=", "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5", "rev": "44214417fe4595438b31bdb9469be92536a61455",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1677075010, "lastModified": 1680334310,
"narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", "narHash": "sha256-ISWz16oGxBhF7wqAxefMPwFag6SlsA9up8muV79V9ck=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", "rev": "884e3b68be02ff9d61a042bc9bd9dd2a358f95da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,11 +407,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1676297861, "lastModified": 1679464055,
"narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=", "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "1e0a05219f2a557d4622bc38f542abb360518795", "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,11 +422,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1677232326, "lastModified": 1680070330,
"narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=", "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2", "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -437,11 +437,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1637186689, "lastModified": 1679198465,
"narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=", "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c", "rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,18 +499,6 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"locked": {
"lastModified": 0,
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
"path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
"type": "path"
},
"original": {
"id": "nur",
"type": "indirect"
}
},
"pub-solar": { "pub-solar": {
"locked": { "locked": {
"lastModified": 1654372286, "lastModified": 1654372286,
@ -540,7 +528,6 @@
"nixos": "nixos", "nixos": "nixos",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur",
"pub-solar": "pub-solar", "pub-solar": "pub-solar",
"scan2paperless": "scan2paperless" "scan2paperless": "scan2paperless"
} }

2
flake.nix
View file

@ -50,7 +50,6 @@
nixos, nixos,
home, home,
nixos-hardware, nixos-hardware,
nur,
agenix, agenix,
deploy, deploy,
scan2paperless, scan2paperless,
@ -83,7 +82,6 @@
our = self.lib; our = self.lib;
}); });
}) })
nur.overlay
agenix.overlays.default agenix.overlays.default
(import ./pkgs) (import ./pkgs)

4
modules/core/boot.nix
View file

@ -33,10 +33,10 @@ in {
}; };
}; };
loader.systemd-boot.enable = true; loader.systemd-boot.enable = lib.mkDefault true;
# Use latest LTS linux kernel by default # Use latest LTS linux kernel by default
kernelPackages = pkgs.linuxPackages_5_15; kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15;
# Support ntfs drives # Support ntfs drives
supportedFilesystems = ["ntfs"]; supportedFilesystems = ["ntfs"];

6
modules/core/hibernation.nix
View file

@ -15,8 +15,8 @@ in {
}; };
resumeDevice = mkOption { resumeDevice = mkOption {
type = types.str; type = types.nullOr types.str;
default = "/dev/sda1"; default = null;
description = "The location of the hibernation resume swap file."; description = "The location of the hibernation resume swap file.";
}; };
@ -29,7 +29,7 @@ in {
config = { config = {
boot = mkIf cfg.enable { boot = mkIf cfg.enable {
resumeDevice = cfg.resumeDevice; resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"]; kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
}; };
}; };

2
modules/core/services.nix
View file

@ -10,7 +10,7 @@
# If you don't want the host to have SSH actually opened up to the net, # If you don't want the host to have SSH actually opened up to the net,
# set `services.openssh.openFirewall` to false in your config. # set `services.openssh.openFirewall` to false in your config.
openFirewall = lib.mkDefault true; openFirewall = lib.mkDefault true;
passwordAuthentication = false; passwordAuthentication = lib.mkDefault false;
}; };
# Service that makes Out of Memory Killer more effective # Service that makes Out of Memory Killer more effective

1
modules/terminal-life/default.nix
View file

@ -58,6 +58,7 @@ in {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit self; inherit self;
inherit lib;
}; };
programs.fzf = import ./fzf { programs.fzf = import ./fzf {
inherit config; inherit config;

99
modules/terminal-life/nvim/default.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: let }: let
psCfg = config.pub-solar; psCfg = config.pub-solar;
@ -42,63 +43,65 @@ in {
universal-ctags universal-ctags
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins;
nvim-cmp []
cmp-nvim-lsp ++ lib.optionals (!cfg.lite) [
cmp_luasnip nvim-cmp
luasnip cmp-nvim-lsp
cmp_luasnip
luasnip
lsp_extensions-nvim lsp_extensions-nvim
nvim-lspconfig nvim-lspconfig
instant-nvim-nvfetcher instant-nvim-nvfetcher
ack-vim ack-vim
vim-airline vim-airline
editorconfig-vim editorconfig-vim
nnn-vim nnn-vim
quick-scope quick-scope
suda-vim suda-vim
syntastic syntastic
vim-vinegar vim-vinegar
vim-workspace-nvfetcher vim-workspace-nvfetcher
sonokai sonokai
vim-hybrid-material vim-hybrid-material
vim-airline-themes vim-airline-themes
vim-apprentice-nvfetcher vim-apprentice-nvfetcher
fugitive fugitive
vim-gitgutter vim-gitgutter
vim-rhubarb vim-rhubarb
vimagit-nvfetcher vimagit-nvfetcher
fzf-vim fzf-vim
fzfWrapper fzfWrapper
vim-highlightedyank vim-highlightedyank
vim-beautify-nvfetcher vim-beautify-nvfetcher
vim-surround vim-surround
vim-bufkill vim-bufkill
vim-sensible vim-sensible
ansible-vim ansible-vim
emmet-vim emmet-vim
rust-vim rust-vim
vim-caddyfile-nvfetcher vim-caddyfile-nvfetcher
vim-go vim-go
vim-javascript vim-javascript
vim-json vim-json
SchemaStore-nvim SchemaStore-nvim
vim-markdown vim-markdown
vim-nix vim-nix
vim-nixhash vim-nixhash
vim-ruby vim-ruby
vim-toml vim-toml
vim-vue vim-vue
yats-vim yats-vim
]; ];
extraConfig = builtins.concatStringsSep "\n" [ extraConfig = builtins.concatStringsSep "\n" [
'' ''

2
modules/terminal-life/nvim/preview-file.nix
View file

@ -31,6 +31,6 @@ with self; ''
--style="''${BAT_STYLE:-numbers}" \ --style="''${BAT_STYLE:-numbers}" \
--color=always \ --color=always \
--pager=never \ --pager=never \
--file-name=''$FILE \ --file-name="''$FILE" \
--highlight-line=$CENTER --highlight-line=$CENTER
'' ''

5
overlays/waybar.nix Normal file
View file

@ -0,0 +1,5 @@
channels: final: prev: {
waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
inherit (prev.sources.waybar-nvfetcher) version src;
});
}

41
pkgs/_sources/generated.nix
View file

@ -6,13 +6,13 @@
}: { }: {
F-Sy-H = { F-Sy-H = {
pname = "F-Sy-H"; pname = "F-Sy-H";
version = "b935a87a75560f8173dd78deee6717c59d464e06"; version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "z-shell"; owner = "z-shell";
repo = "F-Sy-H"; repo = "F-Sy-H";
rev = "b935a87a75560f8173dd78deee6717c59d464e06"; rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM="; sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
}; };
}; };
instant-nvim-nvfetcher = { instant-nvim-nvfetcher = {
@ -39,46 +39,46 @@
}; };
ohmyzsh = { ohmyzsh = {
pname = "ohmyzsh"; pname = "ohmyzsh";
version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; version = "b602e0a066d8c98e8c02201ad16c764447fd8531";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ohmyzsh"; owner = "ohmyzsh";
repo = "ohmyzsh"; repo = "ohmyzsh";
rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; rev = "b602e0a066d8c98e8c02201ad16c764447fd8531";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw="; sha256 = "sha256-O4thanOQpX/DHPdfW2p/RUXzIPj6GUp9EnKJfkh7yQM=";
}; };
}; };
powerlevel10k = { powerlevel10k = {
pname = "powerlevel10k"; pname = "powerlevel10k";
version = "8091c8a3a8a845c70046684235a01cd500075def"; version = "a30145b0f82d06770e924e9eac064ed223a94e6b";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romkatv"; owner = "romkatv";
repo = "powerlevel10k"; repo = "powerlevel10k";
rev = "8091c8a3a8a845c70046684235a01cd500075def"; rev = "a30145b0f82d06770e924e9eac064ed223a94e6b";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo="; sha256 = "sha256-jnZXLrywUrJgTX1tFpoNH94r/jcGl2P6R7DoedluHxQ=";
}; };
}; };
rnix-lsp-nvfetcher = { rnix-lsp-nvfetcher = {
pname = "rnix-lsp-nvfetcher"; pname = "rnix-lsp-nvfetcher";
version = "6925256babec4307479a4080b44f2be38056f210"; version = "95d40673fe43642e2e1144341e86d0036abd95d9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "rnix-lsp"; repo = "rnix-lsp";
rev = "6925256babec4307479a4080b44f2be38056f210"; rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q="; sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
}; };
}; };
vim-apprentice-nvfetcher = { vim-apprentice-nvfetcher = {
pname = "vim-apprentice-nvfetcher"; pname = "vim-apprentice-nvfetcher";
version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; version = "59ad13661fa15edaf72c62218903c7817b5a3691";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romainl"; owner = "romainl";
repo = "Apprentice"; repo = "Apprentice";
rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; rev = "59ad13661fa15edaf72c62218903c7817b5a3691";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo="; sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
}; };
}; };
vim-beautify-nvfetcher = { vim-beautify-nvfetcher = {
@ -125,6 +125,17 @@
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
}; };
}; };
waybar-nvfetcher = {
pname = "waybar-nvfetcher";
version = "09142fa322e080474de0f2dc3ea98036846550df";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = "09142fa322e080474de0f2dc3ea98036846550df";
fetchSubmodules = false;
sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
};
};
zsh-nix-shell = { zsh-nix-shell = {
pname = "zsh-nix-shell"; pname = "zsh-nix-shell";
version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08"; version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";

4
pkgs/sources.toml
View file

@ -46,3 +46,7 @@ fetch.github = "zeekay/vim-beautify"
[vim-apprentice-nvfetcher] [vim-apprentice-nvfetcher]
src.git = "https://github.com/romainl/Apprentice" src.git = "https://github.com/romainl/Apprentice"
fetch.github = "romainl/Apprentice" fetch.github = "romainl/Apprentice"
[waybar-nvfetcher]
src.git = "https://github.com/Alexays/Waybar"
fetch.github = "Alexays/Waybar"

18
profiles/base-user/.config/waybar/config
View file

@ -26,8 +26,22 @@
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<tt><small>{calendar}</small></tt>",
"format-alt": "{:%a %d. %h %H:%M}" "format-alt": "{:%a %d. %h %H:%M}",
//"on-scroll": {
// "calendar": 1
//}
"calendar": {
"mode-mon-col" : 3,
"on-scroll": -1,
"on-click-right": "mode",
"format": {
"months": "<span color='#ffead3'><b>{}</b></span>",
"days": "<span color='#ecc6d9'><b>{}</b></span>",
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
},
},
}, },
"backlight": { "backlight": {
// "device": "acpi_video1", // "device": "acpi_video1",

2
profiles/base-user/.config/waybar/style.css
View file

@ -6,7 +6,7 @@
} }
window#waybar { window#waybar {
font-family: Hack; font-family: Hack, FontAwesome;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
background: rgba(11, 12, 13, 0.90); background: rgba(11, 12, 13, 0.90);

3
profiles/base-user/session-variables.nix
View file

@ -83,6 +83,9 @@
# TELEMETRY BS # TELEMETRY BS
VUEDX_TELEMETRY = "off"; VUEDX_TELEMETRY = "off";
# FZF shell history widget default colors
FZF_DEFAULT_OPTS = "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
}; };
envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables; envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;