Extreme cleaup + new nix rice + commit hooks

This commit is contained in:
Filippo Berto 2022-06-02 20:16:20 +02:00
parent bc28d964d3
commit c9eeeb9dc4
59 changed files with 319 additions and 400 deletions

View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }:
{ pkgs, ... }:
let
strPalette = with pkgs.rice; palette.toRgbHex rec {
strPalette = with pkgs.rice; pkgs.lib.rice.palette.toRgbHex rec {
inherit (colorPalette) normal bright;
dim = colorPalette.dark;

View file

@ -1,4 +1,3 @@
{ pkgs, ... }:
{
programs.autorandr = {
enable = true;

View file

@ -1,12 +1,13 @@
{ pkgs, lib, ... }:
{ pkgs, ... }:
let
tomlGenerate = (pkgs.formats.toml {}).generate "bottom-toml";
in {
home.packages = with pkgs; [ bottom ];
xdg.configFile."bottom/bottom.toml".source = tomlGenerate {
"flags" = {
"left_legend" = true;
"color" = "nord";
};
};
tomlGenerate = (pkgs.formats.toml { }).generate "bottom-toml";
in
{
home.packages = with pkgs; [ bottom ];
xdg.configFile."bottom/bottom.toml".source = tomlGenerate {
"flags" = {
"left_legend" = true;
"color" = "nord";
};
};
}

View file

@ -1,7 +1,7 @@
{
programs.broot = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
programs.broot = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
}

View file

@ -3,7 +3,7 @@
let
monitorPages = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" ];
monitorPagesString = lib.strings.concatStringsSep " " monitorPages;
strPalette = pkgs.rice.palette.toRGBHex pkgs.rice.colorPalette;
strPalette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette;
xrandr = "${pkgs.xorg.xrandr}/bin/xrandr";
xsetroot = "${pkgs.xorg.xsetroot}/bin/xsetroot";
in

View file

@ -1,7 +1,7 @@
{
programs.dircolors = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
programs.dircolors = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
}

View file

@ -1,9 +1,6 @@
{ pkgs, ... }:
let
rofi_dmenu = "${pkgs.rofi} -dmenu";
firefox = "${pkgs.firefox}/bin/firefox";
dmenu = "${pkgs.dmenu}/bin/dmenu";
palette = pkgs.rice.palette.toRGBHex pkgs.rice.colorPalette;
palette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette;
in
{
home.packages = with pkgs; [ dunst rice.font.normal.package ];
@ -47,8 +44,8 @@ in
max_icon_size = 32;
sticky_history = "yes";
history_length = 20;
dmenu = "${dmenu} -p dunst:";
browser = "${firefox} -new-tab";
dmenu = "dmenu -p dunst:";
browser = "google-chrome-stable";
always_run_script = "true";
title = "Dunst";
class = "Dunst";

View file

@ -1,8 +1,8 @@
{
programs.fzf = {
enable = true;
tmux.enableShellIntegration = true;
enableBashIntegration = true;
enableZshIntegration = true;
enable = true;
tmux.enableShellIntegration = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
}

View file

@ -1,7 +1,5 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }:
let
kak = "${pkgs.kakoune}/bin/kak";
meld = "${pkgs.meld}/bin/meld";
shellAliases = {
"g" = "git";
"ga" = "git add";
@ -101,9 +99,9 @@ in
commit.gpgSign = true;
# core.editor = kak;
credential.helper = "cache --timeout=3600 ";
diff.guitool = meld;
diff.guitool = "meld";
init.defaultBranch = "main";
merge.guitool = meld;
merge.guitool = "meld";
pull.rebase = true;
rebase.autoStash = true;
user.signingKey = "berto.f@protonmail.com";
@ -117,5 +115,6 @@ in
gh
git-secret
glab
meld
];
}

View file

@ -1,14 +1,12 @@
{
programs.gpg = {
enable = true;
settings = {
programs.gpg = {
enable = true;
settings = { };
};
};
};
services.gpg-agent = {
enable = true;
defaultCacheTtl = 600;
# extraConfig = "allow-loopback-pinentry";
};
services.gpg-agent = {
enable = true;
defaultCacheTtl = 600;
# extraConfig = "allow-loopback-pinentry";
};
}

View file

@ -1,4 +1,3 @@
{ config, lib, pkgs, ... }:
{
services.grobi = {
enable = true;

View file

@ -23,10 +23,10 @@
editor.lsp.display-messages = true;
editor.scrolloff = 5;
editor.true-color = true;
editor.mouse = false;
};
themes =
let
strPalette = with pkgs.rice; palette.toRgbShortHex coloPalette;
transparent = "none";
gray = "#665c54";
dark-gray = "#3c3836";

View file

@ -1,3 +1,3 @@
{ pkgs, ...}:
{ programs.java.enable = true;
{
programs.java.enable = true;
}

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, ... }:
let
joystickwakeCmd = "${pkgs.joystickwake}/bin/joystickwake";
in

View file

@ -1,6 +1,5 @@
{ config, lib, pkgs, ... }:
{ pkgs, ... }:
let
strPalette = with pkgs.rice; palette.toRgbShortHex colorPalette;
themeBuilder = palette: with palette; ''
set-face global value rgb:${normal.magenta},default
set-face global type rgb:${bright.white},default
@ -132,36 +131,9 @@ in
};
# THEME FILE
xdg.configFile."kak/colors/nord.kak".text = with strPalette; ''
set-face global value rgb:${normal.magenta},default
set-face global type rgb:${bright.white},default
set-face global identifier rgb:${normal.cyan},default
set-face global string rgb:${normal.green},default
set-face global error rgb:${normal.red},default
set-face global keyword rgb:${normal.blue},default
set-face global operator rgb:${normal.blue},default
set-face global attribute rgb:${bright.blue},default
set-face global comment rgb:${bright.blue},default
set-face global meta rgb:${normal.yellow},default
set-face global Default rgb:${normal.white},default
set-face global PrimarySelection rgb:${normal.black},rgb:${dark.yellow}
set-face global SecondarySelection rgb:${normal.black},rgb:${dark.white}
set-face global PrimaryCursor rgb:${normal.black},rgb:${normal.yellow}
set-face global SecondaryCursor rgb:${normal.black},rgb:${normal.white}
set-face global MenuForeground rgb:${normal.white},rgb:${bright.black}
set-face global MenuBackground default,rgb:${normal.black}
set-face global MenuInfo default,rgb:${normal.black}
set-face global Information rgb:${dark.black},rgb:${normal.cyan}
set-face global StatusLine rgb:${normal.white},rgb:${normal.black}
set-face global StatusLineMode rgb:${normal.blue},rgb:${normal.black}
set-face global StatusLineInfo rgb:${normal.blue},rgb:${normal.black}
set-face global StatusLineValue rgb:${normal.blue},rgb:${normal.black}
set-face global StatusCursor rgb:${dark.black},rgb:${normal.yellow}
set-face global Prompt rgb:${normal.cyan},rgb:${normal.black}
set-face global BufferPadding default,default
'';
xdg.configFile."kak/colors/nord.kak".text = themeBuilder (pkgs.lib.rice.palette.toRgbShortHex pkgs.rice.colorPalette);
xdg.configFile."kak-lsp/kak-lsp.toml".text = with pkgs; ''
xdg.configFile."kak-lsp/kak-lsp.toml".text = ''
snippet_support = false
verbosity = 2
[server]

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
config.systemd.user.services.keepassxc = {
Unit = {

View file

@ -1,5 +1,5 @@
{ pkgs, lib, ... }:
let strPalette = with pkgs.rice; palette.toRgbHex rec {
{ pkgs, ... }:
let strPalette = with pkgs.rice; pkgs.lib.rice.palette.toRgbHex rec {
foreground = colorPalette.normal.white;
background = colorPalette.normal.black;
color0 = colorPalette.normal.black;

View file

@ -1,4 +1,4 @@
{ pkgs, lib, ...}:
{ pkgs, ... }:
{
home.packages = with pkgs; [
tex2nix

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, ... }:
let
libinputGesturesCmd = "${pkgs.libinput-gestures}/bin/libinput-gestures";
xdotool = "${pkgs.xdotool}/bin/xdotool";

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, ... }:
let
megasyncCmd = "${pkgs.megacmd}/bin/mega-cmd-server";
in

View file

@ -20,7 +20,7 @@
timers."nix-index" = {
Unit.Description = "Daily update the nix-locate database";
Timer = { OnCalendar = "daily"; Persistent = true; Unit = "nix-index.service";};
Timer = { OnCalendar = "daily"; Persistent = true; Unit = "nix-index.service"; };
Install.WantedBy = [ "timers.target" ];
};
};

View file

@ -1,11 +1,10 @@
{pkgs, lib,...}:
with pkgs;
{ pkgs, ... }:
{
home.packages = [
# libreoffice-fresh
onlyoffice-bin
hunspellDicts.en_GB-large
hunspellDicts.en_US-large
hunspellDicts.it_IT
home.packages = with pkgs; [
# libreoffice-fresh
onlyoffice-bin
hunspellDicts.en_GB-large
hunspellDicts.en_US-large
hunspellDicts.it_IT
];
}

View file

@ -1,4 +1,3 @@
{ pkgs, ... }:
{
services.picom = {
enable = true;

View file

@ -1,5 +1,6 @@
{ config, lib, pkgs, ... }:
{ config, pkgs, ... }:
let
inherit (pkgs.rice) colorPalette;
grep = "${pkgs.gnugrep}/bin/grep";
cut = "${pkgs.coreutils}/bin/cut";
head = "${pkgs.coreutils}/bin/head";
@ -8,8 +9,6 @@ let
pkill = "${pkgs.procps}/bin/pkill";
playerCtl = "${pkgs.playerctl}/bin/playerctl";
playerStatus = "${playerCtl} -f '{{emoji(status)}} {{title}} - {{artist}}' metadata | ${head} -c 60";
alacritty = "${pkgs.alacritty}/bin/alacritty";
btm = "${pkgs.bottom}/bin/btm";
systemctl = "${pkgs.systemd}/bin/systemctl";
loginctl = "${pkgs.systemd}/bin/loginctl";
shutdown = "${pkgs.systemd}/bin/shutdown";
@ -17,7 +16,7 @@ let
session=`${loginctl} session-status | ${pkgs.coreutils}/bin/head -n 1 | ${pkgs.gawk}/bin/awk '{print $1}'`
${loginctl} terminate-session $session
'';
colors = with pkgs.rice; palette.toARGBHex rec {
colors = with pkgs.lib.rice; palette.toARGBHex rec {
normal = {
foreground = colorPalette.normal.white;

View file

@ -14,7 +14,8 @@ in
carla
rnnoise
ardour
unstable.zrythm unstable.breeze-icons
unstable.zrythm
unstable.breeze-icons
mixxx
# Plugins
@ -24,7 +25,7 @@ in
unstable.cardinal
geonkick
helm
(lsp-plugins.overrideAttrs (old: { version = "1.2.0"; }))
lsp-plugins
# noise-repellent
samplv1
# speech-denoiser

View file

@ -12,10 +12,10 @@
xdg.configFile."rofi/config.rasi".text = ''
configuration {
font: "${pkgs.rice.font.monospace.name} 12";
location: 0;
yoffset: 0;
xoffset: 0;
modi: "drun,run,ssh,window";
location: 0;
yoffset: 0;
xoffset: 0;
modi: "drun,run,ssh,window";
}
@theme "onedark"

View file

@ -1,6 +1,5 @@
{ pkgs, ... }:
let
shellAliases = {
{
home.shellAliases = {
"dkc" = "docker-compose";
"dk" = "docker";
"hm" = "home-manager";
@ -13,9 +12,6 @@ let
"sc" = "sudo systemctl";
"scu" = "systemctl --user";
};
in
{
home = { inherit shellAliases; };
# programs.bash = { inherit shellAliases; };
# programs.zsh = { inherit shellAliases; };
}

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }:
{
imports = [ ./thunar.nix ];
home.packages = with pkgs; [

View file

@ -1,7 +1,7 @@
{ pkgs, ... }:
let
strPalette = with pkgs.rice; palette.toRgbHex rec {
inherit (colorPalette) normal bright dark;
strPalette = pkgs.lib.rice.palette.toRgbHex rec {
inherit (pkgs.rice.colorPalette) normal bright dark;
background = normal.black;
foreground = normal.white;
};

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, ... }:
let
update_time = "10m";
in

View file

@ -3,13 +3,13 @@
let
cmd = link: "google-chrome-stable --app=${link}";
links = [
{ desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Office" ]; }
{ desktopName = "Google Keep"; link = "https://keep.google.com"; categories = [ "Office" ]; }
{ desktopName = "Monkeytype"; link = "https://monkeytype.com/"; }
{ desktopName = "Netflix"; link = "https://www.netflix.com"; categories = [ "AudioVideo" ]; }
{ desktopName = "Notion"; link = "https://notion.so"; categories = [ "Office" ]; }
{ desktopName = "Prime Video"; link = "https://primevideo.com"; categories = [ "AudioVideo" ]; }
{ desktopName = "Protonmail"; link = "https://mail.protonmail.com"; categories = [ "Office" ]; }
{ desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Office" ]; }
{ desktopName = "Google Keep"; link = "https://keep.google.com"; categories = [ "Office" ]; }
{ desktopName = "Monkeytype"; link = "https://monkeytype.com/"; }
{ desktopName = "Netflix"; link = "https://www.netflix.com"; categories = [ "AudioVideo" ]; }
{ desktopName = "Notion"; link = "https://notion.so"; categories = [ "Office" ]; }
{ desktopName = "Prime Video"; link = "https://primevideo.com"; categories = [ "AudioVideo" ]; }
{ desktopName = "Protonmail"; link = "https://mail.protonmail.com"; categories = [ "Office" ]; }
{ desktopName = "Twitch"; link = "https://www.twitch.tv"; categories = [ "AudioVideo" ]; }
{ desktopName = "WhatsApp"; link = "https://web.whatsapp.com/"; }
{ desktopName = "YouTube"; link = "https://www.youtube.com"; categories = [ "AudioVideo" ]; }

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
let
strPalette = with pkgs.rice; palette.toRgbHex colorPalette;
strPalette = pkgs.lib.rice.palette.toRgbHex pkgs.rice.colorPalette;
in
{
programs.zathura = {

View file

@ -1,7 +1,4 @@
{ pkgs, ... }:
let
zoxideCmd = "zoxide";
in {
{
programs.zoxide = {
enable = true;
enableBashIntegration = true;