enable comma and direnv

This commit is contained in:
willemml 2022-12-04 23:43:16 -08:00
parent 9a9b138b36
commit 7b7609011c
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
6 changed files with 68 additions and 4 deletions

21
#home.nix# Normal file
View file

@ -0,0 +1,21 @@
{ pkgs, config, lib, ... }:
let
inherit (lib.systems.elaborate { system = builtins.currentSystem; }) isLinux isDarwin;
in
rec {
home.stateVersion = "22.05";
home.packages = import ./packages.nix { inherit lib config pkgs isDarwin; };
programs = import ./programs.nix { inherit lib config pkgs isDarwin; };
home.file."${programs.gpg.homedir}/gpg-agent.conf" = {
source = pkgs.writeTextFile {
name = "gpg-agent-conf";
text = ''
pinentry-program ${pkgs.pinentry_mac.out}/${pkgs.pinentry_mac.binaryPath}
'';
};
};
}

1
.#home.nix Symbolic link
View file

@ -0,0 +1 @@
willem@zeus.61424

14
brew.nix Normal file
View file

@ -0,0 +1,14 @@
{ pkgs, config, lib, ... }:
{
casks = [
"nordvpn"
"blobsaver"
"firefox"
"vlc"
"steam"
"iterm2"
"discord"
"arduino"
];
}

View file

@ -3,12 +3,17 @@
let let
user = builtins.getEnv "USER"; user = builtins.getEnv "USER";
unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz; unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
cask2nixTarball = fetchTarball https://github.com/matthewbauer/cask2nix/archive/v0.1.tar.gz;
nurTarball = fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz";
in in
{ {
imports = [ <home-manager/nix-darwin> ]; imports = [ <home-manager/nix-darwin> ];
# List of packages to be installed in the system profile. # List of packages to be installed in the system profile.
environment.systemPackages = []; environment.systemPackages = [
pkgs.iterm2
pkgs.discord
];
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
environment.darwinConfig = "$HOME/.config/nixpkgs/darwin-configuration.nix"; environment.darwinConfig = "$HOME/.config/nixpkgs/darwin-configuration.nix";
@ -23,9 +28,13 @@ in
''; '';
}; };
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config = {
unstable = import unstableTarball { allowUnfree = true;
config = config.nixpkgs.config; packageOverrides = pkgs: {
unstable = import unstableTarball {
config = config.nixpkgs.config;
};
nur = import nurTarball { inherit pkgs; };
}; };
}; };

View file

@ -1,6 +1,13 @@
{ config, lib, pkgs, isDarwin, ... }: { config, lib, pkgs, isDarwin, ... }:
let let
comma = (import (pkgs.fetchFromGitHub {
owner = "nix-community";
repo = "comma";
rev = "v1.4.0";
sha256 = "02zh0zn0yibbgn26r0idcsv8nl7pxlnq545qas0fzj5l70hdgyhh";
})).default;
darwinPackages = with pkgs; [ darwinPackages = with pkgs; [
coreutils coreutils
gnused gnused
@ -8,21 +15,26 @@ let
colima colima
pinentry_mac pinentry_mac
]; ];
dockerPackages = with pkgs; [ dockerPackages = with pkgs; [
unstable.docker unstable.docker
docker-compose docker-compose
]; ];
editingPackages = with pkgs; [ editingPackages = with pkgs; [
black black
shellcheck shellcheck
plantuml plantuml
texlive.combined.scheme-full texlive.combined.scheme-full
]; ];
nodePackages = with pkgs.nodePackages; [ nodePackages = with pkgs.nodePackages; [
bash-language-server bash-language-server
]; ];
sharedPackages = with pkgs; [ sharedPackages = with pkgs; [
zsh-powerlevel10k zsh-powerlevel10k
comma
automake automake
autoconf autoconf
cmake cmake

View file

@ -1,6 +1,13 @@
{ lib, config, pkgs, isDarwin, ... }: { lib, config, pkgs, isDarwin, ... }:
{ {
direnv = {
enable = true;
nix-direnv = {
enable = true;
};
};
gpg = { gpg = {
enable = true; enable = true;
homedir = "${config.users.users.willem.home}/.gnupg"; homedir = "${config.users.users.willem.home}/.gnupg";