diff options
| -rw-r--r-- | nix/users/fcuny/dev.nix (renamed from nix/users/fcuny/go.nix) | 9 | ||||
| -rw-r--r-- | nix/users/fcuny/home-manager.nix | 24 | ||||
| -rw-r--r-- | nix/users/fcuny/media.nix | 7 | ||||
| -rw-r--r-- | nix/users/fcuny/shell.nix | 3 |
4 files changed, 22 insertions, 21 deletions
diff --git a/nix/users/fcuny/go.nix b/nix/users/fcuny/dev.nix index c6c9cf6..7126723 100644 --- a/nix/users/fcuny/go.nix +++ b/nix/users/fcuny/dev.nix @@ -1,10 +1,19 @@ { config, pkgs, ... }: { home.packages = with pkgs; [ + # go go-tools golangci-lint gopls delve + + # nix + nil # nix lsp + nix-direnv # integration with direnv + nixfmt-rfc-style # new formatter + + # rust + rustup ]; programs.go = { diff --git a/nix/users/fcuny/home-manager.nix b/nix/users/fcuny/home-manager.nix index e450c24..e9a51a7 100644 --- a/nix/users/fcuny/home-manager.nix +++ b/nix/users/fcuny/home-manager.nix @@ -1,6 +1,6 @@ { darwin, systemName, ... }: -{ lib, pkgs, ... }: +{ lib, ... }: { home.stateVersion = "23.05"; @@ -14,26 +14,8 @@ ] ++ lib.optionals darwin [ ./1password.nix - ./go.nix + ./dev.nix + ./media.nix ] ++ lib.optionals (systemName == "hq-c02fk3q7md6t") [ ./work.nix ]; - - home.packages = - with pkgs; - [ - # encryption - age - - nil # nix lsp - nix-direnv # integration with direnv - nixfmt-rfc-style # new formatter - ] - ++ (lib.optionals (darwin) [ - # media - mpv - ffmpeg - - # rust - rustup - ]); } diff --git a/nix/users/fcuny/media.nix b/nix/users/fcuny/media.nix new file mode 100644 index 0000000..342cfb4 --- /dev/null +++ b/nix/users/fcuny/media.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + mpv + ffmpeg + ]; +} diff --git a/nix/users/fcuny/shell.nix b/nix/users/fcuny/shell.nix index 36b4267..7f4406d 100644 --- a/nix/users/fcuny/shell.nix +++ b/nix/users/fcuny/shell.nix @@ -10,6 +10,9 @@ in home.packages = with pkgs; [ + # encryption + age + # shell shellcheck |