Compare commits

...

10 commits

Author SHA1 Message Date
bac6d9c7fb todo: add current wishlist 2025-03-15 16:41:12 +01:00
cd29dc0aa8 talos: add gnome-solanum to home packages
This is a Pomodoro timer.
2025-03-15 16:39:04 +01:00
90a09cc82b home: leave gtkrc 2.0 in its default location 2025-03-15 16:37:33 +01:00
c5c41c89f7 home: tridactyl: add typing websites to blackist 2025-03-15 16:23:59 +01:00
93e1e226ee base: add shellcheck to base programs 2025-03-15 16:22:03 +01:00
5fd40cdc6c flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27)
  → 'github:NixOS/nixos-hardware/e1f12151258b12c567f456d8248e4694e9390613' (2025-03-12)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6af28b834daca767a7ef99f8a7defa957d0ade6f' (2025-03-04)
  → 'github:NixOS/nixpkgs/cdd2ef009676ac92b715ff26630164bb88fec4e0' (2025-03-13)
2025-03-15 15:59:35 +01:00
c42ed3a2d1 base: gui: use Qt6 Okular 2025-03-07 12:38:19 +01:00
95c5fe1b49 home: jj: add better commit draft templates 2025-03-07 12:38:19 +01:00
f083325b4a home: jj: drop fancy icon from log
This messes with the graph formatting when history is not linear because
the fancy icon's width is non-standard
2025-03-07 12:38:19 +01:00
b17195c0cf talos: home: include font-awesome
Since this was removed when disabling the i3bar module in the previous
commit, enable locally.
2025-03-07 12:38:19 +01:00
8 changed files with 38 additions and 10 deletions

View file

@ -78,7 +78,7 @@ in {
zathura zathura
; ;
inherit (pkgs.libsForQt5) okular; inherit (pkgs.kdePackages) okular;
}; };
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

View file

@ -36,6 +36,7 @@
gnumake gnumake
gnupg gnupg
python3 python3
shellcheck
vim vim
# terminal utilities # terminal utilities
htop htop

12
flake.lock generated
View file

@ -234,11 +234,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1740646007, "lastModified": 1741792691,
"narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "rev": "e1f12151258b12c567f456d8248e4694e9390613",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741048562, "lastModified": 1741862977,
"narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -20,7 +20,11 @@ in {
gtk2 = { gtk2 = {
# No garbage polluting my $HOME # No garbage polluting my $HOME
configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; #
# I had this enabled but some program somehow couldn't find my
# configuration there. I think it was nm-applet.
#
#configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
}; };
iconTheme = { iconTheme = {

View file

@ -46,15 +46,31 @@ coalesce(
if(current_working_copy, "@"), if(current_working_copy, "@"),
if(immutable, "◆"), if(immutable, "◆"),
if(conflict, "×"), if(conflict, "×"),
if(description.starts_with("wip:"), "🔒"), if(description.starts_with("wip:"), "!"),
if(description.starts_with("private:"), "🔒"), if(description.starts_with("private:"), "!"),
"○", "○",
) )
) )
) )
''' '''
draft_commit_description = "commit_description_verbose(self)"
[template-aliases] [template-aliases]
"commit_description_verbose(commit)" = '''
concat(
commit_description(commit),
"JJ: ignore-rest\n",
diff.git(),
)
'''
"commit_description(commit)" = '''
concat(
commit.description(), "\n",
"JJ: This commit contains the following changes:\n",
indent("JJ: ", diff.stat(72)),
)
'''
[[--scope]] [[--scope]]
--when.repositories = ["~/work/lrde/"] --when.repositories = ["~/work/lrde/"]

View file

@ -33,6 +33,8 @@ set editorcmd emacsclient -c
set yankto both set yankto both
blacklistadd calendar.google.com blacklistadd calendar.google.com
blacklistadd keybr.com
blacklistadd ergol.org
blacklistadd jellyfin.alarsyo.net blacklistadd jellyfin.alarsyo.net
blacklistadd localhost blacklistadd localhost
blacklistadd netflix.com blacklistadd netflix.com

View file

@ -49,6 +49,8 @@ in {
(pkgs) (pkgs)
ansel ansel
chromium # some websites only work there :( chromium # some websites only work there :(
font-awesome # for pretty icons
gnome-solanum
nwg-displays nwg-displays
shikane # output autoconfig shikane # output autoconfig
swaybg swaybg

View file

@ -3,3 +3,6 @@
https://github.com/quexten/goldwarden https://github.com/quexten/goldwarden
* TODO Setup sway correctly * TODO Setup sway correctly
** TODO This includes moving it to a proper module
* TODO Create an adwaita package with symlinks for nm-applet icons