diff options
| -rw-r--r-- | configurations/eonwe/default.nix | 6 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | modules/common/shell/default.nix | 4 | ||||
| -rw-r--r-- | modules/profiles/dev/default.nix | 10 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 8 |
5 files changed, 19 insertions, 17 deletions
diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix index 37653de..8ee224b 100644 --- a/configurations/eonwe/default.nix +++ b/configurations/eonwe/default.nix @@ -163,12 +163,6 @@ with lib; }; }; - languagetool = { - enable = true; - port = 8081; - allowOrigin = "*"; - }; - smartd = { enable = true; notifications.mail = { diff --git a/flake.nix b/flake.nix index 527ea3f..fe42cb6 100644 --- a/flake.nix +++ b/flake.nix @@ -50,14 +50,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - # agenix-rekey = { - # url = "github:oddlama/agenix-rekey"; - # inputs = { - # flake-utils.follows = "flake-utils"; - # nixpkgs.follows = "nixpkgs"; - # pre-commit-hooks.follows = "git-hooks"; - # }; - # }; infuse = { url = "git+https://codeberg.org/amjoseph/infuse.nix"; diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix index cacb411..6c0b78f 100644 --- a/modules/common/shell/default.nix +++ b/modules/common/shell/default.nix @@ -80,7 +80,7 @@ in let pkg = if this.isHeadful then - (pkgs.coreutils.overrideAttrs ( + pkgs.coreutils.overrideAttrs ( _: super: { patches = (super.patches or [ ]) ++ [ (pkgs.fetchpatch { @@ -89,7 +89,7 @@ in }) ]; } - )) + ) else pkgs.coreutils; in diff --git a/modules/profiles/dev/default.nix b/modules/profiles/dev/default.nix index af151a1..38a2117 100644 --- a/modules/profiles/dev/default.nix +++ b/modules/profiles/dev/default.nix @@ -16,6 +16,10 @@ in config = mkIf cfg.enable { nixfiles.modules = { + common.nix.allowedUnfreePackages = [ + "terraform" # source-available + ]; + bat.enable = true; curl.enable = true; direnv.enable = true; @@ -59,10 +63,12 @@ in }; packages = with pkgs; [ + (google-cloud-sdk.withExtraComponents [ + google-cloud-sdk.components.gke-gcloud-auth-plugin + ]) age dbeaver-bin distrobox - google-cloud-sdk htmlq httpie hydra-check @@ -71,9 +77,11 @@ in logcli nix-update nixpkgs-review + opentofu scaleway-cli sops sqlitebrowser + terraform toolbox vultr-cli yq diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index d7f1876..186d97d 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -126,8 +126,16 @@ in services = { fwupd.enable = true; + libinput.enable = true; + upower.enable = true; + + languagetool = { + enable = true; + port = 8081; + allowOrigin = "*"; + }; }; time.timeZone = "Europe/Moscow"; |