diff --git a/flake.lock b/flake.lock index 4beb7e2..9c5c45e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1747403139, - "narHash": "sha256-GpldCFeC+YP9m2xm1POByfT3+9J9/nwst0CYxvR85I0=", + "lastModified": 1747022610, + "narHash": "sha256-d6SvA0gTHDrOqt4tZRVD0Gm5G4w6jAFJ6lis79PjSPw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "1ebb2cf654110901889353440027993312e1aeb0", + "rev": "d4b3ffe3e719e42b175ccdef13598516f0a8025d", "type": "gitlab" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1747427366, - "narHash": "sha256-c3UfEsnT94bt6ta1VELYQhAWkQWFGlB+7DmBmthlGGg=", + "lastModified": 1747021744, + "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", "owner": "nix-community", "repo": "home-manager", - "rev": "74d31e1165341bf510ee2017841a599f5cfc1608", + "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1747389489, - "narHash": "sha256-PN5lxjC+Oh4oANayNRN0deD4F8N5yZ1Zw+NI9SfQt80=", + "lastModified": 1746940940, + "narHash": "sha256-ASB3QVEoFK5//280uedYdt8jyDLhFa9zgj8qfc0S7Sk=", "owner": "notashelf", "repo": "nvf", - "rev": "74587e254ac7f8f7a7eca58aede14badde20dee6", + "rev": "815ed49d3693346122ef61da6d7443cd3cc21752", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "stable": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1746810718, + "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "type": "github" }, "original": { diff --git a/modules/home/apps/kitty/default.nix b/modules/home/apps/kitty/default.nix index 4457ff1..78a2738 100644 --- a/modules/home/apps/kitty/default.nix +++ b/modules/home/apps/kitty/default.nix @@ -20,8 +20,7 @@ let cursor_shape = "Beam"; }; defaultFont = { - name = "Hack Nerd Font Mono"; - package = pkgs.nerd-fonts.hack; + name = "Hack Nerd Font"; size = 12; }; in @@ -34,10 +33,7 @@ in }; config = mkIf cfg.enable { - home.packages = [ - pkgs.kitty-themes - defaultFont.package - ]; # fc-cache -fv clear fontconfig when error + home.packages = [ pkgs.kitty-themes ]; programs.kitty = { enable = true; themeFile = "tokyo_night_night"; diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index 4389090..f7b6201 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -48,7 +48,6 @@ in kdiskmark networkmanager kdePackages.networkmanager-qt - kdePackages.wallpaper-engine-plugin ]; }; diff --git a/modules/nixos/services/linkwarden/default.nix b/modules/nixos/services/linkwarden/default.nix index 79aa195..b67a057 100644 --- a/modules/nixos/services/linkwarden/default.nix +++ b/modules/nixos/services/linkwarden/default.nix @@ -53,7 +53,6 @@ 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. diff --git a/modules/nixos/system/tmp/default.nix b/modules/nixos/system/tmp/default.nix deleted file mode 100644 index 6162fe3..0000000 --- a/modules/nixos/system/tmp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - 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 62c6e56..37b87fb 100644 --- a/systems/x86_64-linux/blarm/default.nix +++ b/systems/x86_64-linux/blarm/default.nix @@ -56,17 +56,16 @@ with lib.${namespace}; cinny = enabled; ente-auth = enabled; restic = enabled; - linkwarden = enabled; + linkwarden = { + enable = true; + secretsFile = "/run/secrets/linkwarden"; + }; forgejo = enabled; }; #container.invidious = enabled; - system = { - sops = enabled; - tmpfs = enabled; - }; - + system.sops = enabled; cli.neovim = enabled; }; diff --git a/systems/x86_64-linux/bodenheizung/default.nix b/systems/x86_64-linux/bodenheizung/default.nix index f20d01f..5957625 100644 --- a/systems/x86_64-linux/bodenheizung/default.nix +++ b/systems/x86_64-linux/bodenheizung/default.nix @@ -71,7 +71,6 @@ 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 cc31b8e..ef20ab2 100644 --- a/systems/x86_64-linux/dns/default.nix +++ b/systems/x86_64-linux/dns/default.nix @@ -39,14 +39,8 @@ with lib.${namespace}; eza = enabled; nh = enabled; }; - - system.tmpfs = true; }; - environment.systemPackages = with pkgs; [ - git - ]; - # Set your time zone time.timeZone = "Europe/Berlin";