flora-6: merge main branch #178

Merged
teutat3s merged 12 commits from flora-6/merge-main into infra 2023-03-08 17:32:29 +00:00
12 changed files with 70 additions and 26 deletions

View file

@ -10,6 +10,10 @@
config.services.caddy.configFile config.services.caddy.configFile
]; ];
systemd.tmpfiles.rules = [
"d '/data/srv/www/os/download/' 0750 hakkonaut hakkonaut - -"
];
services.caddy = { services.caddy = {
enable = lib.mkForce true; enable = lib.mkForce true;
group = "hakkonaut"; group = "hakkonaut";
@ -23,7 +27,7 @@
extraConfig = '' extraConfig = ''
# PubSolarOS images # PubSolarOS images
handle /os/download/* { handle /os/download/* {
root * /srv/www root * /data/srv/www
file_server /os/download/* browse file_server /os/download/* browse
} }
# serve base domain pub.solar for mastodon.pub.solar # serve base domain pub.solar for mastodon.pub.solar

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"];

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}"];
}; };
}; };

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

View file

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

View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: let }: let
psCfg = config.pub-solar; psCfg = config.pub-solar;
@ -42,7 +43,8 @@ in {
universal-ctags universal-ctags
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [ ]
++ lib.optionals (!cfg.lite) [
nvim-cmp nvim-cmp
cmp-nvim-lsp cmp-nvim-lsp
cmp_luasnip cmp_luasnip

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;
});
}

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";

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"

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",

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);

View file

@ -84,6 +84,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;