diff --git a/common.nix b/common.nix index fd64708..94f3d5f 100644 --- a/common.nix +++ b/common.nix @@ -47,8 +47,8 @@ with builtins; { htmlq + ausweisapp prusa-slicer - zed-editor wget git neofetch @@ -66,8 +66,8 @@ with builtins; { cool-retro-term maven + zed-editor jetbrains.idea-ultimate - jetbrains.rust-rover jdk libsecret @@ -139,6 +139,15 @@ with builtins; { nixpkgs.config.packageOverrides = pkgs: { sudo = pkgs.sudo.override {withInsults = true;}; + google-fonts = pkgs.google-fonts.overrideAttrs (oldAttrs: { + src = pkgs.fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "c06520efccd2c99d970b536d4f62cb4d95b4e6b2"; + sha256 = "sha256-9TzeihEKIEDRtDuv+NmLWjTpoGnBR+RP/jIBfB1O06U="; + }; + installPhase = oldAttrs.installPhase + "mv $out/share/fonts/truetype $out/share/fonts/ttf"; + }); }; security.sudo.extraConfig = "Defaults insults"; diff --git a/flake.lock b/flake.lock index 7fa1026..159fdeb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1732407143, - "narHash": "sha256-qJOGDT6PACoX+GbNH2PPx2ievlmtT1NVeTB80EkRLys=", + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "owner": "ipetkov", "repo": "crane", - "rev": "f2b4b472983817021d9ffb60838b2b36b9376b20", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1732689334, - "narHash": "sha256-yKI1KiZ0+bvDvfPTQ1ZT3oP/nIu3jPYm4dnbRd6hYg4=", + "lastModified": 1735626869, + "narHash": "sha256-hWGkpAWB59YWAOtBC6AE3DDnhMrBaqtiOaw1g+/mdLU=", "owner": "nix-community", "repo": "fenix", - "rev": "a8a983027ca02b363dfc82fbe3f7d9548a8d3dce", + "rev": "120e688c881f2233f053dca5a5ddb8945d8ca5d7", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732735497, - "narHash": "sha256-qaiRKT4T+kRAMwfFf1fIJ5pwCcaLp2dfNpT65C4uWuE=", + "lastModified": 1735674113, + "narHash": "sha256-X2+0+s6qNxrD+ySlD15jr5H314jOKMKJHBzbtNw1cBk=", "owner": "helix-editor", "repo": "helix", - "rev": "e1d1a5c5a12127ded88dfcf66dd74aad1650977c", + "rev": "b1759f998d527b7014b6be1eb26a518e1b5927c4", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1732793095, - "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1731683711, - "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", - "rev": "c859d03013712b349d82ee6223948d6d03e63a8d", + "lastModified": 1733448312, + "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=", + "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b" }, "original": { "type": "tarball", @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1732603698, - "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", + "lastModified": 1733522213, + "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", "ref": "refs/heads/main", - "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", - "revCount": 123, + "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", + "revCount": 124, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -172,7 +172,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1709065070, + "lastModified": 1735699162, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1732780316, - "narHash": "sha256-NskLIz0ue4Uqbza+1+8UGHuPVr8DrUiLfZu5VS4VQxw=", + "lastModified": 1735667141, + "narHash": "sha256-OdxSR4u4QQ/cnBWJBdbg9gMHQkJ2AQaOFif9965iciE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "226216574ada4c3ecefcbbec41f39ce4655f78ef", + "rev": "ffd125e27fecc4e5b935413276143a97449fcfd8", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1732633904, - "narHash": "sha256-7VKcoLug9nbAN2txqVksWHHJplqK9Ou8dXjIZAIYSGc=", + "lastModified": 1735570005, + "narHash": "sha256-ekN1mLeHM9upiAXykoNm646ctsm0qcS8+G2SjGtXp5k=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8d5e91c94f80c257ce6dbdfba7bd63a5e8a03fa6", + "rev": "1c6b83852b0d3bc129a3558386663373f126337e", "type": "github" }, "original": { diff --git a/modules/desktop-environment/audio.nix b/modules/desktop-environment/audio.nix index e0ca3ed..eebad68 100644 --- a/modules/desktop-environment/audio.nix +++ b/modules/desktop-environment/audio.nix @@ -16,7 +16,6 @@ playerctl pulseaudioFull - cava helvum ]; hardware.pulseaudio.enable = pkgs.lib.mkForce false; diff --git a/modules/desktop-environment/home/typst.nix b/modules/desktop-environment/home/typst.nix index c4ab6c1..4bf4d64 100644 --- a/modules/desktop-environment/home/typst.nix +++ b/modules/desktop-environment/home/typst.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: let +{pkgs, ...}: let packages = { typst-configs = pkgs.fetchFromGitea { domain = "forge.katzen.cafe"; @@ -32,4 +28,5 @@ in { recursive = true; }; }; + home.packages = [pkgs.typst]; } diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 0828381..d3a42ca 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -7,17 +7,12 @@ home.packages = with pkgs; [ audacity krita - # gimp-with-plugins gimp inkscape-with-extensions obs-studio kdenlive scribus - lilypond - gnuplot - graphviz - povray openscad-unstable openscad-lsp @@ -26,7 +21,6 @@ fontforge-gtk onlyoffice-bin_latest - typst rawtherapee ]; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 94249e1..2ebd6ef 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -126,7 +126,6 @@ in ddccontrol-db firebird-emu gitg - gpick qdirstat ffmpeg_7-full diff --git a/modules/desktop/social.nix b/modules/desktop/social.nix index 10c05d0..2dcde86 100644 --- a/modules/desktop/social.nix +++ b/modules/desktop/social.nix @@ -21,6 +21,7 @@ in mumble element-desktop pkgs.evolution-data-server-gtk4 + iamb ]; }; programs.evolution = {