From e0b1517200525bce6dfb6789d14fab1d4ed897df Mon Sep 17 00:00:00 2001 From: fwastring Date: Sun, 8 Jun 2025 11:07:24 +0200 Subject: [PATCH] added lots of nice packages --- config/base.nix | 2 +- config/dev.nix | 11 +++++++--- config/programs.nix | 14 ++++++++++++- config/system.nix | 17 ++++++++++++--- config/users.nix | 2 ++ shared/aerc.nix | 50 +++++++++++++++++++++++---------------------- shared/dwm.nix | 2 +- 7 files changed, 65 insertions(+), 33 deletions(-) diff --git a/config/base.nix b/config/base.nix index 243c005..54822e5 100644 --- a/config/base.nix +++ b/config/base.nix @@ -123,7 +123,7 @@ (st.overrideAttrs (oldAttrs: rec { src = builtins.fetchGit { url = "https://github.com/fwastring/st"; - rev = "de286ce570c23e037a0e5fb7d84ac7226aef1259"; + rev = "0ce5cc9c342d02668b25b83099feb95bfc865b47"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config]; })) diff --git a/config/dev.nix b/config/dev.nix index fc352bf..f62ccec 100644 --- a/config/dev.nix +++ b/config/dev.nix @@ -1,5 +1,3 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { inputs, lib, @@ -7,7 +5,13 @@ pkgs, myhostname, ... -}: { +}: +let + go-migrate-pg = pkgs.go-migrate.overrideAttrs(oldAttrs: { + tags = ["postgres"]; + }); +in +{ environment.systemPackages = with pkgs; [ timewarrior @@ -19,6 +23,7 @@ sqlc postgresql + go-migrate-pg argocd gh ngrok diff --git a/config/programs.nix b/config/programs.nix index 5583b38..c85a905 100644 --- a/config/programs.nix +++ b/config/programs.nix @@ -8,6 +8,15 @@ myhostname, ... }: { + services.udev = { + extraRules = '' + KERNEL=="ttyACM0", MODE:="666" + ''; + packages = with pkgs; [ + vial + via + ]; + }; environment.systemPackages = with pkgs; [ unstable.feishin @@ -16,7 +25,6 @@ unstable.signal-desktop pinta zathura - vial thunderbird lazygit byzanz @@ -32,5 +40,9 @@ pandoc texliveFull mpv + qutebrowser + bitwarden-cli + rofi + bitwarden-menu ]; } diff --git a/config/system.nix b/config/system.nix index 9cfac52..730a842 100644 --- a/config/system.nix +++ b/config/system.nix @@ -9,22 +9,28 @@ ... }: { + services.pcscd.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + environment.systemPackages = with pkgs; [ # System libnotify + lf xsel xbanish unzip zip wget alsa-utils - upower htop procps fzf eza btop - acpi xclip dysk rsync @@ -41,7 +47,6 @@ vim bat fd - arion bluez bluez-tools openssl @@ -49,5 +54,11 @@ pandoc texliveFull fastfetch + keyutils + pinentry-all + (pass.withExtensions (ext: with ext; [ + pass-import + pass-genphrase + ])) ]; } diff --git a/config/users.nix b/config/users.nix index 5da9e87..24da468 100644 --- a/config/users.nix +++ b/config/users.nix @@ -22,6 +22,8 @@ openssh.authorizedKeys = { keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDALsdpwvC0w/Aj+1fWtzJyyWoUrGkdh8o2thVHeQQBNo0D7cmVberYmi4Cv9gWGX6PaElrnOl0KRdGyro2wxOYokSxgk2VgWW67BFITAQAbKyG2NhXXPbhb4jccDo7WH7TtOG8IofuJTPRu1Duda6k4RN0I0CkyAN6LGX+zy49cq0qKf9ijXYhCDYNih3+Fu/ig0aW/SYmsVoUl2VFTWdI5x5/wLvIjTEZhmAtYIeYADaLnom356cFrUysZa++FUujQAz3Ow236BvP95XZdTsqvfWNZFNIpC9VYF72JeIDCs5wDIr0GFmanF2On1nar+jJpoOE8SdHt357p5g/PqXV5TisN2xQRkqVwO9tWtMl4sF84jA4ULnY2gQWv9jErMxymUQ1IwuPUzDDlbRHCtfexAtkBy7wv6xslKAzG1QahvF/btNs5Caj3LN31rgAuxyooCbKGKTeBP3kHPKcz1iupgidfbO/QqVXBRQJTEdGyAKa8hVmLQZZPC/XUhxESAk= fw@fw-nix" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8ku8iCb7tXd/tfxYDW+Tj8K9kpfrYZciYUZ6tBpO80inm4EImtfyEeJTuqDWMKov2BftUKs8brNeTBCXUEvU1P0+cpOP9RtYA5tfBXf3su+iVSswJJStIxNboXHrEGKdJJRNsTv/9agshDSUBy6G5TI1cXhv/updornfA4fwOMqOmtlYEn6XCRnsrO6NBLc/uLckdbF75HOsoLvezRvuqTLjpapjaUKGVPrgNXiclIKHmuOx71kgD4FX3rSz9FgKjnfu3a7DBbrHsf/g+N9PjNF1muN9UOV6nK3WwiO9BMWi7NpAWfzJOeZg9chqzI+U6CcsqYVeESgL41so+dnv3 fw@laptop" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP34dnsZSnWdDvd+3BXDwcw7wP0PjPEx2eCdBQJyGD6O fw@laptop" ]; }; }; diff --git a/shared/aerc.nix b/shared/aerc.nix index 087dd83..87f3b0a 100644 --- a/shared/aerc.nix +++ b/shared/aerc.nix @@ -16,7 +16,7 @@ ui = { "border-char-vertical"="│"; "border-char-horizontal"="─"; - "styleset-name"="catppuccin-macchiato"; + "styleset-name"="catppuccin-latte"; }; }; stylesets = { @@ -68,54 +68,56 @@ # "quote_*.fg"="#6e738d"; # "quote_1.fg"="#939ab7"; # }; - catppuccin-macchiato = '' + catppuccin-latte = '' *.default=true *.normal=true - default.fg=#cad3f5 + default.fg=#4c4f69 - error.fg=#ed8796 - warning.fg=#f5a97f - success.fg=#a6da95 + error.fg=#d20f39 + warning.fg=#fe640b + success.fg=#40a02b - tab.fg=#6e738d - tab.bg=#1e2030 - tab.selected.fg=#cad3f5 - tab.selected.bg=#24273a + tab.fg=#9ca0b0 + tab.bg=#e6e9ef + tab.selected.fg=#4c4f69 + tab.selected.bg=#eff1f5 tab.selected.bold=true - border.fg=#181926 + border.fg=#dce0e8 border.bold=true msglist_unread.bold=true - msglist_flagged.fg=#eed49f + msglist_flagged.fg=#df8e1d msglist_flagged.bold=true - msglist_result.fg=#8aadf4 + msglist_result.fg=#1e66f5 msglist_result.bold=true msglist_*.selected.bold=true - msglist_*.selected.bg=#363a4f + msglist_*.selected.bg=#ccd0da dirlist_*.selected.bold=true - dirlist_*.selected.bg=#363a4f + dirlist_*.selected.bg=#ccd0da - statusline_default.fg=#939ab7 - statusline_default.bg=#363a4f + statusline_default.fg=#7c7f93 + statusline_default.bg=#ccd0da statusline_error.bold=true statusline_success.bold=true + completion_default.selected.bg=#ccd0da + [viewer] - url.fg=#8aadf4 + url.fg=#1e66f5 url.underline=true header.bold=true signature.dim=true diff_meta.bold=true - diff_chunk.fg=#8aadf4 - diff_chunk_func.fg=#8aadf4 + diff_chunk.fg=#1e66f5 + diff_chunk_func.fg=#1e66f5 diff_chunk_func.bold=true - diff_add.fg=#a6da95 - diff_del.fg=#ed8796 - quote_*.fg=#6e738d - quote_1.fg=#939ab7 + diff_add.fg=#40a02b + diff_del.fg=#d20f39 + quote_*.fg=#9ca0b0 + quote_1.fg=#7c7f93 ''; }; }; diff --git a/shared/dwm.nix b/shared/dwm.nix index 7a5df3a..764ab2f 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -8,7 +8,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "eaf3279653491212fe9945d41938bfcaba990d64"; + rev = "b50e98d6921e7ade6658576ece17a04e19f4f564"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev