From 8d739f8c4c1f40e14dea45842aa49d6a0862e34b Mon Sep 17 00:00:00 2001 From: Jo Date: Sun, 18 May 2025 21:54:20 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20some=20new=20packages=20and?= =?UTF-8?q?=20update=20Zed=20formatter=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 54 +++++++++---------- .../x86_64-linux/jo@puzzlevision/default.nix | 4 +- modules/home/apps/zed/default.nix | 21 ++++---- modules/home/desktop/gnome/default.nix | 2 +- modules/nixos/services/traefik/default.nix | 3 +- systems/x86_64-linux/puzzlevision/default.nix | 8 +++ 6 files changed, 49 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index d7b896a..3f1de31 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1744375180, - "narHash": "sha256-s2FmOufSMIz6H0UrGOHJ7RrQfqvhCjUIvk54J8LlZFA=", + "lastModified": 1745598511, + "narHash": "sha256-GWYB7PngGwTJrp7gr0w6E5nnvwiblPvN2kjRCQw3ZEg=", "owner": "catppuccin", "repo": "nix", - "rev": "75c26f52a685291fedfd3a9c93f5cbe80a5d3321", + "rev": "199cb288a85b15ed203089804c024ae5b3eacd7c", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1744328787, - "narHash": "sha256-VFOTTlWGZ9GWGGrz6F6ihXrsmm5IiGEKCmgfpM9+Y4E=", + "lastModified": 1745877499, + "narHash": "sha256-t6weillR9Wee4S40Ey0l71ZIiRX9gNCMJTbmoFY/j/I=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b16324ef0be8c5eeef4c0eb23b9972fdb2fa50d5", + "rev": "9a4419ce85b11b66af6b1c6974be6c848a4cc5e4", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1744377435, - "narHash": "sha256-zT3zbkZjeKsjMktV7MAdruXQWpzpM7iVWHuhknYOuwY=", + "lastModified": 1745894335, + "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bccb54a4f98408f22d2e45921bb401f393f2174", + "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744308772, - "narHash": "sha256-gUOclfwgw/bSo3VMNmHrNXzIpaOgh1Yq9a3D3Dj/wgM=", + "lastModified": 1745954196, + "narHash": "sha256-kthI7ppoiBtAxTrcfNuA2eGQ6z5jsYm0fEKD06vEPWM=", "owner": "kaylorben", "repo": "nixcord", - "rev": "76c3b99646d12437ec7183939eca911549e4d18f", + "rev": "a1831fdf128ae74428534baaf5328a479bc80643", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1745900683, + "narHash": "sha256-ZGi2gjgPtmPmplCVz7dNufqkBr00g6EeAloX3GrFQls=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "ffa0bb043c25cfc79ff3bc20ba2e44c3724499b1", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index 248a1cc..519cbbc 100644 --- a/homes/x86_64-linux/jo@puzzlevision/default.nix +++ b/homes/x86_64-linux/jo@puzzlevision/default.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.nixcord.homeManagerModules.nixcord + inputs.nixcord.homeModules.nixcord ]; puzzlevision = { @@ -44,6 +44,7 @@ steam ungoogled-chromium firefox + thunderbird ### Development #avra @@ -54,7 +55,6 @@ devenv nixd deno - nh ### Work teams-for-linux diff --git a/modules/home/apps/zed/default.nix b/modules/home/apps/zed/default.nix index 329f47e..1e1b267 100644 --- a/modules/home/apps/zed/default.nix +++ b/modules/home/apps/zed/default.nix @@ -44,6 +44,16 @@ in { copilot = false; }; + formatter = { + external = { + command = "alejandra"; + arguments = ["--quiet"]; + language = ["nix"]; + }; + }; + + format_on_save = "on"; + ### Language specific configurations languages = { ### Nix language @@ -51,17 +61,6 @@ in { language_servers = [ "nixd" "!nil" ]; }; }; - - ### LSP configurations - lsp = { - nixd = { - initialization_options = { - formatting = { - command = ["alejandra" "--quiet" "--"]; - }; - }; - }; - }; }; extraPackages = with pkgs; [ nixd ]; diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix index 01e5f9b..4d56447 100644 --- a/modules/home/desktop/gnome/default.nix +++ b/modules/home/desktop/gnome/default.nix @@ -13,7 +13,7 @@ in { options.${namespace}.desktop.gnome = with lib.types; { enabled-extensions = mkOption { type = listOf package; - default = with pkgs.gnomeExtensions; [dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history]; + default = with pkgs.gnomeExtensions; [user-themes blur-my-shell appindicator unite color-picker clipboard-history]; example = [dash-to-dock blur-my-shell]; description = "Specify gnome extensions to install."; }; diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index 0fc27a0..c510bbc 100644 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -3,8 +3,7 @@ namespace, config, ... -}: -let +}: let inherit (lib) mkEnableOption mkIf mkOption; cfg = config.${namespace}.services.traefik; in { diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix index d5bd6c4..24e69ef 100644 --- a/systems/x86_64-linux/puzzlevision/default.nix +++ b/systems/x86_64-linux/puzzlevision/default.nix @@ -15,6 +15,13 @@ # Configure SWAP swapDevices = [{ device = "/swapfile"; size = 8 * 1024; }]; # 8 GB swap partition + # Add Steam + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + # Configure Sops sops.defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml"; sops.age.keyFile = "/var/lib/sops-nix/key.txt"; # The main AGE key is expected in this location, it is only needed for this system. @@ -83,6 +90,7 @@ nano inputs.ghostty.packages.x86_64-linux.default vlc + arduino-ide ## Security pinentry-tty