From 18bebe5a69b827e94e487caa50bd4a72c893d1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev> Date: Mon, 2 Sep 2024 12:15:41 +0200 Subject: [PATCH] ft: add Doggo and reformat Nix files --- hosts/modules/builders.nix | 2 +- modules/common.nix | 15 ++++++------- modules/email.nix | 20 ++++++++++------- modules/fonts.nix | 6 +++++- modules/tools.nix | 11 +++++----- pkgs/hosevka.nix | 1 - templates/elixir/flake.nix | 44 +++++++++++++++++++------------------- 7 files changed, 53 insertions(+), 46 deletions(-) diff --git a/hosts/modules/builders.nix b/hosts/modules/builders.nix index 3e9b6d8..8adac4f 100644 --- a/hosts/modules/builders.nix +++ b/hosts/modules/builders.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { nix.linux-builder = { enable = false; ephemeral = true; diff --git a/modules/common.nix b/modules/common.nix index ac90cc0..68a58a1 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -12,16 +12,15 @@ pkgs.cachix ]; - nix.registry = - { - darwin.flake = inputs.darwin; - dotfiles.flake = inputs.self; - flake-parts.flake = inputs.flake-parts; - nixpkgs.flake = inputs.nixpkgs; - }; + nix.registry = { + darwin.flake = inputs.darwin; + dotfiles.flake = inputs.self; + flake-parts.flake = inputs.flake-parts; + nixpkgs.flake = inputs.nixpkgs; + }; nix.nixPath = [ - { nixpkgs = inputs.nixpkgs; } + {nixpkgs = inputs.nixpkgs;} ]; # nix.package = pkgs.nixFlakes; diff --git a/modules/email.nix b/modules/email.nix index 005739b..a359b0c 100644 --- a/modules/email.nix +++ b/modules/email.nix @@ -1,4 +1,9 @@ -{pkgs, config, lib, ...}: { +{ + pkgs, + config, + lib, + ... +}: { targets.darwin.defaults = { # Remember the fallen "com.apple.mail" = { @@ -47,11 +52,10 @@ default = "INBOX"; copy-to = "INBOX"; folders-sort = "INBOX,Draft"; - signature-file = - toString (pkgs.writeTextFile { - name = "hauleth-signature"; - text = config.accounts.email.accounts.hauleth.signature.text; - }); + signature-file = toString (pkgs.writeTextFile { + name = "hauleth-signature"; + text = config.accounts.email.accounts.hauleth.signature.text; + }); }; }; himalaya.enable = true; @@ -61,8 +65,8 @@ showSignature = "append"; text = '' - Hauleth - ~@hauleth.dev + Hauleth + ~@hauleth.dev ''; }; diff --git a/modules/fonts.nix b/modules/fonts.nix index a91a9e4..0e02337 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,4 +1,8 @@ -{pkgs, inputs, ...}: let +{ + pkgs, + inputs, + ... +}: let pkgs-self = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}; in { fonts = { diff --git a/modules/tools.nix b/modules/tools.nix index 613269d..c1ec02c 100644 --- a/modules/tools.nix +++ b/modules/tools.nix @@ -11,17 +11,18 @@ in { home.packages = [ # bfs + pkgs-self.ubin-client + pkgs.btop + pkgs.charm-freeze pkgs.comby - pkgs.senpai + pkgs.doggo + pkgs.glow pkgs.jaq jaq-as-jq pkgs.jo - pkgs.glow - pkgs-self.ubin-client pkgs.reuse - pkgs.charm-freeze + pkgs.senpai pkgs.timg - pkgs.btop pkgs.typos ]; } diff --git a/pkgs/hosevka.nix b/pkgs/hosevka.nix index f463ff0..82f4818 100644 --- a/pkgs/hosevka.nix +++ b/pkgs/hosevka.nix @@ -60,4 +60,3 @@ in inherit variants weights slopes ligations; }; } - diff --git a/templates/elixir/flake.nix b/templates/elixir/flake.nix index 65d3ac5..f6f631f 100644 --- a/templates/elixir/flake.nix +++ b/templates/elixir/flake.nix @@ -14,31 +14,31 @@ flake-parts, ... } @ inputs: - flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ - inputs.devenv.flakeModule - ]; + flake-parts.lib.mkFlake {inherit inputs;} { + imports = [ + inputs.devenv.flakeModule + ]; - systems = [ - "x86_64-linux" - "x86_64-darwin" - "aarch64-linux" - "aarch64-darwin" - ]; + systems = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; - perSystem = { - self', - inputs', - pkgs, - ... - }: { - devenv.shells.default = { - language.elixir.enable = true; + perSystem = { + self', + inputs', + pkgs, + ... + }: { + devenv.shells.default = { + language.elixir.enable = true; - packages = [ - pkgs.lexical - ]; + packages = [ + pkgs.lexical + ]; + }; }; }; - }; } -- 2.51.2