diff options
| -rw-r--r-- | common/desktop.nix | 6 | ||||
| -rw-r--r-- | flora/services/mail.nix | 2 | ||||
| -rw-r--r-- | home/home-minimal.nix | 30 | ||||
| -rw-r--r-- | home/packages-minimal.nix | 2 | ||||
| -rw-r--r-- | home/packages.nix | 12 | ||||
| -rw-r--r-- | inputs.nix | 2 | ||||
| -rw-r--r-- | npins/sources.json | 73 |
7 files changed, 58 insertions, 69 deletions
diff --git a/common/desktop.nix b/common/desktop.nix index e570579..9341b83 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -59,10 +59,10 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet -tr --asterisks --cmd 'hikari -c ~/hikari.conf'"; + command = "${pkgs.tuigreet}/bin/tuigreet -tr --asterisks --cmd 'hikari -c ~/hikari.conf'"; user = "stuebinm"; }; - terminal.vt = 2; + # terminal.vt = 2; }; }; @@ -85,7 +85,7 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji + noto-fonts-color-emoji ] ++ (with lib.attrsets; builtins.filter isDerivation (attrValues pkgs.nerd-fonts)); diff --git a/flora/services/mail.nix b/flora/services/mail.nix index 523c32d..0ee8418 100644 --- a/flora/services/mail.nix +++ b/flora/services/mail.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, inputs, ... }: { - imports = [ inputs.simple-nixos-mailserver ]; + imports = [ inputs.nixos-mailserver ]; sops.secrets."mail/hashedPassword" = {}; diff --git a/home/home-minimal.nix b/home/home-minimal.nix index cfeb2b2..6f872bf 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"; @@ -180,17 +181,18 @@ # 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/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 2bdee84..c4e918b 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -10,7 +10,7 @@ in # 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 @@ -18,7 +18,7 @@ in gst_all_1.gstreamer vimiv-qt # LaTeX & documents xournalpp pandoc zathura pdfpc - poppler_utils typst rustex + poppler-utils typst rustex (texlive.combine { inherit (texlive) scheme-full; pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ]; @@ -26,9 +26,9 @@ 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 git-who + mercurial darcs git-annex-remote-remarkable2 # git-who rlwrap inputs.ocaml-forester.legacyPackages.${system}.forester # graphical utils @@ -47,7 +47,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 @@ -63,7 +63,7 @@ in # nix things npins nix-output-monitor direnv # isabelle - (isabelle.mkEnv "isabelle-env" "fish") isabat + # (isabelle.mkEnv "isabelle-env" "fish") isabat (import inputs.traveltext { inherit pkgs; }) ]; @@ -60,7 +60,7 @@ let sops-nix = import "${sources.sops-nix}/modules/sops"; - simple-nixos-mailserver = import sources.simple-nixos-mailserver; + nixos-mailserver = import sources.nixos-mailserver; lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" { lix = sources.lix // { rev = sources.lix.revision; }; diff --git a/npins/sources.json b/npins/sources.json index cdc6602..e4d9a97 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -33,9 +33,9 @@ }, "branch": "rnv", "submodules": false, - "revision": "f3816a353b316287db0f4951e7007a72a456ed2d", + "revision": "f4794955c23d337ca25f44b771d574cc0ce970be", "url": null, - "hash": "04pwk2k4my6mwp5zpdq3ysfdhd3k8wggb6018xmnv4h2wmk4hcgq" + "hash": "0qyclincz278lxvw41blqdx535qnzq32kkqv632s69746hcm8hpz" }, "blog": { "type": "Git", @@ -112,11 +112,11 @@ "owner": "nix-community", "repo": "home-manager" }, - "branch": "release-25.05", + "branch": "release-25.11", "submodules": false, - "revision": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", - "url": "https://github.com/nix-community/home-manager/archive/44831a7eaba4360fb81f2acc5ea6de5fde90aaa3.tar.gz", - "hash": "07pk5m6mxi666dclaxdwf7xrinifv01vvgxn49bjr8rsbh31syaq" + "revision": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", + "url": "https://github.com/nix-community/home-manager/archive/6bd04da47cfb48dfd15eabf08364b78ad894f5b2.tar.gz", + "hash": "1wvysqiybcyf2hzvvpja2522fqhk45554j0b07h3s7zhzc2056ia" }, "isabelle-utils": { "type": "Git", @@ -138,9 +138,9 @@ }, "branch": "main", "submodules": false, - "revision": "8f27c09a08f6430f253ee93f35a519e42da19832", + "revision": "7b8947ea636acbaec9c18d35daa87848b388c025", "url": null, - "hash": "1zszpal9g93rc3mqva22cp8bhzqn5xvfrj5xdrhgcar21kmznn8f" + "hash": "1rc1fy8i48w65x80c7if3l2jq74b6ngli30rjwnqbifqxi09jyg4" }, "lix-nixos-module": { "type": "Git", @@ -150,9 +150,9 @@ }, "branch": "main", "submodules": false, - "revision": "9b76a77150b4ed4f7066f641f54791b1ac4c778c", + "revision": "1688100bba140492658d597f6b307c327f35c780", "url": null, - "hash": "18bibrki3pjr8wzkj5iqgangw4gdc6fm94pdywfimqyxvmiaq5ar" + "hash": "0pyzj0rdq62fz2i06ldwf9ridp195p6vvsp8yb1pii8h2q81v9lp" }, "mirage-opam-overlays": { "type": "Git", @@ -174,11 +174,11 @@ "repo_path": "simple-nixos-mailserver/nixos-mailserver", "server": "https://gitlab.com/" }, - "branch": "master", + "branch": "nixos-25.11", "submodules": false, - "revision": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", - "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=7d433bf89882f61621f95082e90a4ab91eb0bdd3", - "hash": "0xlhl8zhcz5c6hvmpkfw9ay2lfnk6nhax8pphvbv3vzxf1p9dhw9" + "revision": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d", + "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=23f0a53ca6e58e61e1ea2b86791c69b79c91656d", + "hash": "0pqc7bay9v360x2b7irqaz4ly63gp4z859cgg5c04imknv0pwjqw" }, "nixpkgs": { "type": "Git", @@ -187,11 +187,11 @@ "owner": "NixOS", "repo": "nixpkgs" }, - "branch": "nixos-25.05", + "branch": "nixos-25.11", "submodules": false, - "revision": "2b0d2b456e4e8452cf1c16d00118d145f31160f9", - "url": "https://github.com/NixOS/nixpkgs/archive/2b0d2b456e4e8452cf1c16d00118d145f31160f9.tar.gz", - "hash": "1c04l0yx2g9v5dslbxdy25x8pvja6mxyi6xqpmgzw61ry5yxbggv" + "revision": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "url": "https://github.com/NixOS/nixpkgs/archive/30a3c519afcf3f99e2c6df3b359aec5692054d92.tar.gz", + "hash": "13rp7g4ivphc70z6fdb2gf6angzr6qm2vrx32nk286nli991117h" }, "nixpkgs-unstable": { "type": "Git", @@ -202,9 +202,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055", - "url": "https://github.com/NixOS/nixpkgs/archive/306ea70f9eb0fb4e040f8540e2deab32ed7e2055.tar.gz", - "hash": "1cxf8iw2janh04bcnw93b0sl9mzh94awzzrrdfhig170cssmz8lm" + "revision": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "url": "https://github.com/NixOS/nixpkgs/archive/16c7794d0a28b5a37904d55bcca36003b9109aaa.tar.gz", + "hash": "1931vmgdclk332ikh7psxha1bskvrjwqrqm8a3xwcsr5hc8jfmbw" }, "ntfy-matrix-bot": { "type": "Git", @@ -242,9 +242,9 @@ }, "branch": "main", "submodules": false, - "revision": "98ca8f4401e996aeac38b6f14bf3a82d85b7add7", - "url": "https://github.com/tweag/opam-nix/archive/98ca8f4401e996aeac38b6f14bf3a82d85b7add7.tar.gz", - "hash": "0iwxpacx7dzqyvnilsy54bzaf23f5yvmm155qkw3i6yxygav2xvm" + "revision": "56f984e6e1b79f561d30a96ca3a5a9e0a1d185d1", + "url": "https://github.com/tweag/opam-nix/archive/56f984e6e1b79f561d30a96ca3a5a9e0a1d185d1.tar.gz", + "hash": "0pz0ks9270rdy6370mjqmd5n26jln9jpqixrfmd04v4yjls2mvfx" }, "opam-overlays": { "type": "Git", @@ -312,9 +312,9 @@ }, "branch": "master", "submodules": false, - "revision": "d81285ba8199b00dc31847258cae3c655b605e8c", - "url": "https://github.com/oxalica/rust-overlay/archive/d81285ba8199b00dc31847258cae3c655b605e8c.tar.gz", - "hash": "0m8qxw7kbvpyfgv9camifj47q88zcf3j63agviin47xvzkv9gc2v" + "revision": "1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c", + "url": "https://github.com/oxalica/rust-overlay/archive/1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c.tar.gz", + "hash": "08cflml8fqqw4ikgn8jjlygcy8mwz3v1kkkypgl446kb6x9y4ihm" }, "showrt": { "type": "Git", @@ -328,19 +328,6 @@ "url": null, "hash": "09shk9b3969gmbmh8mavgss6f90zb51rsfby5n1d924agxzl93d6" }, - "simple-nixos-mailserver": { - "type": "Git", - "repository": { - "type": "GitLab", - "repo_path": "simple-nixos-mailserver/nixos-mailserver", - "server": "https://gitlab.com/" - }, - "branch": "nixos-24.05", - "submodules": false, - "revision": "636b82f4175e3f6b1e80d2189bb0469e2ae01a55", - "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=636b82f4175e3f6b1e80d2189bb0469e2ae01a55", - "hash": "08zdidja5kdqgskynxsmcd8skh1b7cfl9ijjy9pak4b5h3aw2iqv" - }, "sops-nix": { "type": "Git", "repository": { @@ -350,9 +337,9 @@ }, "branch": "master", "submodules": false, - "revision": "9836912e37aef546029e48c8749834735a6b9dad", - "url": "https://github.com/Mic92/sops-nix/archive/9836912e37aef546029e48c8749834735a6b9dad.tar.gz", - "hash": "1sk77hv4x1dg7b1c7vpi5npa7smgz726l0rzywlzw80hwk085qh4" + "revision": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "url": "https://github.com/Mic92/sops-nix/archive/ecc41505948ec2ab0325f14c9862a4329c2b4190.tar.gz", + "hash": "1lfcycl1xq45qb18vghfaf1j3h0xrk5wfz540nldxxdlypy18dfk" }, "traveltext": { "type": "Git", |