I should commit more frequently

This commit is contained in:
Andrea Ciceri 2023-12-07 23:07:36 +01:00
parent aa8003f5b4
commit e82241b8b0
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
70 changed files with 1091 additions and 2018 deletions

View file

@ -3,28 +3,14 @@
secrets,
...
}: {
# home.packages = with pkgs; [mu];
# programs.mbsync.enable = true;
# programs.msmtp.enable = true;
# programs.notmuch = {
# enable = true;
# hooks = {
# preNew = "mbsync --all";
# };
# };
# services = {
# mbsync = {
# enable = false;
# # FIXME this requires `pass` every 5 minutes that run `pinentry`
# frequency = "*:0/15";
# preExec = "${pkgs.isync}/bin/mbsync -Ha";
# # First time run: mu init --maildir ~/.mail --my-address andrea.ciceri@autistici.org
# # TODO Nixify this
# postExec = "${pkgs.mu}/bin/mu index";
# };
# };
programs.mbsync.enable = true;
programs.msmtp.enable = true;
programs.notmuch = {
enable = true;
hooks.preNew = "mbsync --all";
};
services.mbsync.enable = true;
accounts.email = {
# maildirBasePath = ".mail";
accounts.autistici = {
address = "andrea.ciceri@autistici.org";
gpg = {
@ -35,12 +21,12 @@
host = "mail.autistici.org";
port = 993;
};
# mbsync = {
# enable = true;
# create = "maildir";
# };
# msmtp.enable = true;
# notmuch.enable = true;
mbsync = {
enable = true;
create = "maildir";
};
msmtp.enable = true;
notmuch.enable = true;
primary = true;
realName = "Andrea Ciceri";
signature = {

View file

@ -1,4 +1,8 @@
{pkgs, ...}: {
{
pkgs,
username,
...
}: {
programs.firefox = {
enable = true;
package =
@ -9,19 +13,14 @@
})
.override {
cfg = {
enableTridactylNative = true;
enableBrowserpass = true;
enableFXCastBridge = pkgs.system == "x86_64-linux";
nativeMessagingHosts.packages = [pkgs.trydactyl-native pkgs.fs-cast-bridge];
};
};
profiles.ccr = {
profiles.${username} = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
privacy-badger
ublock-origin
tridactyl
browserpass
# bypass-paywalls-clean
ghosttext # or edit-with-emacs?
];
settings = {
"browser.startup.homepage" = "https://google.it";
@ -31,29 +30,15 @@
"general.useragent.locale" = "it-IT";
"browser.bookmarks.showMobileBookmarks" = true;
"browser.download.folderList" = 2;
"browser.download.lastDir" = "/home/ccr/downloads/";
"browser.download.lastDir" = "/home/${username}/Downloads/";
"browser.shell.checkDefaultBrowser" = false;
};
search.force = true;
search.default = "Google";
search.engines = {
"Searx" = {
urls = [
{
template = "https://search.privatevoid.net/search";
params = [
{
name = "q";
value = "{searchTerms}";
}
];
}
];
};
"Google IT" = {
urls = [
{
template = "https://www.google.it/search";
template = "https://search.aciceri.dev/search";
params = [
{
name = "q";

View file

@ -1,4 +1,8 @@
{age, ...}: {
{
age,
username,
...
}: {
services.git-workspace = {
enable = true;
frequency = "04:00:00";
@ -9,7 +13,7 @@
{
provider = "github";
name = "aciceri";
path = "/home/ccr/projects";
path = "/home/${username}/projects";
skips_forks = false;
}
];
@ -19,7 +23,7 @@
{
provider = "github";
name = "mlabs-haskell";
path = "/home/ccr/projects";
path = "/home/${username}/projects";
skip_forks = false;
}
];
@ -29,7 +33,7 @@
{
provider = "github";
name = "EthereansOS";
path = "/home/ccr/projects";
path = "/home/${username}/projects";
skip_forks = false;
}
];

View file

@ -1,4 +1,8 @@
{pkgs, ...}: let
{
pkgs,
username,
...
}: let
config = {
name = "Andrea Ciceri";
email = "andrea.ciceri@autistici.org";
@ -15,7 +19,7 @@ in {
rebase.autostash = true;
github.user = "aciceri";
user.signingKey = "/home/ccr/.ssh/id_rsa";
user.signingKey = "/home/${username}/.ssh/id_rsa";
gpg.format = "ssh";
commit.gpgsign = true;
@ -24,14 +28,10 @@ in {
userName = config.name;
userEmail = config.email;
# signing = {
# signByDefault = true;
# key = config.email;
# };
extraConfig.url = {
"ssh://git@github.com/".insteadOf = "https://github.com/";
# Workaround: https://github.com/rust-lang/cargo/issues/3381#issuecomment-1193730972
# Workaround for https://github.com/rust-lang/cargo/issues/3381#issuecomment-1193730972
"https://github.com/rust-lang/crates.io-index".insteadOf = "https://github.com/rust-lang/crates.io-index";
"https://github.com/RustSec/advisory-db".insteadOf = "https://github.com/RustSec/advisory-db";
};
@ -53,6 +53,4 @@ in {
diff-so-fancy.enable = false;
};
home.packages = with pkgs; [delta];
}

View file

@ -1,8 +1,4 @@
{
config,
lib,
...
}: {
programs.helix = {
enable = true;
settings = {
@ -18,6 +14,4 @@
};
};
};
# home.sessionVariables.EDITOR = lib.mkForce "${config.programs.helix.package}/bin/helix";
# programs.nushell.environmentVariables.EDITOR = lib.mkForce config.home.sessionVariables.EDITOR;
}

View file

@ -88,9 +88,7 @@ in {
}
}
monitor = DP-2, 2560x1440, 1200x320, 1
monitor = eDP-1, 1920x1080, 3760x230, 1
# monitor = DP-1, 1920x1080, 0x0, 1, mirror, eDP-1
monitor = HDMI-A-1, 2560x1440, 0x0, 1
bindl=,switch:off:Lid Switch,exec,${switchMonitorScript} open
bindl=,switch:on:Lid Switch,exec,${switchMonitorScript} close

View file

@ -6,5 +6,6 @@ in {
wallpaper = eDP-1,${wallpaper}
wallpaper = DP-1,${wallpaper}
wallpaper = DP-2,${wallpaper}
wallpaper = HDMI-A-1,${wallpaper}
'';
}

View file

@ -1,15 +1,13 @@
{
config,
lib,
pkgs,
username,
...
}: {
programs.password-store = {
enable = true;
settings = {
PASSWORD_STORE_DIR = "/home/ccr/.password-store";
PASSWORD_STORE_DIR = "/home/${username}/.password-store";
};
package = pkgs.pass.withExtensions (e: with e; [pass-otp]);
package = pkgs.pass.withExtensions (e: [e.pass-otp]);
};
services.password-store-sync.enable = false; # FIXME this requires `pass` every 5 minutes that run `pinentry`
}

View file

@ -119,7 +119,6 @@
'';
shellAliases = {
"cat" = "bat";
"em" = "TERM=wezterm emacsclient -nw";
};
};

View file

@ -3,6 +3,7 @@
enable = true;
extraConfig = ''
return {
enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483
font = wezterm.font_with_fallback {
{
family = 'Iosevka Comfy',

View file

@ -1,23 +1,6 @@
{pkgs, ...}: {
home.packages = with pkgs; [
# ...
# support both 32- and 64-bit applications
# wineWowPackages.stable
# support 32-bit only
# wine
# support 64-bit only
# (wine.override { wineBuild = "wine64"; })
# wine-staging (version with experimental features)
# wineWowPackages.staging
# winetricks (all versions)
winetricks
# native wayland support (unstable)
wineWowPackages.waylandFull
];
}