diff options
| author | Franck Cuny <franck@fcuny.net> | 2024-12-16 10:12:58 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2024-12-16 10:12:58 -0800 |
| commit | 5e31b3dd64f090f9405d9ab9e8e63093b8ad3cc2 (patch) | |
| tree | 84967fd982d2e9c8606665fb58762567e17f15bb | |
| parent | refactor home-manager (diff) | |
| download | infra-5e31b3dd64f090f9405d9ab9e8e63093b8ad3cc2.tar.gz | |
some more cleanup
| -rw-r--r-- | nix/machines/vm-synology/git.nix | 1 | ||||
| -rw-r--r-- | nix/users/fcuny/home-manager.nix | 21 | ||||
| -rw-r--r-- | nix/users/fcuny/shell.nix | 47 |
3 files changed, 35 insertions, 34 deletions
diff --git a/nix/machines/vm-synology/git.nix b/nix/machines/vm-synology/git.nix index a6e7f88..08ada60 100644 --- a/nix/machines/vm-synology/git.nix +++ b/nix/machines/vm-synology/git.nix @@ -1,5 +1,6 @@ { pkgs, lib, ... }: { + # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/gitolite.nix services.gitolite = { enable = true; adminPubkey = diff --git a/nix/users/fcuny/home-manager.nix b/nix/users/fcuny/home-manager.nix index a344151..7752328 100644 --- a/nix/users/fcuny/home-manager.nix +++ b/nix/users/fcuny/home-manager.nix @@ -1,8 +1,6 @@ { darwin, ... }: -{ config, lib, pkgs, ... }: -let isLinux = pkgs.stdenv.isLinux; -in { +{ config, lib, pkgs, ... }: { home.stateVersion = "23.05"; xdg.enable = true; @@ -15,16 +13,6 @@ in { # encryption age - # media - mpv - ffmpeg - - # dicts - aspell - aspellDicts.en - aspellDicts.en-computers - aspellDicts.en-science - # nix nil nix-direnv @@ -32,11 +20,14 @@ in { nixfmt-classic nixpkgs-fmt nil # nix lsp - - ] ++ (lib.optionals (isLinux) [ htop ]) ++ (lib.optionals (darwin) [ + ] ++ (lib.optionals (darwin) [ # hashicorp boundary nomad-pack tfswitch + + # media + mpv + ffmpeg ]); } diff --git a/nix/users/fcuny/shell.nix b/nix/users/fcuny/shell.nix index 09fbc40..bfedc45 100644 --- a/nix/users/fcuny/shell.nix +++ b/nix/users/fcuny/shell.nix @@ -1,25 +1,34 @@ -{ config, pkgs, ... }: { - home.packages = with pkgs; [ - # shell - shellcheck +{ config, pkgs, ... }: +let isLinux = pkgs.stdenv.isLinux; +in { + home.packages = with pkgs; + [ + # shell + shellcheck - # shell utils - coreutils - direnv - dust - procs - ripgrep - tree - wget + # shell utils + coreutils + direnv + dust + procs + ripgrep + tree + wget - # network - bandwhich + # network + bandwhich - # data manipulation - jless - jq - yq - ]; + # data manipulation + jless + jq + yq + + # dicts + aspell + aspellDicts.en + aspellDicts.en-computers + aspellDicts.en-science + ] ++ (lib.optionals (isLinux) [ htop ]); programs.fish = { enable = true; |