From 7e53c288fe8783fbb40d966db230b383ae95d627 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 17 May 2025 01:13:14 +0200 Subject: [PATCH 1/4] feature(kitty): add font package to ensure availability --- flake.lock | 36 ++++++++++++++--------------- modules/home/apps/kitty/default.nix | 8 +++++-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 9c5c45e..4beb7e2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1747022610, - "narHash": "sha256-d6SvA0gTHDrOqt4tZRVD0Gm5G4w6jAFJ6lis79PjSPw=", + "lastModified": 1747403139, + "narHash": "sha256-GpldCFeC+YP9m2xm1POByfT3+9J9/nwst0CYxvR85I0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d4b3ffe3e719e42b175ccdef13598516f0a8025d", + "rev": "1ebb2cf654110901889353440027993312e1aeb0", "type": "gitlab" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1747021744, - "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", + "lastModified": 1747427366, + "narHash": "sha256-c3UfEsnT94bt6ta1VELYQhAWkQWFGlB+7DmBmthlGGg=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", + "rev": "74d31e1165341bf510ee2017841a599f5cfc1608", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746814339, - "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1746940940, - "narHash": "sha256-ASB3QVEoFK5//280uedYdt8jyDLhFa9zgj8qfc0S7Sk=", + "lastModified": 1747389489, + "narHash": "sha256-PN5lxjC+Oh4oANayNRN0deD4F8N5yZ1Zw+NI9SfQt80=", "owner": "notashelf", "repo": "nvf", - "rev": "815ed49d3693346122ef61da6d7443cd3cc21752", + "rev": "74587e254ac7f8f7a7eca58aede14badde20dee6", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1747209494, + "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "github" }, "original": { diff --git a/modules/home/apps/kitty/default.nix b/modules/home/apps/kitty/default.nix index 78a2738..4457ff1 100644 --- a/modules/home/apps/kitty/default.nix +++ b/modules/home/apps/kitty/default.nix @@ -20,7 +20,8 @@ let cursor_shape = "Beam"; }; defaultFont = { - name = "Hack Nerd Font"; + name = "Hack Nerd Font Mono"; + package = pkgs.nerd-fonts.hack; size = 12; }; in @@ -33,7 +34,10 @@ in }; config = mkIf cfg.enable { - home.packages = [ pkgs.kitty-themes ]; + home.packages = [ + pkgs.kitty-themes + defaultFont.package + ]; # fc-cache -fv clear fontconfig when error programs.kitty = { enable = true; themeFile = "tokyo_night_night"; From 1babc7912d528409099bbc0a5a8e850b8d851c9f Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 17 May 2025 01:14:36 +0200 Subject: [PATCH 2/4] feature(plasma): add wallpaper-engine-plugin --- modules/nixos/desktop/plasma/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index f7b6201..4389090 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -48,6 +48,7 @@ in kdiskmark networkmanager kdePackages.networkmanager-qt + kdePackages.wallpaper-engine-plugin ]; }; From ddbe5c35c59b90e0cccc3d42388be66e31ef5f20 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 17 May 2025 01:16:45 +0200 Subject: [PATCH 3/4] fix(linkwarden): add default value for secrets --- modules/nixos/services/linkwarden/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/linkwarden/default.nix b/modules/nixos/services/linkwarden/default.nix index b67a057..79aa195 100644 --- a/modules/nixos/services/linkwarden/default.nix +++ b/modules/nixos/services/linkwarden/default.nix @@ -53,6 +53,7 @@ in check = it: lib.isString it && lib.types.path.check it; }; example = "/run/secrets/linkwarden"; + default = "/run/secrets/linkwarden"; description = '' Path of a file with extra environment variables to be loaded from disk. This file is not added to the nix store, so it can be used to pass secrets to linkwarden. From 5129239a24154b1a60e427d8df8eb6fc168febb3 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 17 May 2025 01:17:17 +0200 Subject: [PATCH 4/4] add(tmp): make /tmp an actual tmpfs --- modules/nixos/system/tmp/default.nix | 25 +++++++++++++++++++ systems/x86_64-linux/blarm/default.nix | 11 ++++---- systems/x86_64-linux/bodenheizung/default.nix | 1 + systems/x86_64-linux/dns/default.nix | 6 +++++ 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 modules/nixos/system/tmp/default.nix diff --git a/modules/nixos/system/tmp/default.nix b/modules/nixos/system/tmp/default.nix new file mode 100644 index 0000000..6162fe3 --- /dev/null +++ b/modules/nixos/system/tmp/default.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + namespace, + ... +}: +with lib; +with lib.${namespace}; +let + cfg = config.${namespace}.system.tmpfs; +in +{ + options.${namespace}.system.tmpfs = with types; { + enable = mkBoolOpt false "Whether or not to use tmpfs for /tmp."; + }; + + config = mkIf cfg.enable { + boot.tmp = { + cleanOnBoot = true; + tmpfsSize = "50%"; + useTmpfs = true; + }; + }; + +} diff --git a/systems/x86_64-linux/blarm/default.nix b/systems/x86_64-linux/blarm/default.nix index 37b87fb..62c6e56 100644 --- a/systems/x86_64-linux/blarm/default.nix +++ b/systems/x86_64-linux/blarm/default.nix @@ -56,16 +56,17 @@ with lib.${namespace}; cinny = enabled; ente-auth = enabled; restic = enabled; - linkwarden = { - enable = true; - secretsFile = "/run/secrets/linkwarden"; - }; + linkwarden = enabled; forgejo = enabled; }; #container.invidious = enabled; - system.sops = enabled; + system = { + sops = enabled; + tmpfs = enabled; + }; + cli.neovim = enabled; }; diff --git a/systems/x86_64-linux/bodenheizung/default.nix b/systems/x86_64-linux/bodenheizung/default.nix index 5957625..f20d01f 100644 --- a/systems/x86_64-linux/bodenheizung/default.nix +++ b/systems/x86_64-linux/bodenheizung/default.nix @@ -71,6 +71,7 @@ with lib.${namespace}; }; system = { + tmpfs = enabled; fonts = { enable = true; emoji = true; diff --git a/systems/x86_64-linux/dns/default.nix b/systems/x86_64-linux/dns/default.nix index ef20ab2..cc31b8e 100644 --- a/systems/x86_64-linux/dns/default.nix +++ b/systems/x86_64-linux/dns/default.nix @@ -39,8 +39,14 @@ with lib.${namespace}; eza = enabled; nh = enabled; }; + + system.tmpfs = true; }; + environment.systemPackages = with pkgs; [ + git + ]; + # Set your time zone time.timeZone = "Europe/Berlin";