diff --git a/flake.lock b/flake.lock index ec14e0d..d7b896a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747519437, - "narHash": "sha256-uv9Wv59d+mckS2CkorOF484wp2G5TNGijdoBZ5RkAk0=", + "lastModified": 1744375180, + "narHash": "sha256-s2FmOufSMIz6H0UrGOHJ7RrQfqvhCjUIvk54J8LlZFA=", "owner": "catppuccin", "repo": "nix", - "rev": "3ba714046ee32373e88166e6e9474d6ae6a5b734", + "rev": "75c26f52a685291fedfd3a9c93f5cbe80a5d3321", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1747426608, - "narHash": "sha256-ygRFvCVdVEAU95tH2EMMacYH/T42tC3mtDkt5lBJT9U=", + "lastModified": 1744328787, + "narHash": "sha256-VFOTTlWGZ9GWGGrz6F6ihXrsmm5IiGEKCmgfpM9+Y4E=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b1af4a597f359491f4b3197a845b39ec86db475a", + "rev": "b16324ef0be8c5eeef4c0eb23b9972fdb2fa50d5", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1744366945, + "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1744377435, + "narHash": "sha256-zT3zbkZjeKsjMktV7MAdruXQWpzpM7iVWHuhknYOuwY=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "6bccb54a4f98408f22d2e45921bb401f393f2174", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747463251, - "narHash": "sha256-Asncd1OZbhi27rVUyO3ubZk/q2XJ31QMO8cohoOUxC4=", + "lastModified": 1744308772, + "narHash": "sha256-gUOclfwgw/bSo3VMNmHrNXzIpaOgh1Yq9a3D3Dj/wgM=", "owner": "kaylorben", "repo": "nixcord", - "rev": "c1cb74a26c802a29a13ef9d9b287e01c3af5e1d0", + "rev": "76c3b99646d12437ec7183939eca911549e4d18f", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747467164, - "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1744103455, + "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index 91f2a64..248a1cc 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.homeModules.nixcord + inputs.nixcord.homeManagerModules.nixcord ]; puzzlevision = { @@ -44,8 +44,6 @@ steam ungoogled-chromium firefox - thunderbird - youtube-music ### Development #avra @@ -56,6 +54,7 @@ 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 1e1b267..329f47e 100644 --- a/modules/home/apps/zed/default.nix +++ b/modules/home/apps/zed/default.nix @@ -44,16 +44,6 @@ in { copilot = false; }; - formatter = { - external = { - command = "alejandra"; - arguments = ["--quiet"]; - language = ["nix"]; - }; - }; - - format_on_save = "on"; - ### Language specific configurations languages = { ### Nix language @@ -61,6 +51,17 @@ 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 4d56447..01e5f9b 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; [user-themes blur-my-shell appindicator unite color-picker clipboard-history]; + default = with pkgs.gnomeExtensions; [dash-to-dock 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 c510bbc..0fc27a0 100644 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -3,7 +3,8 @@ 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 24e69ef..d5bd6c4 100644 --- a/systems/x86_64-linux/puzzlevision/default.nix +++ b/systems/x86_64-linux/puzzlevision/default.nix @@ -15,13 +15,6 @@ # 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. @@ -90,7 +83,6 @@ nano inputs.ghostty.packages.x86_64-linux.default vlc - arduino-ide ## Security pinentry-tty