From 64b07648f0ccd0fc1765d8c6da2d9ad25919e445 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 13 Nov 2024 21:54:03 +0100 Subject: [PATCH 1/6] update overlay --- overlay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay b/overlay index c598bf7..1fb677b 160000 --- a/overlay +++ b/overlay @@ -1 +1 @@ -Subproject commit c598bf71e3f6dbdad34092b09df9551dec913770 +Subproject commit 1fb677b6b94023b47e03a2a4c2c67427600f8d78 From db003cde9a6c6264f6c2755968fea8aa3a37b6b5 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 13 Nov 2024 21:54:16 +0100 Subject: [PATCH 2/6] niv update --- nix/sources.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 69278ab..5954a0c 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", - "sha256": "0l3pcd38p4iq46ipc5h3cw7wmr9h8rbn34h8a5a4v8hcl21s8r5x", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "sha256": "00wp0s9b5nm5rsbwpc1wzfrkyxxmqjwsc1kcibjdbfkh69arcpsn", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/845a5c4c073f74105022533907703441e0464bc3.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/2f23fa308a7c067e52dfcc30a0758f47043ec176.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -17,10 +17,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "f7c538837892dd2eb83567c9f380a11efb59b53f", - "sha256": "0xl33k24vfc29cg9lnp95kvcq69qbq5fzb7jk9ig4lgrhaarh651", + "rev": "55422d6f2618cd2195eeafa3f16ae63fde723c15", + "sha256": "1s6m41hhsydf3lw6ihksc904vcpyd5agwiqq8hb8plyqvsyn74ba", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/f7c538837892dd2eb83567c9f380a11efb59b53f.tar.gz", + "url": "https://github.com/nmattia/niv/archive/55422d6f2618cd2195eeafa3f16ae63fde723c15.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } From abe5d8c360838fa6038c4612930e6ca41d0e4d4a Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 13 Nov 2024 21:54:24 +0100 Subject: [PATCH 3/6] modules/lix: Update to 2.91.1 --- modules/lix.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/lix.nix b/modules/lix.nix index 1c0bf80..ca9e44d 100644 --- a/modules/lix.nix +++ b/modules/lix.nix @@ -1,16 +1,16 @@ let module = fetchTarball { name = "source"; - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; - sha256 = "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g="; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + sha256 = "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s="; }; lixSrc = fetchTarball { name = "source"; - url = "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"; - sha256 = "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0="; + url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"; + sha256 = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U="; }; - # This is the core of the code you need; it is an exercise to the - # reader to write the sources in a nicer way, or by using npins or - # similar pinning tools. in +# This is the core of the code you need; it is an exercise to the +# reader to write the sources in a nicer way, or by using npins or +# similar pinning tools. import "${module}/module.nix" { lix = lixSrc; } From a0f39b1050f4126369895786bb9c9a4d505064ce Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 13 Nov 2024 21:55:25 +0100 Subject: [PATCH 4/6] homemanager: Don't install unstable prusaslicer. Added orcaslicer and bat --- home-manager/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index a0aa1bc..bb118f9 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -92,8 +92,10 @@ in ncmpcpp acpi unstable.joplin-desktop + bat - unstable.prusa-slicer + prusa-slicer + orca-slicer htop xdg-utils moreutils From ff6dc6f1393e0a5e38af351e3a8294a80f73fab6 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 13 Nov 2024 21:55:37 +0100 Subject: [PATCH 5/6] modules/waybar: Fixed transparency in context menues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks Adrian! 🫰 --- home-manager/modules/waybar.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/modules/waybar.css b/home-manager/modules/waybar.css index 149790c..5e0cb89 100644 --- a/home-manager/modules/waybar.css +++ b/home-manager/modules/waybar.css @@ -97,6 +97,10 @@ margin-left: 3px; } +#tray menu { + background: @dark; +} + /* All module that should blink */ #mode #memory, From 6d767339c143ffaa72d3471884df4bbed506c13e Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 13 Nov 2024 21:56:50 +0100 Subject: [PATCH 6/6] home/zsh: Use bat as substitute for cat --- home-manager/modules/zsh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index 7c8562a..ce1ce75 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -18,6 +18,7 @@ "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.cccda.de buzzer"; "beep" = "paplay /usr/share/sounds/freedesktop/stereo/complete.oga"; # play "ding" for long running jobs "dig" = "dig +short"; + "cat" = "bat --theme=TwoDark --style=plain"; }; initExtra = '' autoload -U colors && colors