From 8496ca234d4f6bd5c0ffc73c1bb8db151298d87f Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Nov 2024 19:55:04 +0100 Subject: [PATCH 01/19] disable jxl bc it doesn't work anyway :( --- modules/desktop/firefox.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/desktop/firefox.nix b/modules/desktop/firefox.nix index bb559f6..9cfc37a 100644 --- a/modules/desktop/firefox.nix +++ b/modules/desktop/firefox.nix @@ -204,7 +204,6 @@ "devtools.toolbox.host" = "right"; "devtools.theme" = "dark"; "webgl.disabled" = false; - "image.jxl.enabled" = true; "browser.urlbar.decodeURLsOnCopy" = true; "browser.urlbar.unitConversion.enabled" = true; "browser.urlbar.suggest.calculator" = true; From 7dde1e7c7739860a4a4722843b1cf20a35912487 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Nov 2024 19:55:46 +0100 Subject: [PATCH 02/19] remove smartd x11 notifications bc we dont use x11 anymore --- modules/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 63f0143..94249e1 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -65,7 +65,6 @@ in }; services.smartd = { enable = true; - notifications.x11.enable = true; notifications.test = true; }; From 7f72323bc2ebdfee97d073ea6870c376d03d2795 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 11 Nov 2024 11:39:32 +0100 Subject: [PATCH 03/19] flake.lock: Add MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Added input 'crane': 'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08) • Added input 'fenix': 'github:nix-community/fenix/b7206c170fa6b4695eb8211e10fdd0be0de9a248' (2024-11-11) • Added input 'fenix/nixpkgs': follows 'nixpkgs' • Added input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/30e71b609b493897ed81f4fec95eb75d903820c9' (2024-11-10) • Added input 'helix-inline-diags': 'github:helix-editor/helix/10c3502a89d51e2d074d0d2ca62f85241d6e8c0f' (2024-11-11) • Added input 'helix-inline-diags/crane': follows 'crane' • Added input 'helix-inline-diags/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Added input 'helix-inline-diags/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Added input 'helix-inline-diags/nixpkgs': follows 'nixpkgs' • Added input 'helix-inline-diags/rust-overlay': 'github:oxalica/rust-overlay/25685cc2c7054efc31351c172ae77b21814f2d42' (2024-10-07) • Added input 'helix-inline-diags/rust-overlay/nixpkgs': follows 'helix-inline-diags/nixpkgs' • Added input 'home-manager': 'github:nix-community/home-manager/60bb110917844d354f3c18e05450606a435d2d10' (2024-11-10) • Added input 'home-manager/nixpkgs': follows 'nixpkgs' • Added input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09) • Added input 'lix-module/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Added input 'lix-module/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Added input 'lix-module/flakey-profile': 'github:lf-/flakey-profile/243c903fd8eadc0f63d205665a92d4df91d42d9d' (2024-04-12) • Added input 'lix-module/lix': 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b967f1d5fe9d1bf58e6159e9b426c5b341489397.tar.gz?narHash=sha256-WnT6MpgrMKgqV2Rs%2BMfU88%2BKO%2B/njELPOtGoNhoX2oA%3D&rev=b967f1d5fe9d1bf58e6159e9b426c5b341489397' (2024-11-09) • Added input 'lix-module/nixpkgs': follows 'nixpkgs' • Added input 'mac-brcm-fw': 'path:/home/jade/nix-configs/mac-brcm-fw?lastModified=1709065070&narHash=sha256-%2BkW8ogc6DykjMVlrr%2B3vWKs9ZUdJ9EW72LbY7k/Qvh4%3D' (2024-02-27) • Added input 'nixos-hardware': 'github:networkException/nixos-hardware/8e28b9ee431b265d1fc74b8b819ea0816344c4a1' (2023-06-27) • Added input 'nixpkgs': 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09) • Added input 'nixpkgs-stable': 'github:NixOS/nixpkgs/205fd4226592cc83fd4c0885a3e4c9c400efabb5' (2024-07-09) • Added input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/3f42f0b61e6c45ca80d87cec5dd11e121d6b9c14' (2024-11-11) --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 08d4a52..0c41d4d 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731133750, - "narHash": "sha256-gZ3m8e176ai+akwiayg7Mve73rcUCD0+l6OMMFhGEYI=", + "lastModified": 1731306807, + "narHash": "sha256-Z8r5l7GdIPt3sP9D3mZSiAdpLc75/ohmtLheG/Lo44w=", "owner": "nix-community", "repo": "fenix", - "rev": "87e4581cdfecbac602220fe76c67b37d2d1ee995", + "rev": "b7206c170fa6b4695eb8211e10fdd0be0de9a248", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730790589, - "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=", + "lastModified": 1731295855, + "narHash": "sha256-PpkEexKnFxd72Z+bRnZqYmaSlNF0ztOIjY+aa/5PKak=", "owner": "helix-editor", "repo": "helix", - "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e", + "rev": "10c3502a89d51e2d074d0d2ca62f85241d6e8c0f", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -172,7 +172,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1727366922, + "lastModified": 1709065070, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1731136819, - "narHash": "sha256-qGmBFnq3/9AiiLZUOVxDsU5j6ysL3PXA8KRp7muJWMs=", + "lastModified": 1731300529, + "narHash": "sha256-PwzToM8oltfO3GlHpo3hIqmhPZwTbwkdnMIe4NpaN4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a2c7def574d031cbf3d7110969f2ca5f38f8ed7", + "rev": "3f42f0b61e6c45ca80d87cec5dd11e121d6b9c14", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731056261, - "narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=", + "lastModified": 1731264417, + "narHash": "sha256-TDI1s2Sc/rpMLwful1NcTjYBbqzbQ4Mjw5PPOuOXVfg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b", + "rev": "30e71b609b493897ed81f4fec95eb75d903820c9", "type": "github" }, "original": { From e65b60c50e377384bc51f370fd2aee632b4d0c8d Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 15 Nov 2024 09:40:44 +0100 Subject: [PATCH 04/19] jrnl: remove debug stuff --- programs/jrnl/src/commands/list_entries.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/jrnl/src/commands/list_entries.rs b/programs/jrnl/src/commands/list_entries.rs index 61ca763..2519394 100644 --- a/programs/jrnl/src/commands/list_entries.rs +++ b/programs/jrnl/src/commands/list_entries.rs @@ -17,12 +17,10 @@ pub fn list_entries(path: PathBuf) -> io::Result<()> { let l = format!(" {} ", crate::utils::format_datetime(entry.timestamp)); let fuck_you_debugging = cols as usize - (n.len() + r.chars().count() + l.len()); - dbg!(fuck_you_debugging); let padding = " ".repeat(fuck_you_debugging); println!("{}{r}{padding}{}", n.cyan(), l.white()) } - println!("d"); Ok(()) } else { eprintln!("Parsing error..."); From 7d1462d8395a81ad5d7274cfc7ff74667f996283 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 15 Nov 2024 09:43:55 +0100 Subject: [PATCH 05/19] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'fenix': 'github:nix-community/fenix/b7206c170fa6b4695eb8211e10fdd0be0de9a248' (2024-11-11) → 'github:nix-community/fenix/664e2f335aa5ae28c8759ff206444edb198dc1c9' (2024-11-15) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/30e71b609b493897ed81f4fec95eb75d903820c9' (2024-11-10) → 'github:rust-lang/rust-analyzer/fc98e0657abf3ce07eed513e38274c89bbb2f8ad' (2024-11-11) • Updated input 'helix-inline-diags': 'github:helix-editor/helix/10c3502a89d51e2d074d0d2ca62f85241d6e8c0f' (2024-11-11) → 'github:helix-editor/helix/6cca98264fe308bd6a4f7f85be2d821b58f60b4a' (2024-11-13) • Updated input 'home-manager': 'github:nix-community/home-manager/60bb110917844d354f3c18e05450606a435d2d10' (2024-11-10) → 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/3f42f0b61e6c45ca80d87cec5dd11e121d6b9c14' (2024-11-11) → 'github:NixOS/nixpkgs/cea28c811faadb50bee00d433bbf2fea845a43e4' (2024-11-14) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0c41d4d..ad04279 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731306807, - "narHash": "sha256-Z8r5l7GdIPt3sP9D3mZSiAdpLc75/ohmtLheG/Lo44w=", + "lastModified": 1731652660, + "narHash": "sha256-vau17dcGvfEWX9DLWuSPC0dfE0XcDe9ZNlsqXy46P88=", "owner": "nix-community", "repo": "fenix", - "rev": "b7206c170fa6b4695eb8211e10fdd0be0de9a248", + "rev": "664e2f335aa5ae28c8759ff206444edb198dc1c9", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731295855, - "narHash": "sha256-PpkEexKnFxd72Z+bRnZqYmaSlNF0ztOIjY+aa/5PKak=", + "lastModified": 1731479417, + "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", "owner": "helix-editor", "repo": "helix", - "rev": "10c3502a89d51e2d074d0d2ca62f85241d6e8c0f", + "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1731300529, - "narHash": "sha256-PwzToM8oltfO3GlHpo3hIqmhPZwTbwkdnMIe4NpaN4g=", + "lastModified": 1731611831, + "narHash": "sha256-R51rOqkWMfubBkZ9BY4Y1VaRoeqEBshlfQ8mMH5RjqI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f42f0b61e6c45ca80d87cec5dd11e121d6b9c14", + "rev": "cea28c811faadb50bee00d433bbf2fea845a43e4", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731264417, - "narHash": "sha256-TDI1s2Sc/rpMLwful1NcTjYBbqzbQ4Mjw5PPOuOXVfg=", + "lastModified": 1731342671, + "narHash": "sha256-36eYDHoPzjavnpmEpc2MXdzMk557S0YooGms07mDuKk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "30e71b609b493897ed81f4fec95eb75d903820c9", + "rev": "fc98e0657abf3ce07eed513e38274c89bbb2f8ad", "type": "github" }, "original": { From e08038d3a776bff40d7ef42e0353ec8ad9f8d404 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 15 Nov 2024 10:02:44 +0100 Subject: [PATCH 06/19] bare basics stuff --- common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common.nix b/common.nix index 781f311..fd64708 100644 --- a/common.nix +++ b/common.nix @@ -60,6 +60,11 @@ with builtins; { btop nodejs + cmatrix + sl + lolcat + cool-retro-term + maven jetbrains.idea-ultimate jetbrains.rust-rover From 33cb62770e869b17a2bc5c6cd9cb9bd1f446fcf2 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 19 Nov 2024 12:56:28 +0100 Subject: [PATCH 07/19] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08) → 'github:ipetkov/crane/3cb338ce81076ce5e461cf77f7824476addb0e1c' (2024-11-19) • Updated input 'fenix': 'github:nix-community/fenix/664e2f335aa5ae28c8759ff206444edb198dc1c9' (2024-11-15) → 'github:nix-community/fenix/3a8ac5fe1052d1ebe0cfee036aab71cce110b713' (2024-11-19) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/fc98e0657abf3ce07eed513e38274c89bbb2f8ad' (2024-11-11) → 'github:rust-lang/rust-analyzer/ba56d9b9b5f7ae7311b4bd1cc47159d87eb033d0' (2024-11-17) • Updated input 'home-manager': 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14) → 'github:nix-community/home-manager/a42fa14b53ceab66274a21da480c9f8e06204173' (2024-11-18) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18) • Updated input 'lix-module/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'lix-module/lix': 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b967f1d5fe9d1bf58e6159e9b426c5b341489397.tar.gz?narHash=sha256-WnT6MpgrMKgqV2Rs%2BMfU88%2BKO%2B/njELPOtGoNhoX2oA%3D&rev=b967f1d5fe9d1bf58e6159e9b426c5b341489397' (2024-11-09) → 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) → 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/c21b77913ea840f8bcf9adf4c41cecc2abffd38d' (2024-11-15) → 'github:NixOS/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/cea28c811faadb50bee00d433bbf2fea845a43e4' (2024-11-14) → 'github:NixOS/nixpkgs/0705964c881cea8896474610188905ba41b59b08' (2024-11-19) --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index ad04279..c600fee 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1731974733, + "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731652660, - "narHash": "sha256-vau17dcGvfEWX9DLWuSPC0dfE0XcDe9ZNlsqXy46P88=", + "lastModified": 1731998089, + "narHash": "sha256-nyTC7PboxqkPXgtwn142GV837AUlUOJ1TeVxtFn8kA8=", "owner": "nix-community", "repo": "fenix", - "rev": "664e2f335aa5ae28c8759ff206444edb198dc1c9", + "rev": "3a8ac5fe1052d1ebe0cfee036aab71cce110b713", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1731968878, + "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1731164513, - "narHash": "sha256-WnT6MpgrMKgqV2Rs+MfU88+KO+/njELPOtGoNhoX2oA=", - "rev": "b967f1d5fe9d1bf58e6159e9b426c5b341489397", + "lastModified": 1731683711, + "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", + "rev": "c859d03013712b349d82ee6223948d6d03e63a8d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b967f1d5fe9d1bf58e6159e9b426c5b341489397.tar.gz?rev=b967f1d5fe9d1bf58e6159e9b426c5b341489397" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d" }, "original": { "type": "tarball", @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1731185731, - "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", + "lastModified": 1731967274, + "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=", "ref": "refs/heads/main", - "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", - "revCount": 117, + "rev": "aa2846680fa9a2032939d720487942567fd9eb63", + "revCount": 119, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -215,26 +215,26 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1731611831, - "narHash": "sha256-R51rOqkWMfubBkZ9BY4Y1VaRoeqEBshlfQ8mMH5RjqI=", + "lastModified": 1732007104, + "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cea28c811faadb50bee00d433bbf2fea845a43e4", + "rev": "0705964c881cea8896474610188905ba41b59b08", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731342671, - "narHash": "sha256-36eYDHoPzjavnpmEpc2MXdzMk557S0YooGms07mDuKk=", + "lastModified": 1731827189, + "narHash": "sha256-isYgZVCLHYoXPtkns2jL+QAKFxnZ6lXCvKO7mT4ooiE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fc98e0657abf3ce07eed513e38274c89bbb2f8ad", + "rev": "ba56d9b9b5f7ae7311b4bd1cc47159d87eb033d0", "type": "github" }, "original": { From f7100a9e56a45fdb2d5e84d246fb993c9797f2db Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 20 Nov 2024 10:34:10 +0100 Subject: [PATCH 08/19] add trace build recipe --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index 2585971..3243fda 100644 --- a/justfile +++ b/justfile @@ -6,6 +6,9 @@ test: build: sudo nixos-rebuild switch --flake . --impure --fast --log-format multiline +tbuild: + sudo nixos-rebuild switch --flake . --impure --fast --log-format multiline-with-logs --show-trace + update: nix flake update --commit-lock-file --log-format multiline From 0767bab5bd3c30573503b2c06792d43081888a6f Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 20 Nov 2024 10:39:37 +0100 Subject: [PATCH 09/19] google-fonts --- modules/desktop/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index 97c7453..cbb67d1 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { fonts.packages = with pkgs; [ (nerdfonts.override {fonts = ["FiraCode" "AnonymousPro"];}) + google-fonts montserrat noto-fonts atkinson-hyperlegible From 06460678431001d07c27287b4b6e0cf4837a2cf0 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 28 Nov 2024 08:42:49 +0100 Subject: [PATCH 10/19] rename laptop --- flake.nix | 4 ++-- hosts/{catbook-j => denkbrett}/configuration.nix | 2 +- hosts/{catbook-j => denkbrett}/hardware-configuration.nix | 0 hosts/{catbook-j => denkbrett}/modules/default.nix | 0 hosts/{catbook-j => denkbrett}/modules/graphics.nix | 0 hosts/{catbook-j => denkbrett}/modules/input.nix | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename hosts/{catbook-j => denkbrett}/configuration.nix (98%) rename hosts/{catbook-j => denkbrett}/hardware-configuration.nix (100%) rename hosts/{catbook-j => denkbrett}/modules/default.nix (100%) rename hosts/{catbook-j => denkbrett}/modules/graphics.nix (100%) rename hosts/{catbook-j => denkbrett}/modules/input.nix (100%) diff --git a/flake.nix b/flake.nix index 516f018..de9b7e2 100644 --- a/flake.nix +++ b/flake.nix @@ -117,13 +117,13 @@ } ]; }; - catbook-j = nixpkgs.lib.nixosSystem { + denkbrett = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ - ./hosts/catbook-j/configuration.nix + ./hosts/denkbrett/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/catbook-j/configuration.nix b/hosts/denkbrett/configuration.nix similarity index 98% rename from hosts/catbook-j/configuration.nix rename to hosts/denkbrett/configuration.nix index 14e2f64..ae72336 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/denkbrett/configuration.nix @@ -76,7 +76,7 @@ # networking networking.networkmanager.enable = true; - networking.hostName = "catbook-j"; + networking.hostName = "denkbrett"; i18n.extraLocaleSettings = { LC_ADDRESS = "de_DE.UTF-8"; diff --git a/hosts/catbook-j/hardware-configuration.nix b/hosts/denkbrett/hardware-configuration.nix similarity index 100% rename from hosts/catbook-j/hardware-configuration.nix rename to hosts/denkbrett/hardware-configuration.nix diff --git a/hosts/catbook-j/modules/default.nix b/hosts/denkbrett/modules/default.nix similarity index 100% rename from hosts/catbook-j/modules/default.nix rename to hosts/denkbrett/modules/default.nix diff --git a/hosts/catbook-j/modules/graphics.nix b/hosts/denkbrett/modules/graphics.nix similarity index 100% rename from hosts/catbook-j/modules/graphics.nix rename to hosts/denkbrett/modules/graphics.nix diff --git a/hosts/catbook-j/modules/input.nix b/hosts/denkbrett/modules/input.nix similarity index 100% rename from hosts/catbook-j/modules/input.nix rename to hosts/denkbrett/modules/input.nix From a636270116f919aae7d6be770c83861efa31ba47 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 28 Nov 2024 08:47:24 +0100 Subject: [PATCH 11/19] update nixpkgs-stable --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index de9b7e2..3ea114b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-23.11"; + nixpkgs-stable.url = "nixpkgs/nixos-24.05"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; helix-inline-diags = { url = "github:helix-editor/helix"; From 8fb63359d10f16ddfa633db8b5b894ba1748eeea Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 28 Nov 2024 18:05:02 +0100 Subject: [PATCH 12/19] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/3cb338ce81076ce5e461cf77f7824476addb0e1c' (2024-11-19) → 'github:ipetkov/crane/f2b4b472983817021d9ffb60838b2b36b9376b20' (2024-11-24) • Updated input 'fenix': 'github:nix-community/fenix/3a8ac5fe1052d1ebe0cfee036aab71cce110b713' (2024-11-19) → 'github:nix-community/fenix/a8a983027ca02b363dfc82fbe3f7d9548a8d3dce' (2024-11-27) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/ba56d9b9b5f7ae7311b4bd1cc47159d87eb033d0' (2024-11-17) → 'github:rust-lang/rust-analyzer/8d5e91c94f80c257ce6dbdfba7bd63a5e8a03fa6' (2024-11-26) • Updated input 'helix-inline-diags': 'github:helix-editor/helix/6cca98264fe308bd6a4f7f85be2d821b58f60b4a' (2024-11-13) → 'github:helix-editor/helix/e1d1a5c5a12127ded88dfcf66dd74aad1650977c' (2024-11-27) • Updated input 'home-manager': 'github:nix-community/home-manager/a42fa14b53ceab66274a21da480c9f8e06204173' (2024-11-18) → 'github:nix-community/home-manager/2f7739d01080feb4549524e8f6927669b61c6ee3' (2024-11-28) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730' (2024-11-26) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15) → 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d' (2024-11-25) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16) → 'github:NixOS/nixpkgs/0c5b4ecbed5b155b705336aa96d878e55acd8685' (2024-11-27) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/0705964c881cea8896474610188905ba41b59b08' (2024-11-19) → 'github:NixOS/nixpkgs/226216574ada4c3ecefcbbec41f39ce4655f78ef' (2024-11-28) --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index c600fee..7fa1026 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1731974733, - "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=", + "lastModified": 1732407143, + "narHash": "sha256-qJOGDT6PACoX+GbNH2PPx2ievlmtT1NVeTB80EkRLys=", "owner": "ipetkov", "repo": "crane", - "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c", + "rev": "f2b4b472983817021d9ffb60838b2b36b9376b20", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731998089, - "narHash": "sha256-nyTC7PboxqkPXgtwn142GV837AUlUOJ1TeVxtFn8kA8=", + "lastModified": 1732689334, + "narHash": "sha256-yKI1KiZ0+bvDvfPTQ1ZT3oP/nIu3jPYm4dnbRd6hYg4=", "owner": "nix-community", "repo": "fenix", - "rev": "3a8ac5fe1052d1ebe0cfee036aab71cce110b713", + "rev": "a8a983027ca02b363dfc82fbe3f7d9548a8d3dce", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731479417, - "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", + "lastModified": 1732735497, + "narHash": "sha256-qaiRKT4T+kRAMwfFf1fIJ5pwCcaLp2dfNpT65C4uWuE=", "owner": "helix-editor", "repo": "helix", - "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", + "rev": "e1d1a5c5a12127ded88dfcf66dd74aad1650977c", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1731968878, - "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", + "lastModified": 1732793095, + "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", + "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1731967274, - "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=", + "lastModified": 1732603698, + "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", "ref": "refs/heads/main", - "rev": "aa2846680fa9a2032939d720487942567fd9eb63", - "revCount": 119, + "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", + "revCount": 123, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1732007104, - "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=", + "lastModified": 1732780316, + "narHash": "sha256-NskLIz0ue4Uqbza+1+8UGHuPVr8DrUiLfZu5VS4VQxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0705964c881cea8896474610188905ba41b59b08", + "rev": "226216574ada4c3ecefcbbec41f39ce4655f78ef", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731827189, - "narHash": "sha256-isYgZVCLHYoXPtkns2jL+QAKFxnZ6lXCvKO7mT4ooiE=", + "lastModified": 1732633904, + "narHash": "sha256-7VKcoLug9nbAN2txqVksWHHJplqK9Ou8dXjIZAIYSGc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ba56d9b9b5f7ae7311b4bd1cc47159d87eb033d0", + "rev": "8d5e91c94f80c257ce6dbdfba7bd63a5e8a03fa6", "type": "github" }, "original": { From ffdf893e15eb3dd18584b4a25706092394ea4987 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:46:11 +0100 Subject: [PATCH 13/19] add typst configs --- modules/desktop-environment/home/default.nix | 1 + modules/desktop-environment/home/typst.nix | 33 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 modules/desktop-environment/home/typst.nix diff --git a/modules/desktop-environment/home/default.nix b/modules/desktop-environment/home/default.nix index e348ec6..558291e 100644 --- a/modules/desktop-environment/home/default.nix +++ b/modules/desktop-environment/home/default.nix @@ -4,6 +4,7 @@ ./notifications.nix ./terminal.nix ./compositing.nix + ./typst.nix ./panels ./xmonad ./sway diff --git a/modules/desktop-environment/home/typst.nix b/modules/desktop-environment/home/typst.nix new file mode 100644 index 0000000..f60ed7c --- /dev/null +++ b/modules/desktop-environment/home/typst.nix @@ -0,0 +1,33 @@ +{ + pkgs, + lib, + ... +}: let + packages = { + typst-configs = pkgs.fetchFromGitea { + domain = "forge.katzen.cafe"; + owner = "schrottkatze"; + repo = "typst-configs"; + rev = "3a09cd374f0508c8e0c5d95f5ad7358adc50bafa"; + }; + flow = pkgs.fetchFromGithub { + owner = "MultisampledNight"; + repo = "flow"; + rev = "f5c653c706d80145165ec684b217b803a0246e8c"; + }; + }; + mkTypstPath = name: ".local/share/typst/packages/local/${name}/0.1.0"; +in { + home.file = { + typst-configs = { + target = mkTypstPath "typst-configs"; + source = packages.typst-configs; + recursive = true; + }; + flow = { + target = mkTypstPath "flow"; + source = packages.flow; + recursive = true; + }; + }; +} From 7da65291bb79104115caa5c910031b91a2d1c7b4 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:46:20 +0100 Subject: [PATCH 14/19] update .envrc --- .envrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.envrc b/.envrc index 3550a30..b1f915f 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use flake +use flake --log-format multiline-with-logs From 6f452681505636a49f06696ef866478d846b53f5 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:46:54 +0100 Subject: [PATCH 15/19] add layaway --- .../desktop-environment/home/sway/default.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index e93e9b7..a1e12b3 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -3,10 +3,32 @@ lib, config, ... -}: { +}: let + # stolen: https://github.com/MultisampledNight/core/blob/678f176cb24f5dc4b5dc629cfd3e643487be01bb/system/packages/layaway/default.nix#L7-L25 + layaway = pkgs.rustPlatform.buildRustPackage rec { + pname = "layaway"; + version = "0.2.0"; + + src = pkgs.fetchFromGitHub { + owner = "MultisampledNight"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SzAuVFEy56svasO3+1p6ysBRrIQd0UZX++/P4ZuwWm0="; + }; + + cargoHash = "sha256-liWP6AI72xG1O+MbCZ0cjJ2llHj/iv3hR/U3BLv5fKA="; + + meta = with lib; { + description = "Layout creation for Sway via a relative and human-readable DSL."; + homepage = "https://github.com/MultisampledNight/layaway"; + maintainers = [maintainers.multisn8]; + }; + }; +in { programs.wofi.enable = true; programs.swaylock.enable = true; services.network-manager-applet.enable = true; + home.packages = [layaway]; xdg.portal = { enable = true; From 9f0a3640d8b199d64e43648744645541816e130f Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:47:35 +0100 Subject: [PATCH 16/19] add tlp --- modules/desktop-environment/default.nix | 1 + modules/desktop-environment/tlp.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 modules/desktop-environment/tlp.nix diff --git a/modules/desktop-environment/default.nix b/modules/desktop-environment/default.nix index 73050ec..d6030ad 100644 --- a/modules/desktop-environment/default.nix +++ b/modules/desktop-environment/default.nix @@ -5,6 +5,7 @@ ./flatpak.nix ./home ./dm.nix + ./tlp.nix ]; services.upower = { enable = true; diff --git a/modules/desktop-environment/tlp.nix b/modules/desktop-environment/tlp.nix new file mode 100644 index 0000000..88aa4d7 --- /dev/null +++ b/modules/desktop-environment/tlp.nix @@ -0,0 +1,9 @@ +{...}: { + services.tlp = { + enable = true; + settings = { + START_CHARGE_THRESH_BAT0 = "70"; + STOP_CHARGE_TRESH_BAT0 = "85"; + }; + }; +} From 355d513434750635be7bda5505566a0b4e8a281b Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:47:54 +0100 Subject: [PATCH 17/19] update hwkey in git --- modules/shell/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 87c068f..743e653 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -22,7 +22,7 @@ s = "status"; }; signing = { - key = "${pkgs.writeText "red_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"}"; + key = "${pkgs.writeText "blue_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILg7hhAKxIAbokHHcIj9HBgbkgoKGCG2R+gx7HZKL+iz cardno:000F_93C6A612"}"; signByDefault = true; }; extraConfig = { From 3e8eb1e6d794e30875d6471c43383832847de6ec Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:48:15 +0100 Subject: [PATCH 18/19] update nu config --- other/config.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/config.nu b/other/config.nu index d9d74e3..6dbae6e 100644 --- a/other/config.nu +++ b/other/config.nu @@ -232,7 +232,7 @@ $env.config = { } color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record - footer_mode: "25" # always, never, number_of_rows, auto + footer_mode: 25 # always, never, number_of_rows, auto float_precision: 2 # the precision for displaying floats in tables buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL use_ansi_coloring: true From 9657b8771f90c394c55966462e09f7161f91aeea Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Fri, 29 Nov 2024 15:48:39 +0100 Subject: [PATCH 19/19] add bahn.expert lookup command to nu config --- other/config.nu | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/other/config.nu b/other/config.nu index 6dbae6e..b03a517 100644 --- a/other/config.nu +++ b/other/config.nu @@ -882,6 +882,17 @@ def nev [ unit = day ] { | format duration $unit } +# TODO: intermediate stations +def bx [from: string to: string] { + let map = open ~/Docs/ril100map.json; + let start = $map | get ($from | str upcase) | first; + let dest = $map | get ($to | str upcase) | first; + + let url = $"https://bahn.expert/routing/($start)/($dest)/0/"; + print $url; + ^bash -c $"nohup chromium '($url)' &"; +} + alias gnix = cd ~/nix-configs; alias grepo = cd ~/Documents/repos; alias wh = wormhole-rs; @@ -907,3 +918,5 @@ alias bash = echo $"(ansi red)no, fuck that shit!"; alias sh = echo $"(ansi red)no, fuck that shit!"; alias zsh = echo $"(ansi red)no, fuck that shit!"; alias fish = echo $"(ansi red)no, fuck that shit!"; + +alias px = pulsemixer;