diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index e32e6bc..49045c9 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -1,4 +1,11 @@ -{pkgs, inputs, lib, config, ...}: { +{ + pkgs, + inputs, + lib, + config, + ... +}: +{ imports = [ # ../../modules ../../modules/common-packages.nix @@ -89,7 +96,6 @@ "mac" # TODO change mac user to osbm ]; - # nix.nixPath = ["nixpkgs=${pkgs.path}"]; system.configurationRevision = inputs.self.rev or "dirty"; @@ -106,11 +112,14 @@ alacritty # ghostty kitty - vscode git lazygit + vscode + git + lazygit # blender # libreoffice # ungoogled-chromium - code-cursor ollama + code-cursor + ollama ]; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; diff --git a/darwinHosts/prometheus/dummy-module.nix b/darwinHosts/prometheus/dummy-module.nix index 7058a17..aebd406 100644 --- a/darwinHosts/prometheus/dummy-module.nix +++ b/darwinHosts/prometheus/dummy-module.nix @@ -1,4 +1,4 @@ -{lib, ...}: +{ lib, ... }: { options = { myModules.enableKDE = lib.mkOption { @@ -7,4 +7,4 @@ description = "Enable KDE Plasma"; }; }; -} \ No newline at end of file +} diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 78019b2..c3dad62 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -19,7 +19,6 @@ enableSound = true; }; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index ce297d6..3c69a78 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,12 +3,13 @@ inputs, ... }: - { - environment.systemPackages = with pkgs; [ - (if !pkgs.stdenv.hostPlatform.isDarwin - then - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default - else nano +{ + environment.systemPackages = with pkgs; [ + ( + if !pkgs.stdenv.hostPlatform.isDarwin then + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default + else + nano ) wget git diff --git a/modules/nix-index.nix b/modules/nix-index.nix index e402d2f..4970c07 100644 --- a/modules/nix-index.nix +++ b/modules/nix-index.nix @@ -1,8 +1,9 @@ -{inputs, ...}: { +{ inputs, ... }: +{ imports = [ inputs.nix-index-database.nixosModules.nix-index ]; programs.nix-index-database.comma.enable = true; programs.command-not-found.enable = false; # TODO fix ts -} \ No newline at end of file +} diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 0f8917d..901d928 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,7 +1,7 @@ { - config, - outputs, - lib, + config, + outputs, + lib, ... }: { @@ -12,7 +12,10 @@ nix.buildMachines = [ { hostName = "ymir"; - systems = ["x86_64-linux" "aarch64-linux"]; + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; sshUser = "osbm"; @@ -20,7 +23,7 @@ } { hostName = "wallfacer"; - systems = ["x86_64-linux"]; + systems = [ "x86_64-linux" ]; supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; sshUser = "osbm"; diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index 1f530f0..842db16 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -18,21 +18,21 @@ enable = true; startWhenNeeded = true; settings = { - PermitRootLogin = "no"; + PermitRootLogin = "no"; - # only allow key based logins and not password - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - AuthenticationMethods = "publickey"; - PubkeyAuthentication = "yes"; - ChallengeResponseAuthentication = "no"; - UsePAM = false; + # only allow key based logins and not password + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + AuthenticationMethods = "publickey"; + PubkeyAuthentication = "yes"; + ChallengeResponseAuthentication = "no"; + UsePAM = false; - # kick out inactive sessions - ClientAliveCountMax = 5; - ClientAliveInterval = 60; + # kick out inactive sessions + ClientAliveCountMax = 5; + ClientAliveInterval = 60; }; - }; + }; }) ]; diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 1a6ba51..1c0e974 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -5,24 +5,28 @@ ... }: let - python = let - packageOverrides = self: super: { - imageio = super.imageio.overridePythonAttrs (old: { - disabledTests = [ - "test_read_stream" - "test_uri_reading" - "test_trim_filter" - "test_process_termination" - ]; - }); - plotly = super.plotly.overridePythonAttrs (old: { - disabledTestPaths = (old.disabledTestPaths or []) ++ [ - "tests/test_optional/test_kaleido/test_kaleido.py" - ]; - }); + python = + let + packageOverrides = self: super: { + imageio = super.imageio.overridePythonAttrs (old: { + disabledTests = [ + "test_read_stream" + "test_uri_reading" + "test_trim_filter" + "test_process_termination" + ]; + }); + plotly = super.plotly.overridePythonAttrs (old: { + disabledTestPaths = (old.disabledTestPaths or [ ]) ++ [ + "tests/test_optional/test_kaleido/test_kaleido.py" + ]; + }); + }; + in + pkgs.python313.override { + inherit packageOverrides; + self = python; }; - in - pkgs.python313.override { inherit packageOverrides; self = python; }; wanikani-stats-flask = pkgs.writeShellApplication { name = "wanikani-stats-flask"; runtimeInputs = [ diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix index 08a1eb7..a878015 100644 --- a/modules/virtualisation.nix +++ b/modules/virtualisation.nix @@ -1,3 +1,3 @@ { - virtualisation.docker.enable = true; -} \ No newline at end of file + virtualisation.docker.enable = true; +}