mirror of
https://github.com/nickolaj-jepsen/nixos.git
synced 2026-01-22 16:16:50 +01:00
chore: fix lint
This commit is contained in:
parent
94194bf902
commit
b02ef14ef1
17 changed files with 46 additions and 48 deletions
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
flake-parts,
|
flake-parts,
|
||||||
nixpkgs,
|
|
||||||
...
|
...
|
||||||
} @ inputs:
|
} @ inputs:
|
||||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||||
|
|
@ -16,7 +15,6 @@
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ with lib; let
|
||||||
../modules/base
|
../modules/base
|
||||||
../modules/programs
|
../modules/programs
|
||||||
(mkSystemImports hostname)
|
(mkSystemImports hostname)
|
||||||
{ nixpkgs.config.allowUnfree = true; }
|
{nixpkgs.config.allowUnfree = true;}
|
||||||
]
|
]
|
||||||
++ modules
|
++ modules
|
||||||
++ (
|
++ (
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{config, ...}: {
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
hardware = {
|
hardware = {
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{pkgsUnstable, ...}:
|
{pkgsUnstable, ...}: let
|
||||||
let
|
|
||||||
pycharmPkg = pkgsUnstable.jetbrains.pycharm-professional.override {
|
pycharmPkg = pkgsUnstable.jetbrains.pycharm-professional.override {
|
||||||
# -Dide.browser.jcef.enabled causes crashes on wayland
|
# -Dide.browser.jcef.enabled causes crashes on wayland
|
||||||
vmopts = ''
|
vmopts = ''
|
||||||
|
|
@ -11,7 +10,6 @@ let
|
||||||
# pycharmWithPlugins = pkgsUnstable.jetbrains.plugins.addPlugins pycharmPkg [
|
# pycharmWithPlugins = pkgsUnstable.jetbrains.plugins.addPlugins pycharmPkg [
|
||||||
# "github-copilot"
|
# "github-copilot"
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pycharmPkg
|
pycharmPkg
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
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
|
# If any of the envs values starts with ${input:...}, then we should create a new password input
|
||||||
envValues = lib.attrValues env;
|
envValues = lib.attrValues env;
|
||||||
inputEnvs = lib.filter (value: lib.hasPrefix "\${input:" value) envValues;
|
inputEnvs = lib.filter (value: lib.hasPrefix "\${input:" value) envValues;
|
||||||
|
|
@ -25,12 +29,14 @@
|
||||||
inputEnvsIds = lib.map (value: lib.substring 8 (lib.stringLength value - 9) value) inputEnvs;
|
inputEnvsIds = lib.map (value: lib.substring 8 (lib.stringLength value - 9) value) inputEnvs;
|
||||||
in {
|
in {
|
||||||
mcp = {
|
mcp = {
|
||||||
inputs = lib.map (value: {
|
inputs =
|
||||||
"type" = "promptString";
|
lib.map (value: {
|
||||||
"id" = value; # Assigning the name as the id
|
"type" = "promptString";
|
||||||
"description" = "Enter the password for ${value}";
|
"id" = value; # Assigning the name as the id
|
||||||
"password" = true;
|
"description" = "Enter the password for ${value}";
|
||||||
}) inputEnvsIds;
|
"password" = true;
|
||||||
|
})
|
||||||
|
inputEnvsIds;
|
||||||
servers."${name}" = {
|
servers."${name}" = {
|
||||||
"type" = "stdio";
|
"type" = "stdio";
|
||||||
"command" = builtins.elemAt command 0;
|
"command" = builtins.elemAt command 0;
|
||||||
|
|
@ -40,7 +46,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# I can't get nix-vscode-extensions to respect allowUnfree, so this is a workaround
|
# I can't get nix-vscode-extensions to respect allowUnfree, so this is a workaround
|
||||||
allowUnfree = ext: ext.override {meta.license = [];};
|
allowUnfree = ext: ext.override {meta.license = [];};
|
||||||
in {
|
in {
|
||||||
|
|
@ -108,8 +113,14 @@ in {
|
||||||
}
|
}
|
||||||
(mkFormatter "esbenp.prettier-vscode" ["json" "jsonc" "markdown" "css" "scss" "typescript" "typescriptreact" "html" "yaml"])
|
(mkFormatter "esbenp.prettier-vscode" ["json" "jsonc" "markdown" "css" "scss" "typescript" "typescriptreact" "html" "yaml"])
|
||||||
(mkFormatter "charliermarsh.ruff" ["python"])
|
(mkFormatter "charliermarsh.ruff" ["python"])
|
||||||
(mkMcpStdio {name = "linear"; command = ["npx" "mcp-remote" "https://mcp.linear.app/sse"];})
|
(mkMcpStdio {
|
||||||
(mkMcpStdio {name = "sentry"; command = ["npx" "mcp-remote" "https://mcp.sentry.dev/sse"];})
|
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; [
|
extensions = with vscodePkgs; [
|
||||||
# Remote
|
# Remote
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,6 @@
|
||||||
|
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# package = (pkgsUnstable.niri.override { inherit (mesa-nixpkgs) libgbm; });
|
|
||||||
# package = pkgsUnstable.niri;
|
|
||||||
package = inputs.niri.packages."${pkgs.system}".niri-unstable;
|
package = inputs.niri.packages."${pkgs.system}".niri-unstable;
|
||||||
};
|
};
|
||||||
fireproof.home-manager.programs.niri.settings = {
|
fireproof.home-manager.programs.niri.settings = {
|
||||||
|
|
@ -149,19 +147,19 @@
|
||||||
|
|
||||||
workspaces = {
|
workspaces = {
|
||||||
"01" = {
|
"01" = {
|
||||||
open-on-output = "DP-3";
|
open-on-output = "DP-5";
|
||||||
};
|
};
|
||||||
"02" = {
|
"02" = {
|
||||||
open-on-output = "DP-3";
|
open-on-output = "DP-5";
|
||||||
};
|
};
|
||||||
"03" = {
|
"03" = {
|
||||||
open-on-output = "DP-3";
|
open-on-output = "DP-5";
|
||||||
};
|
};
|
||||||
"04" = {
|
"04" = {
|
||||||
open-on-output = "DP-3";
|
open-on-output = "DP-5";
|
||||||
};
|
};
|
||||||
"05" = {
|
"05" = {
|
||||||
open-on-output = "DP-3";
|
open-on-output = "DP-5";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,8 @@
|
||||||
{pkgs, pkgsUnstable, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
pkgsUnstable,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.nodejs
|
pkgs.nodejs
|
||||||
pkgsUnstable.pnpm
|
pkgsUnstable.pnpm
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{lib, ...}:
|
{lib, ...}: {
|
||||||
{
|
|
||||||
options.fireproof.base.defaults = {
|
options.fireproof.base.defaults = {
|
||||||
terminal = lib.mkOption {
|
terminal = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{config, ...}: {
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
age.secrets.hosts-private = {
|
age.secrets.hosts-private = {
|
||||||
# Contains IP addresses that i have no business sharing
|
# Contains IP addresses that i have no business sharing
|
||||||
rekeyFile = ../../secrets/hosts-private.age;
|
rekeyFile = ../../secrets/hosts-private.age;
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ _: {
|
||||||
enable = true;
|
enable = true;
|
||||||
keyboards.mouse = {
|
keyboards.mouse = {
|
||||||
ids = [
|
ids = [
|
||||||
"046d:c051:4ae65a29" # Work mouse
|
"046d:c051:4ae65a29" # Work mouse
|
||||||
];
|
];
|
||||||
settings = {
|
settings = {
|
||||||
main = {
|
main = {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{hostname, ...}: {
|
||||||
hostname,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = hostname;
|
hostName = hostname;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,7 @@
|
||||||
username,
|
username,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
inherit (config.age) secrets;
|
inherit (config.age) secrets;
|
||||||
in {
|
in {
|
||||||
config = {
|
config = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue