nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Minimal changes to make 24.05 compile on framework

Browse source
This commit is contained in:
Natsu Kagami 2024-05-27 11:03:15 +02:00
parent 7d19c95472
commit 1cba13a2e8
Signed by: nki
GPG key ID: 55A032EB38B49ADB
8 changed files with 75 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/common-linux.nix
View file

@ -12,7 +12,7 @@ with lib; {
file # Query file type
nix-output-monitor
pinentry-gnome
pinentry-gnome3
# Java stuff
jdk21

2
home/common.nix
View file

@ -116,7 +116,7 @@ in
eza = {
enable = true;
enableAliases = true;
enableFishIntegration = true;
};
fzf = {

2
home/macbook-nixos.nix
View file

@ -97,7 +97,7 @@ in
home.file.".gnupg/gpg-agent.conf" = {
text = ''
pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
pinentry-program ${pkgs.pinentry-gnome3}/bin/pinentry-gnome3
'';
onChange = ''
echo "Reloading gpg-agent"

14
home/modules/programs/my-sway/default.nix
View file

@ -125,6 +125,7 @@ in
enable = true;
systemd.enable = true;
checkConfig = false; # Not working atm
config = {
### Inputs
#
@ -349,8 +350,10 @@ in
'' + (if config.services.gnome-keyring.enable then ''
# gnome-keyring
eval `gnome-keyring-daemon`
export SSH_AUTH_SOCK
if type gnome-keyring-daemon >/dev/null; then
eval `gnome-keyring-daemon`
export SSH_AUTH_SOCK
fi
'' else "");
# Extra
wrapperFeatures.base = true;
@ -459,8 +462,9 @@ in
spacing = 10;
};
"clock" = {
format = "{:📅 %Y-%m-%d | 🕰️ %H:%M [%Z]}";
tooltip-format = "\n<span size='9pt' font='Noto Sans Mono CJK JP'>{calendar}</span>";
# format = "{:📅 %Y-%m-%d | 🕰️ %H:%M [%Z]}";
format = "📅 {0:%Y-%m-%d} |️ 🕰️ {0:%H:%M [%Z]}";
tooltip-format = "\n<span size='9pt' font_family='Noto Sans Mono CJK JP'>{calendar}</span>";
timezones = [
"Europe/Zurich"
"America/Toronto"
@ -477,7 +481,7 @@ in
months = "<span color='#ffead3'><b>{}</b></span>";
days = "<span color='#ecc6d9'><b>{}</b></span>";
weeks = "<span color='#99ffdd'><b>W{}</b></span>";
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
weekdays = "<span color='#ffcc66'><b>日 月 火 水 木 金 土</b></span>"; # See https://github.com/Alexays/Waybar/issues/3132
today = "<span color='#ff6699'><b><u>{}</u></b></span>";
};
};