summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/home-minimal.nix1
-rw-r--r--home/home.nix88
-rw-r--r--home/newsboat-public.nix16
-rw-r--r--home/packages-minimal.nix6
-rw-r--r--home/packages.nix10
5 files changed, 53 insertions, 68 deletions
diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index 98ba513..32075d8 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -156,6 +156,7 @@
alias = {
search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste";
where = "!fish -c git-where";
+ changes = "!git log --format=format: --name-only --since='1 year ago' | sort | uniq -c | sort -nr | head -20";
};
merge.mergiraf = {
diff --git a/home/home.nix b/home/home.nix
index 15df8de..6d1a061 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -69,20 +69,6 @@
userName = "stuebinm@ilztalbahn.eu";
passwordCommand = "secret-tool lookup mail ilztalbahn";
};
- accounts.preprint = {
- address = "admin@books.exposed";
- imap.host = "books.exposed";
- mbsync = {
- enable = true;
- create = "maildir";
- };
- msmtp.enable = true;
- mu.enable = true;
- realName = "terru";
- smtp.host = "books.exposed";
- userName = "admin@books.exposed";
- passwordCommand = "secret-tool lookup mail preprint";
- };
};
programs.bash = {
@@ -194,6 +180,8 @@
programs.neovim = {
enable = true;
viAlias = true;
+ withRuby = false;
+ withPython3 = false;
plugins = with pkgs; [
(vimPlugins.nvim-treesitter.withPlugins
(plugins: [ tree-sitter-grammars.tree-sitter-nix ]))
@@ -302,58 +290,63 @@
programs.ssh = {
# forwardAgent = true;
enable = true;
+ enableDefaultConfig = true;
extraConfig = ''
SetEnv TERM=xterm-256color
'';
- matchBlocks = let
+ settings = let
keydir = config.home.homeDirectory + "/.ssh";
- hetznerlogin = match: {user = "root"; identityFile = keydir + "/hetzner.pub";} // match;
- vpslogin = hostname: hetznerlogin {inherit hostname;};
+ hetznerlogin = match: { User = "root"; IdentityFile = keydir + "/hetzner.pub";} // match;
+ vpslogin = hostname: hetznerlogin { inherit hostname; };
in {
"flora" = vpslogin "flora.stuebinm.eu";
"chaski" = vpslogin "chaski.stuebinm.eu";
- "cgit" = vpslogin "flora.stuebinm.eu" // {user = "git";};
+ "cgit" = vpslogin "flora.stuebinm.eu" // {User = "git";};
"mate" = {
- hostname = "192.168.69.174";
- user = "root";
- identityFile = keydir + "/hetzner.pub";
+ Hostname = "192.168.69.174";
+ User = "root";
+ IdentityFile = keydir + "/hetzner.pub";
};
"c3voc" = {
- hostname = "git.c3voc.de";
- user = "git";
- identityFile = keydir + "/id_surltesh-echer";
+ Hostname = "git.c3voc.de";
+ User = "git";
+ IdentityFile = keydir + "/id_surltesh-echer";
};
"encoder* mixer* atem* minion*" = {
# hostname = "%h.lan.c3voc.de";
- user = "voc";
- extraOptions.StrictHostKeyChecking = "no";
+ User = "voc";
+ StrictHostKeyChecking = "no";
};
"nobelium" = {
- hostname = "no.colorspace.club";
- user = "root";
- identityFile = keydir + "/id_ed25519";
+ Hostname = "no.colorspace.club";
+ User = "root";
+ IdentityFile = keydir + "/id_ed25519";
};
"colorspace-git" = {
- hostname = "no.colorspace.club";
- user = "git";
- identityFile = keydir + "/id_ed25519";
+ Hostname = "no.colorspace.club";
+ User = "git";
+ IdentityFile = keydir + "/id_ed25519";
};
"git.infra4future.de" = {
- hostname = "git.infra4future.de";
- user = "gitea";
- identityFile = keydir + "/id_ed25519";
- addressFamily = "inet";
+ Hostname = "git.infra4future.de";
+ User = "gitea";
+ IdentityFile = keydir + "/id_ed25519";
+ AddressFamily = "inet";
};
"namauh" = {
- hostname = "10.11.99.1";
- user = "root";
- identityFile = keydir + "/id_ed25519";
+ Hostname = "10.11.99.1";
+ User = "root";
+ IdentityFile = keydir + "/id_ed25519";
};
"billy" = {
- hostname = "billy.books.exposed";
- user = "root";
- identityFile = keydir + "/id_ed25519";
+ Hostname = "billy.books.exposed";
+ User = "root";
+ IdentityFile = keydir + "/id_ed25519";
+ };
+ "regiolis" = {
+ Hostname = "regiolis.erpu.eu";
+ User = "terru";
};
};
};
@@ -371,17 +364,6 @@
};
- services.mako = {
- enable = true;
- settings = {
- background-color = "#74389eb0";
- border-color = "#c27cb6ff";
- default-timeout = 5000; # milliseconds
- padding = "10";
- output = "DP-9";
- };
- };
-
services.mpd = {
enable = true;
musicDirectory = "${config.home.homeDirectory}/music";
diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix
index 7da942b..1f82e0c 100644
--- a/home/newsboat-public.nix
+++ b/home/newsboat-public.nix
@@ -4,7 +4,6 @@ with import ./newsboat-lib.nix;
# news
(ntag "https://thinkmods.store/blogs/news.atom" "tech")
(ntag "http://feeds.feedburner.com/Blendernation" "blender")
- (ntag "https://puri.sm/feed/" "tech")
(ntag "https://events.ccc.de/feed" "chaos")
(ntag "https://this-week-in-rust.org/rss.xml" "prog")
(ntag "https://weekly.nixos.org/feeds/all.rss.xml" "prog")
@@ -14,7 +13,6 @@ with import ./newsboat-lib.nix;
(ntag "https://ctxt.es/es/?tpl=87" "es")
(ntag "https://warnung.bund.de/api31/mowas/rss/092620000000.rss" "bund")
(jtag "https://madeinchinajournal.com/feed/" "pol")
- (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://liputenpo.org/feed" "tok")
@@ -78,8 +76,6 @@ 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/feed/" "security")
- (btag "https://mattermost.com/security-updates/feed/" "security")
(btag "https://ionathan.ch/feed.xml" "comp")
(btag "https://wingolog.org/feed/atom" "comp")
(btag "https://os.phil-opp.com/rss.xml" "comp")
@@ -223,6 +219,15 @@ with import ./newsboat-lib.nix;
(btag "https://blog.aada.cat/index.xml" "friends")
(btag "https://jonworth.eu/feed/" "trains")
(btag "https://vulpinecitrus.info/blog/atom.xml" "comp")
+ (btag "https://www.jonmsterling.com/019X/atom.xml" "maths")
+ (btag "https://www.scottsmitelli.com/index.xml" "comp")
+ (btag "https://asta.boserup.eu/forest/fragments/atom.xml" "friends")
+ (btag "https://www.typography.com/rss/blog" "type")
+ (btag "https://rdnlsmith.com/index.xml" "comp")
+ (btag "https://blog.glyphdrawing.club/feed.xml" "type")
+ (btag "https://shadycharacters.co.uk/feed.xml" "type")
+ (btag "https://compilercrim.es/rss.xml" "comp")
+ (btag "https://www.math.columbia.edu/~woit/wordpress/atom.xml" "physics")
# paper
(btag "http://arxiv.org/rss/cs.PL" "paper")
@@ -232,7 +237,6 @@ with import ./newsboat-lib.nix;
# videos
(vtag "https://media.ccc.de/updates.rdf" "chaos") # Media.CCC.de
(ytag "UC9rxWtgVUFls4LocQhXoNJA" "tech") # Software Circus
- (ytag "UCXuqSBlHAE6Xw-yeJA0Tunw" "tech") # Linus Tech Tips
(ytag "UCBa659QWEk1AI4Tg--mrJ2A" "stuff") # Tom Scott
(ytag "UCtGG8ucQgEJPeUPhJZ4M4jA" "stuff") # Rare Earth
(ytag "UC9GwQ_SGeq7Nrn4NQfwVoRA" "climate") # Students for Future
@@ -299,12 +303,12 @@ with import ./newsboat-lib.nix;
(podcast "https://feeds.soundcloud.com/users/soundcloud:users:237055046/sounds.rss")
(podcast "https://fernostwaerts.de/feed/mp3/")
(podcast "https://allesgesagt.podigee.io/feed/mp3")
- (podcast "https://logbuch-netzpolitik.de/feed")
(podcast "https://feeds.feedburner.com/SrslyWrong")
(podcast "https://efforg.libsyn.com/rss")
(podcast "https://feed.podbean.com/lingfieldnotes/feed.xml")
(podcast "https://dasklima.podigee.io/feed/mp3")
(podcast "https://www.haecksen.org/podcast/rss")
+ (podcast "https://aboutlogic.podigee.io/feed/mp3")
(music "https://feeds.soundcloud.com/users/soundcloud%3Ausers%3A39508706/sounds.rss")
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index 20eb6df..baf15e4 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -19,10 +19,8 @@
git-annex git-bug git-appraise mergiraf
# other things
gauche
- # html, js & co
- jq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
- lowdown
+ jq ijq lowdown
# nix things
- nixfmt-rfc-style deploy-rs.deploy-rs
+ nixfmt deploy-rs.deploy-rs
];
}
diff --git a/home/packages.nix b/home/packages.nix
index 236b5b6..10c4a3c 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -8,11 +8,11 @@ in
emacs-pgtk
emacs-all-the-icons-fonts julia-mono
- river-classic swaybg swaylock
- plover-dev
+ river-classic swaybg swaylock dunst
+ plover
# internet apps & clients
firefox keepassxc mumble lynx offpunk
- openconnect telegram-desktop monolith magic-wormhole-rs
+ openconnect monolith magic-wormhole-rs
dino
# graphics & audio
audacity blender darktable ffmpeg-full
@@ -29,7 +29,7 @@ in
almanac libnotify grim slurp (zbar.override { enableVideo = false; withXorg = false; })
wl-clipboard showrt
kijetesantakaluotokieni mpc dufs progress hledger
- wineWowPackages.full sops xdg-utils exiftool
+ wineWow64Packages.full sops xdg-utils exiftool
mercurial darcs git-annex-remote-remarkable2 # git-who
rlwrap
inputs.ocaml-forester.legacyPackages.${system}.forester
@@ -52,7 +52,7 @@ in
(agda.withPackages (p: [ p.standard-library p.cubical p.agda-categories ]))
# html, js & co
- jq ijq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
+ html-tidy # nodePackages.stylelint nodePackages.js-beautify
libxml2 fq htmlq
# rust
rust-bin.stable.latest.minimal rust-analyzer rustfmt
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-01 17:25:07 +0000