diff --git a/flake.nix b/flake.nix index a3f49b5..238c8aa 100755 --- a/flake.nix +++ b/flake.nix @@ -78,9 +78,13 @@ ]; }; templates = { + elm = { + path = ./templates/elm; + description = "Elm Environment"; + }; haskell = { path = ./templates/haskell; - description = "Haskell/Elm Environment"; + description = "Haskell Environment"; }; }; }; diff --git a/home-manager/modules/firefox/default.nix b/home-manager/modules/firefox/default.nix index 15edc17..81004e9 100755 --- a/home-manager/modules/firefox/default.nix +++ b/home-manager/modules/firefox/default.nix @@ -10,15 +10,17 @@ in { enable = true; package = pkgs.firefox; profiles = { - ${user0} = + ${user0} = let + configPath = ./config; + in { isDefault = true; } - // (import ./config/bookmarks {inherit flake;}) - // (import ./config/extensions {inherit nur;}) - // (import ./config/search {inherit flake;}) - // (import ./config/settings) - // (import ./config/themes); + // (import (configPath + /bookmarks) {inherit flake;}) + // (import (configPath + /extensions) {inherit nur;}) + // (import (configPath + /search) {inherit flake;}) + // (import (configPath + /settings)) + // (import (configPath + /themes)); }; }; } diff --git a/templates/elm/.envrc b/templates/elm/.envrc new file mode 100644 index 0000000..8392d15 --- /dev/null +++ b/templates/elm/.envrc @@ -0,0 +1 @@ +use flake \ No newline at end of file diff --git a/templates/elm/.gitignore b/templates/elm/.gitignore new file mode 100644 index 0000000..92b2793 --- /dev/null +++ b/templates/elm/.gitignore @@ -0,0 +1 @@ +.direnv diff --git a/templates/elm/flake.lock b/templates/elm/flake.lock new file mode 100644 index 0000000..94a0bc8 --- /dev/null +++ b/templates/elm/flake.lock @@ -0,0 +1,57 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/templates/elm/flake.nix b/templates/elm/flake.nix new file mode 100644 index 0000000..345bad4 --- /dev/null +++ b/templates/elm/flake.nix @@ -0,0 +1,21 @@ +{ + description = "Elm Environment"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = inputs @ { + flake-parts, + self, + ... + }: let + system = "x86_64-linux"; + in + flake-parts.lib.mkFlake {inherit inputs;} { + imports = [ + ./parts + ]; + systems = [system]; + }; +} diff --git a/templates/elm/parts/default.nix b/templates/elm/parts/default.nix new file mode 100644 index 0000000..8aae71f --- /dev/null +++ b/templates/elm/parts/default.nix @@ -0,0 +1,13 @@ +{ + perSystem = { + pkgs, + lib, + config, + self', + ... + }: { + imports = [ + ./devshells.nix + ]; + }; +} diff --git a/templates/elm/parts/devshells.nix b/templates/elm/parts/devshells.nix new file mode 100644 index 0000000..eab67e3 --- /dev/null +++ b/templates/elm/parts/devshells.nix @@ -0,0 +1,23 @@ +{pkgs, ...}: { + devShells = { + default = pkgs.mkShell { + packages = builtins.attrValues { + inherit + (pkgs) + alejandra + just + nil + ; + inherit + (pkgs.elmPackages) + elm + elm-format + elm-land + elm-language-server + elm-review + elm-test + ; + }; + }; + }; +}