From d2ed7952a8d27e2a98b6141bbfa24bcad3bee446 Mon Sep 17 00:00:00 2001 From: Ethan Holz Date: Fri, 19 Jul 2024 11:24:18 -0500 Subject: [PATCH] format + style change --- lib/default.nix | 9 ++++++--- lib/shared/home.nix | 25 ++++++++++++------------- lib/shared/nix.nix | 14 +++++++------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index b217af5..9800ae7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -4,10 +4,13 @@ in { mkStandalone = {userName ? defaultUsername}: {system}: inputs.home-manager.lib.homeManagerConfiguration { - pkgs = import pkgs {inherit system; config.allowUnfree = true;}; + pkgs = import pkgs { + inherit system; + config.allowUnfree = true; + }; modules = [./shared/home.nix ./shared/lsp.nix ./shared/ocaml.nix ./shared/python.nix inputs.ghostty.homeModules.default ./shared/nix.nix]; # modules = [./home.nix ./lsp.nix ./ocaml.nix ./python.nix]; - extraSpecialArgs = {inherit inputs userName; }; + extraSpecialArgs = {inherit inputs userName;}; }; mkDarwin = {userName ? defaultUsername}: {system}: inputs.nix-darwin.lib.darwinSystem { @@ -54,7 +57,7 @@ in { home-manager.useUserPackages = true; home-manager.users.${userName} = {pkgs, ...}: { imports = [ - inputs.ghostty.homeModules.default + inputs.ghostty.homeModules.default (import ./shared/home.nix {inherit inputs pkgs userName;}) (import ./shared/lsp.nix {inherit inputs pkgs;}) (import ./shared/python.nix {inherit inputs pkgs;}) diff --git a/lib/shared/home.nix b/lib/shared/home.nix index fd3cef2..35b3e54 100644 --- a/lib/shared/home.nix +++ b/lib/shared/home.nix @@ -4,7 +4,7 @@ userName, ... }: let - system = pkgs.system; + inherit (pkgs) system; freeze = inputs.freeze-flake.packages.${system}.default; action-table = inputs.action-table.packages.${system}.default; gitce = inputs.git-ce.packages.${system}.default; @@ -13,7 +13,6 @@ if pkgs.stdenv.isDarwin then "/Users/${userName}" else "/home/${userName}"; - # base = "/Users/${userName}"; zellij-rose-pine = pkgs.fetchurl { url = "https://raw.githubusercontent.com/rose-pine/zellij/main/dist/rose-pine.kdl"; sha256 = "18885c1x9zmjpxahmhffbnf7nf47jxq9baz0a8q6w3iwc088vjds"; @@ -151,10 +150,10 @@ in { ''; ".zsh/plugins/zsh-functions/zsh-functions.zsh".source = ./zsh/zsh-functions.zsh; ".config/zls.json".text = '' - { - "enable_build_on_save": true, - "build_on_save_step": "check" - } + { + "enable_build_on_save": true, + "build_on_save_step": "check" + } ''; }; @@ -456,13 +455,13 @@ in { enable = true; shellIntegration.enable = true; settings = { - font-family = "GeistMono Nerd Font"; - font-style = "Regular"; - font-size = 16; - theme = "rose-pine-moon"; - command = "${pkgs.fish}/bin/fish"; - font-thicken = true; - quit-after-last-window-closed = true; + font-family = "GeistMono Nerd Font"; + font-style = "Regular"; + font-size = 16; + theme = "rose-pine-moon"; + command = "${pkgs.fish}/bin/fish"; + font-thicken = true; + quit-after-last-window-closed = true; }; }; } diff --git a/lib/shared/nix.nix b/lib/shared/nix.nix index 23be062..88a7545 100644 --- a/lib/shared/nix.nix +++ b/lib/shared/nix.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { - home.packages = [ - pkgs.nixd - pkgs.nix-prefetch-github - pkgs.statix - pkgs.alejandra - pkgs.cachix - ]; + home.packages = [ + pkgs.nixd + pkgs.nix-prefetch-github + pkgs.statix + pkgs.alejandra + pkgs.cachix + ]; } -- 2.51.2