diff --git a/flake.nix b/flake.nix index 98dc18b..4e213fd 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ outputs = { flake-parts, - nixpkgs, ... } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { @@ -16,7 +15,6 @@ "x86_64-linux" "aarch64-linux" ]; - }; inputs = { diff --git a/hosts/default.nix b/hosts/default.nix index 636f929..60543e1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -44,7 +44,7 @@ with lib; let ../modules/base ../modules/programs (mkSystemImports hostname) - { nixpkgs.config.allowUnfree = true; } + {nixpkgs.config.allowUnfree = true;} ] ++ modules ++ ( diff --git a/hosts/desktop/boot.nix b/hosts/desktop/boot.nix index 8e06601..ef816ad 100644 --- a/hosts/desktop/boot.nix +++ b/hosts/desktop/boot.nix @@ -1,3 +1,3 @@ _: { boot.loader.systemd-boot.windows."11".efiDeviceHandle = "HD1d"; -} \ No newline at end of file +} diff --git a/hosts/desktop/nvidia.nix b/hosts/desktop/nvidia.nix index 6d4b225..5488b49 100644 --- a/hosts/desktop/nvidia.nix +++ b/hosts/desktop/nvidia.nix @@ -1,7 +1,4 @@ -{ - config, - ... -}: { +{config, ...}: { hardware = { graphics = { enable = true; diff --git a/hosts/laptop/zwift.nix b/hosts/laptop/zwift.nix index 944cf1f..bf42e2e 100644 --- a/hosts/laptop/zwift.nix +++ b/hosts/laptop/zwift.nix @@ -4,4 +4,4 @@ _: { environment.variables = { WINE_EXPERIMENTAL_WAYLAND = "1"; }; -} \ No newline at end of file +} diff --git a/legacy_modules/apps/pycharm.nix b/legacy_modules/apps/pycharm.nix index 3319ebb..5186318 100644 --- a/legacy_modules/apps/pycharm.nix +++ b/legacy_modules/apps/pycharm.nix @@ -1,5 +1,4 @@ -{pkgsUnstable, ...}: -let +{pkgsUnstable, ...}: let pycharmPkg = pkgsUnstable.jetbrains.pycharm-professional.override { # -Dide.browser.jcef.enabled causes crashes on wayland vmopts = '' @@ -11,7 +10,6 @@ let # pycharmWithPlugins = pkgsUnstable.jetbrains.plugins.addPlugins pycharmPkg [ # "github-copilot" # ]; - in { environment.systemPackages = [ pycharmPkg diff --git a/legacy_modules/apps/vscode.nix b/legacy_modules/apps/vscode.nix index 65e759b..196b3ea 100644 --- a/legacy_modules/apps/vscode.nix +++ b/legacy_modules/apps/vscode.nix @@ -17,20 +17,26 @@ }; }; - mkMcpStdio = {name, command, env ? {}}: let + mkMcpStdio = { + name, + command, + env ? {}, + }: let # If any of the envs values starts with ${input:...}, then we should create a new password input envValues = lib.attrValues env; inputEnvs = lib.filter (value: lib.hasPrefix "\${input:" value) envValues; - # Get the ids of the inputs + # Get the ids of the inputs inputEnvsIds = lib.map (value: lib.substring 8 (lib.stringLength value - 9) value) inputEnvs; in { mcp = { - inputs = lib.map (value: { - "type" = "promptString"; - "id" = value; # Assigning the name as the id - "description" = "Enter the password for ${value}"; - "password" = true; - }) inputEnvsIds; + inputs = + lib.map (value: { + "type" = "promptString"; + "id" = value; # Assigning the name as the id + "description" = "Enter the password for ${value}"; + "password" = true; + }) + inputEnvsIds; servers."${name}" = { "type" = "stdio"; "command" = builtins.elemAt command 0; @@ -40,7 +46,6 @@ }; }; - # I can't get nix-vscode-extensions to respect allowUnfree, so this is a workaround allowUnfree = ext: ext.override {meta.license = [];}; in { @@ -108,8 +113,14 @@ in { } (mkFormatter "esbenp.prettier-vscode" ["json" "jsonc" "markdown" "css" "scss" "typescript" "typescriptreact" "html" "yaml"]) (mkFormatter "charliermarsh.ruff" ["python"]) - (mkMcpStdio {name = "linear"; command = ["npx" "mcp-remote" "https://mcp.linear.app/sse"];}) - (mkMcpStdio {name = "sentry"; command = ["npx" "mcp-remote" "https://mcp.sentry.dev/sse"];}) + (mkMcpStdio { + name = "linear"; + command = ["npx" "mcp-remote" "https://mcp.linear.app/sse"]; + }) + (mkMcpStdio { + name = "sentry"; + command = ["npx" "mcp-remote" "https://mcp.sentry.dev/sse"]; + }) ]; extensions = with vscodePkgs; [ # Remote diff --git a/legacy_modules/desktop/niri.nix b/legacy_modules/desktop/niri.nix index 6554e7c..8a03a8b 100644 --- a/legacy_modules/desktop/niri.nix +++ b/legacy_modules/desktop/niri.nix @@ -37,7 +37,7 @@ color: #DAD8CE; border-bottom: 2px solid #CF6A4C; } - + #workspaces button.focused { background: #CF6A4C; color: #1C1B1A; @@ -96,8 +96,6 @@ programs.niri = { enable = true; - # package = (pkgsUnstable.niri.override { inherit (mesa-nixpkgs) libgbm; }); - # package = pkgsUnstable.niri; package = inputs.niri.packages."${pkgs.system}".niri-unstable; }; fireproof.home-manager.programs.niri.settings = { @@ -149,19 +147,19 @@ workspaces = { "01" = { - open-on-output = "DP-3"; + open-on-output = "DP-5"; }; "02" = { - open-on-output = "DP-3"; + open-on-output = "DP-5"; }; "03" = { - open-on-output = "DP-3"; + open-on-output = "DP-5"; }; "04" = { - open-on-output = "DP-3"; + open-on-output = "DP-5"; }; "05" = { - open-on-output = "DP-3"; + open-on-output = "DP-5"; }; }; diff --git a/legacy_modules/dev/javascript.nix b/legacy_modules/dev/javascript.nix index fc67831..cdbdce3 100644 --- a/legacy_modules/dev/javascript.nix +++ b/legacy_modules/dev/javascript.nix @@ -1,4 +1,8 @@ -{pkgs, pkgsUnstable, ...}: { +{ + pkgs, + pkgsUnstable, + ... +}: { environment.systemPackages = [ pkgs.nodejs pkgsUnstable.pnpm diff --git a/legacy_modules/dev/playwright.nix b/legacy_modules/dev/playwright.nix index 25e1c96..675bac6 100644 --- a/legacy_modules/dev/playwright.nix +++ b/legacy_modules/dev/playwright.nix @@ -3,4 +3,4 @@ set -xg PLAYWRIGHT_BROWSERS_PATH ${pkgsUnstable.playwright-driver.browsers} set -xg PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS true ''; -} \ No newline at end of file +} diff --git a/modules/base/default.nix b/modules/base/default.nix index ff23298..04a2943 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -19,4 +19,4 @@ _: { ./user.nix ./yubikey.nix ]; -} \ No newline at end of file +} diff --git a/modules/base/defaults.nix b/modules/base/defaults.nix index 2a3c461..191c32e 100644 --- a/modules/base/defaults.nix +++ b/modules/base/defaults.nix @@ -1,5 +1,4 @@ -{lib, ...}: -{ +{lib, ...}: { options.fireproof.base.defaults = { terminal = lib.mkOption { type = lib.types.str; diff --git a/modules/base/hosts.nix b/modules/base/hosts.nix index b86e1c6..c199c4c 100644 --- a/modules/base/hosts.nix +++ b/modules/base/hosts.nix @@ -1,7 +1,4 @@ -{ - config, - ... -}: { +{config, ...}: { age.secrets.hosts-private = { # Contains IP addresses that i have no business sharing rekeyFile = ../../secrets/hosts-private.age; diff --git a/modules/base/keyd.nix b/modules/base/keyd.nix index af0814f..7bf05f6 100644 --- a/modules/base/keyd.nix +++ b/modules/base/keyd.nix @@ -3,7 +3,7 @@ _: { enable = true; keyboards.mouse = { ids = [ - "046d:c051:4ae65a29" # Work mouse + "046d:c051:4ae65a29" # Work mouse ]; settings = { main = { diff --git a/modules/base/networking.nix b/modules/base/networking.nix index 4e044ab..f4a0323 100644 --- a/modules/base/networking.nix +++ b/modules/base/networking.nix @@ -1,7 +1,4 @@ -{ - hostname, - ... -}: { +{hostname, ...}: { networking = { hostName = hostname; }; diff --git a/modules/base/user.nix b/modules/base/user.nix index a880e2a..7ab4840 100644 --- a/modules/base/user.nix +++ b/modules/base/user.nix @@ -2,8 +2,7 @@ username, config, ... -}: -let +}: let inherit (config.age) secrets; in { config = { diff --git a/modules/programs/claude.nix b/modules/programs/claude.nix index 3eb07e9..d88ba8b 100644 --- a/modules/programs/claude.nix +++ b/modules/programs/claude.nix @@ -2,4 +2,4 @@ environment.systemPackages = [ pkgsUnstable.claude-code ]; -} \ No newline at end of file +}