ran linter

This commit is contained in:
Leyla Becker 2024-10-03 16:50:46 +02:00
parent cfa0f64f70
commit 48a321fbd5
7 changed files with 48 additions and 49 deletions

View file

@ -122,7 +122,7 @@
automatic-timezoned = { automatic-timezoned = {
enable = true; enable = true;
}; };
openssh = { openssh = {
enable = true; enable = true;
ports = [22]; ports = [22];
@ -154,7 +154,7 @@
iputils iputils
dnsutils dnsutils
]; ];
sessionVariables = rec { sessionVariables = rec {
SOPS_AGE_KEY_DIRECTORY = "/var/lib/sops-nix"; SOPS_AGE_KEY_DIRECTORY = "/var/lib/sops-nix";
SOPS_AGE_KEY_FILE = "${SOPS_AGE_KEY_DIRECTORY}/key.txt"; SOPS_AGE_KEY_FILE = "${SOPS_AGE_KEY_DIRECTORY}/key.txt";

View file

@ -69,11 +69,12 @@
horizon = nixpkgs.lib.nixosSystem { horizon = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules = [
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = {inherit inputs;};
} }
./hosts/horizon/configuration.nix ./hosts/horizon/configuration.nix
nixos-hardware.nixosModules.framework-11th-gen-intel nixos-hardware.nixosModules.framework-11th-gen-intel
@ -83,11 +84,12 @@
twilight = nixpkgs.lib.nixosSystem { twilight = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules = [
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = {inherit inputs;};
} }
./hosts/twilight/configuration.nix ./hosts/twilight/configuration.nix
]; ];
@ -97,11 +99,12 @@
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = {inherit inputs;};
} }
./hosts/defiant/disko-config.nix ./hosts/defiant/disko-config.nix
./hosts/defiant/configuration.nix ./hosts/defiant/configuration.nix

View file

@ -14,7 +14,6 @@
../../enviroments/server ../../enviroments/server
]; ];
home-manager.users.leyla.config = { home-manager.users.leyla.config = {
isThinUser = true; isThinUser = true;
}; };

View file

@ -2,4 +2,4 @@
leyla = import ./leyla/home.nix; leyla = import ./leyla/home.nix;
# ester = import ./ester/home.nix; # ester = import ./ester/home.nix;
# eve = import ./eve/home.nix; # eve = import ./eve/home.nix;
} }

View file

@ -57,7 +57,6 @@ in {
acceleration = lib.mkIf cfg.hasGPU "cuda"; acceleration = lib.mkIf cfg.hasGPU "cuda";
}; };
# TODO: this should reference the home directory from the user config # TODO: this should reference the home directory from the user config
openssh.hostKeys = [ openssh.hostKeys = [
{ {

View file

@ -105,7 +105,7 @@
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
bash.enable = true; # see note on other shells below bash.enable = true; # see note on other shells below
# firefox = { # firefox = {
# enable = true; # enable = true;
# profiles.leyla = { # profiles.leyla = {

View file

@ -5,8 +5,7 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: }: {
{
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.nix-vscode-extensions.overlays.default inputs.nix-vscode-extensions.overlays.default
@ -18,14 +17,13 @@
code = "codium"; code = "codium";
}; };
vscode = let vscode = let
extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system}; extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
open-vsx = extensions.open-vsx; open-vsx = extensions.open-vsx;
vscode-marketplace = extensions.vscode-marketplace; vscode-marketplace = extensions.vscode-marketplace;
in in {
{
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
mutableExtensionsDir = false; mutableExtensionsDir = false;
@ -36,44 +34,44 @@
"workbench.colorTheme" = "Atom One Dark"; "workbench.colorTheme" = "Atom One Dark";
}; };
extensions = with extensions.open-vsx; [ extensions = with extensions.open-vsx;
# vs code feel extensions [
ms-vscode.atom-keybindings # vs code feel extensions
akamud.vscode-theme-onedark ms-vscode.atom-keybindings
streetsidesoftware.code-spell-checker akamud.vscode-theme-onedark
streetsidesoftware.code-spell-checker-german streetsidesoftware.code-spell-checker
streetsidesoftware.code-spell-checker-italian streetsidesoftware.code-spell-checker-german
jeanp413.open-remote-ssh streetsidesoftware.code-spell-checker-italian
jeanp413.open-remote-ssh
# nix extensions # nix extensions
pinage404.nix-extension-pack pinage404.nix-extension-pack
jnoortheen.nix-ide jnoortheen.nix-ide
# html extensions # html extensions
formulahendry.auto-rename-tag formulahendry.auto-rename-tag
ms-vscode.live-server ms-vscode.live-server
# js extensions # js extensions
dsznajder.es7-react-js-snippets dsznajder.es7-react-js-snippets
dbaeumer.vscode-eslint dbaeumer.vscode-eslint
standard.vscode-standard standard.vscode-standard
firsttris.vscode-jest-runner firsttris.vscode-jest-runner
stylelint.vscode-stylelint stylelint.vscode-stylelint
tauri-apps.tauri-vscode tauri-apps.tauri-vscode
# misc extensions # misc extensions
bungcip.better-toml bungcip.better-toml
# the number at the start of the name here doesnt resolve nicely so we have to refernce it as a part of open-vsx directly instead of though with # the number at the start of the name here doesnt resolve nicely so we have to refernce it as a part of open-vsx directly instead of though with
open-vsx."10nates".ollama-autocoder open-vsx."10nates".ollama-autocoder
] ]
++ (with extensions.vscode-marketplace; [ ++ (with extensions.vscode-marketplace; [
# js extensions # js extensions
karyfoundation.nearley karyfoundation.nearley
]); ]);
}; };
# steam = lib.mkIf config.isFullUser { # steam = lib.mkIf config.isFullUser {
# enable = true; # enable = true;
# remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play