summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/home-minimal.nix36
-rw-r--r--home/home.nix35
-rw-r--r--home/newsboat-public.nix15
-rw-r--r--home/packages-minimal.nix2
-rw-r--r--home/packages.nix26
-rw-r--r--home/unstable.nix10
6 files changed, 55 insertions, 69 deletions
diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index cfeb2b2..98ba513 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -119,16 +119,17 @@
programs.git = {
enable = true;
- package = pkgs.gitAndTools.gitFull;
- userEmail = "stuebinm@disroot.org";
- userName = "stuebinm";
+ package = pkgs.gitFull;
signing = {
# signByDefault = true;
key = "0x8FBE8AAD32FA12B7";
};
- extraConfig = {
+ settings = {
+ user.email = "stuebinm@disroot.org";
+ user.name = "stuebinm";
+
log.showSignature = true;
init.defaultBranch = "main";
merge.conflictStyle = "zdiff3";
@@ -145,6 +146,11 @@
colorMoved = "plain";
mnemoicPrefix = true;
renames = true;
+
+ "isabelle" = {
+ binary = true;
+ textconv = "isabelle2unicode";
+ };
};
alias = {
@@ -176,21 +182,23 @@
"*.cpp merge=mergiraf"
"*.hpp merge=mergiraf"
"*.cs merge=mergiraf"
+ "*.thy diff=isabelle"
];
# diff-so-fancy.enable = true;
# difftastic.enable = true;
- delta = {
- enable = false;
- options = {
- decorations = {
- commit-decoration-style = "bold yellow";
- file-decoration-style = "bold blue";
- file-style = "bold yellow";
- };
- features = "decorations line-numbers navigate";
- whitespace-error-style = "22 reverse";
+ };
+
+ programs.delta = {
+ enable = false;
+ options = {
+ decorations = {
+ commit-decoration-style = "bold yellow";
+ file-decoration-style = "bold blue";
+ file-style = "bold yellow";
};
+ features = "decorations line-numbers navigate";
+ whitespace-error-style = "22 reverse";
};
};
diff --git a/home/home.nix b/home/home.nix
index c93daef..15df8de 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -26,22 +26,8 @@
programs.mu.enable = true;
accounts.email = {
- accounts.hacc = {
- address = "stuebinm@hacc.space";
- imap.host = "mail.hacc.space";
- mbsync = {
- enable = true;
- create = "maildir";
- };
- msmtp.enable = true;
- mu.enable = true;
- primary = true;
- realName = "stuebinm";
- smtp.host = "mail.hacc.space";
- userName = "stuebinm@hacc.space";
- passwordCommand = "secret-tool lookup mail hacc";
- };
accounts.disroot = {
+ primary = true;
address = "stuebinm@disroot.org";
imap.host = "disroot.org";
mbsync = {
@@ -297,6 +283,7 @@
macro 5 ${mkMpv "five"}
macro f set browser "${pkgs.xdg-utils}/bin/xdg-open %u >/dev/null 2>&1 &" ; open-in-browser ; set browser "${config.programs.newsboat.browser} %u"
macro d set browser "kitty @launch --type tab fish -c 'fetchpdf %u'" ; open-in-browser ; set browser "${config.programs.newsboat.browser} %u"
+ macro V set browser "firefox --private-window %u >/dev/null 2>&1 &" ; open-in-browser ; set browser "${config.programs.newsboat.browser} %u"
bind-key j down
bind-key k up
@@ -324,12 +311,6 @@
hetznerlogin = match: {user = "root"; identityFile = keydir + "/hetzner.pub";} // match;
vpslogin = hostname: hetznerlogin {inherit hostname;};
in {
- "parsons" = {
- hostname = "parsons.hacc.space";
- port = 62954;
- user = "stuebinm";
- identityFile = keydir + "/id_ed25519";
- };
"flora" = vpslogin "flora.stuebinm.eu";
"chaski" = vpslogin "chaski.stuebinm.eu";
"cgit" = vpslogin "flora.stuebinm.eu" // {user = "git";};
@@ -392,11 +373,13 @@
services.mako = {
enable = true;
- backgroundColor = "#74389eb0";
- borderColor = "#c27cb6ff";
- defaultTimeout = 5000; # milliseconds
- padding = "10";
- output = "DP-9";
+ settings = {
+ background-color = "#74389eb0";
+ border-color = "#c27cb6ff";
+ default-timeout = 5000; # milliseconds
+ padding = "10";
+ output = "DP-9";
+ };
};
services.mpd = {
diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix
index 0302c04..7da942b 100644
--- a/home/newsboat-public.nix
+++ b/home/newsboat-public.nix
@@ -17,7 +17,6 @@ with import ./newsboat-lib.nix;
(jtag "https://decorrespondent.nl/feed/v1/publications" "pol")
(jtag "https://solar.lowtechmagazine.com/feeds/all-en.atom.xml" "tech")
(btag "https://www.omgubuntu.co.uk/feed" "tech")
- (ntag "https://git.infra4future.de/hacc/haccfiles.rss" "git")
(ntag "https://liputenpo.org/feed" "tok")
(ntag "https://matrix.org/atom.xml" "matrix")
(ntag "https://press.nmbs.be/feed" "trains")
@@ -79,7 +78,7 @@ with import ./newsboat-lib.nix;
(btag "https://www.haskellforall.com/feeds/posts/default" "comp")
(btag "http://conal.net/blog/feed" "comp")
(btag "https://michael.stapelberg.ch/posts/tags/distri/feed.xml" "comp")
- (btag "https://mattermost.com/blog/category/releases/rss" "security")
+ (btag "https://mattermost.com/blog/category/releases/feed/" "security")
(btag "https://mattermost.com/security-updates/feed/" "security")
(btag "https://ionathan.ch/feed.xml" "comp")
(btag "https://wingolog.org/feed/atom" "comp")
@@ -219,6 +218,11 @@ with import ./newsboat-lib.nix;
(btag "https://antonia.is/rss.xml" "friends")
(btag "https://ancientalexandra.weebly.com/3/feed" "hist")
(btag "https://github.com/bookwyrm-social/bookwyrm/releases.atom" "comp")
+ (btag "https://rachelbythebay.com/w/atom.xml" "comp")
+ (btag "https://xn--gckvb8fzb.com/index.xml" "comp")
+ (btag "https://blog.aada.cat/index.xml" "friends")
+ (btag "https://jonworth.eu/feed/" "trains")
+ (btag "https://vulpinecitrus.info/blog/atom.xml" "comp")
# paper
(btag "http://arxiv.org/rss/cs.PL" "paper")
@@ -231,8 +235,6 @@ with import ./newsboat-lib.nix;
(ytag "UCXuqSBlHAE6Xw-yeJA0Tunw" "tech") # Linus Tech Tips
(ytag "UCBa659QWEk1AI4Tg--mrJ2A" "stuff") # Tom Scott
(ytag "UCtGG8ucQgEJPeUPhJZ4M4jA" "stuff") # Rare Earth
- (ytag "UCwRH985XgMYXQ6NxXDo8npw" "stuff") # Kurzgesagt de
- (ytag "UCsXVk37bltHxD1rDPwtNM8Q" "stuff") # Kurzgesagt en
(ytag "UC9GwQ_SGeq7Nrn4NQfwVoRA" "climate") # Students for Future
(ytag "UCN29LJGZ8FY30ysxdTnDsaw" "stuff") # Die Filmanalyse
(ytag "UCv1WDP5EiipMQ__C4Cg6aow" "pol") # Tilo Jung
@@ -241,8 +243,6 @@ with import ./newsboat-lib.nix;
(ytag "UCncTjqw75krp9j_wRRh5Gvw" "writing") # World Building Notes
(ytag "UCPlJ-KlPelfnwq0GHSeSpGQ" "talks") # It's all about Math
(ytag "UCmrWzKsW9IGU2l6a_MGJ3dw" "ling") # LangTime Studio
- (ytag "UCXl0Zbk8_rvjyLwAR-Xh9pQ" "maths") # Insights into Mathematics (Wildberger)
- (ytag "UCPjHlmSGP-rMg5PR-PyaJug" "chaos") # Henk Rijckaert
(ytag "UC3XTzVzaHQEd30rQbuvCtTQ" "latenight") # Last Week Tonight
(ytag "UCSju5G2aFaWMqn-_0YBtq5A" "maths") # Standupmaths
(ytag "UC2PA-AKmVpU6NKCGtZq_rKQ" "left") # Philosophy Tube
@@ -305,8 +305,7 @@ with import ./newsboat-lib.nix;
(podcast "https://feed.podbean.com/lingfieldnotes/feed.xml")
(podcast "https://dasklima.podigee.io/feed/mp3")
(podcast "https://www.haecksen.org/podcast/rss")
- (podcast "https://www.ndr.de/nachrichten/info/podcast4684.xml")
-
+
(music "https://feeds.soundcloud.com/users/soundcloud%3Ausers%3A39508706/sounds.rss")
]
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index b1121ac..20eb6df 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -16,7 +16,7 @@
# nix tools
nixpkgs-review nix-top nix-diff nix-tree
# git
- gitAndTools.gitAnnex git-bug git-appraise mergiraf
+ git-annex git-bug git-appraise mergiraf
# other things
gauche
# html, js & co
diff --git a/home/packages.nix b/home/packages.nix
index 7f910bb..236b5b6 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,24 +1,26 @@
{ config, lib, pkgs, inputs, system, craneLib, ... }:
let
- isabelle = import "${inputs.playground.outPath}/isabelle-nix-fhsenv" { inherit pkgs; };
+ isabelle = import "${inputs.playground.outPath}/isabelle-nix-fhsenv" { inherit pkgs; };
in
{
home.packages = with pkgs; [
- emacs
- emacs-all-the-icons-fonts nerdfonts
+ emacs-pgtk
+ emacs-all-the-icons-fonts julia-mono
+ river-classic swaybg swaylock
+ plover-dev
# internet apps & clients
firefox keepassxc mumble lynx offpunk
- openconnect tdesktop monolith magic-wormhole-rs
+ openconnect telegram-desktop monolith magic-wormhole-rs
dino
# graphics & audio
audacity blender darktable ffmpeg-full
gimp-with-plugins inkscape pavucontrol # krita
gst_all_1.gstreamer vimiv-qt
# LaTeX & documents
- xournal pandoc zathura pdfpc
- poppler_utils typst rustex
+ xournalpp pandoc zathura pdfpc
+ poppler-utils typst rustex
(texlive.combine {
inherit (texlive) scheme-full;
pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ];
@@ -26,10 +28,11 @@ in
# general cli utils
almanac libnotify grim slurp (zbar.override { enableVideo = false; withXorg = false; })
wl-clipboard showrt
- kijetesantakaluotokieni mpc_cli dufs progress hledger
+ kijetesantakaluotokieni mpc dufs progress hledger
wineWowPackages.full sops xdg-utils exiftool
- mercurial darcs git-annex-remote-remarkable2
+ mercurial darcs git-annex-remote-remarkable2 # git-who
rlwrap
+ inputs.ocaml-forester.legacyPackages.${system}.forester
# graphical utils
kitty
# gnss things
@@ -46,7 +49,7 @@ in
# other functional things
racket dhall dune_2 ocamlPackages.utop ocamlPackages.ocp-indent
ocamlPackages.merlin ocaml gauche
- (agda.withPackages (p: [ p.standard-library p.cubical ]))
+ (agda.withPackages (p: [ p.standard-library p.cubical p.agda-categories ]))
# html, js & co
jq ijq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
@@ -58,11 +61,12 @@ in
# C/C++
clang clang-tools rtags irony-server
# others
- python39 inweb
+ python3 inweb
# nix things
npins nix-output-monitor direnv
# isabelle
- (isabelle.mkEnv "isabelle-env" "fish") isabat
+ # (isabelle.mkEnv "isabelle-env" "fish")
+ isabat isabelle-utils
(import inputs.traveltext { inherit pkgs; })
];
diff --git a/home/unstable.nix b/home/unstable.nix
index f4fbccc..fc3b6ac 100644
--- a/home/unstable.nix
+++ b/home/unstable.nix
@@ -3,15 +3,7 @@
with inputs.nixpkgs-unstable;
{
home.packages = [
- (stdenv.mkDerivation {
- name = "signal-wayland";
- src = signal-desktop;
- phases = [ "buildPhase" ];
- buildPhase = ''
- mkdir -p $out
- cp -r $src/{bin,lib} $out
- '';
- })
+ signal-desktop
yazi
];
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-27 15:31:03 +0000