mat
/
dotfiles.nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some packages, format with nixpkgs-fmt

main
mat ess 2022-01-23 18:50:34 -05:00
parent 52f410cb3e
commit a695374977
19 changed files with 268 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darwin/bootstrap.nix
View File

@ -4,9 +4,13 @@
nix.binaryCaches = [ nix.binaryCaches = [
"https://cache.nixos.org/" "https://cache.nixos.org/"
"https://hydra.iohk.io"
"https://nix-community.cachix.org"
]; ];
nix.binaryCachePublicKeys = [ nix.binaryCachePublicKeys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
nix.trustedUsers = [ nix.trustedUsers = [
"@admin" "@admin"

3
darwin/homebrew.nix
View File

@ -37,6 +37,7 @@ in
"homebrew/core" "homebrew/core"
"homebrew/services" "homebrew/services"
"nrlquaker/createzap" "nrlquaker/createzap"
"unisonweb/unison"
]; ];
# Prefer installing application from the Mac App Store # Prefer installing application from the Mac App Store
@ -48,6 +49,7 @@ in
# If an app isn't available in the Mac App Store, or the version in the App Store has # If an app isn't available in the Mac App Store, or the version in the App Store has
# limitiations, e.g., Transmit, install the Homebrew Cask. # limitiations, e.g., Transmit, install the Homebrew Cask.
homebrew.casks = [ homebrew.casks = [
"aerial"
"alfred" "alfred"
"discord" "discord"
"element" "element"
@ -59,6 +61,7 @@ in
"rectangle" "rectangle"
"signal" "signal"
"steam" "steam"
"unison-language"
"vscodium" "vscodium"
]; ];

12
default.nix
View File

@ -1,10 +1,14 @@
# See https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix # See https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
(import ( (import
(
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in fetchTarball { in
fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; } sha256 = lock.nodes.flake-compat.locked.narHash;
) { }
)
{
src = ./.; src = ./.;
}).defaultNix }).defaultNix

2
home/default.nix
View File

@ -100,7 +100,7 @@
cachix # adding/managing alternative binary caches hosted by Cachix cachix # adding/managing alternative binary caches hosted by Cachix
comma # run software from without installing it comma # run software from without installing it
niv # easy dependency management for nix projects niv # easy dependency management for nix projects
nixfmt nixpkgs-fmt
nix-prefetch-git nix-prefetch-git
# nodePackages.node2nix # nodePackages.node2nix

3
home/shells.nix
View File

@ -130,7 +130,8 @@
programs.fish.shellAliases = programs.fish.shellAliases =
let let
nixConfigDir = "${config.home.homeDirectory}/dotfiles.nix"; nixConfigDir = "${config.home.homeDirectory}/dotfiles.nix";
in with pkgs; { in
with pkgs; {
# My additions # My additions
code = "codium"; code = "codium";
# OG # OG

3
modules/darwin/security/pam.nix
View File

@ -20,7 +20,8 @@ let
let let
file = "/etc/pam.d/sudo"; file = "/etc/pam.d/sudo";
option = "security.pam.enableSudoTouchIdAuth"; option = "security.pam.enableSudoTouchIdAuth";
in '' in
''
${if isEnabled then '' ${if isEnabled then ''
# Enable sudo Touch ID authentication, if not already enabled # Enable sudo Touch ID authentication, if not already enabled
if ! grep 'pam_tid.so' ${file} > /dev/null; then if ! grep 'pam_tid.so' ${file} > /dev/null; then

6
modules/home/programs/kitty/extras.nix
View File

@ -36,7 +36,8 @@ let
${term-background}/bin/term-background dark ${term-background}/bin/term-background dark
''; '';
in { in
{
options.programs.kitty.extras = { options.programs.kitty.extras = {
colors = { colors = {
@ -109,7 +110,8 @@ in {
term-background term-background
]; ];
programs.kitty.settings = optionalAttrs cfg.colors.enable ( programs.kitty.settings = optionalAttrs cfg.colors.enable
(
cfg.colors.common // cfg.colors.${cfg.colors.default} // { cfg.colors.common // cfg.colors.${cfg.colors.default} // {
allow_remote_control = "yes"; allow_remote_control = "yes";

3
modules/home/programs/neovim/extras.nix
View File

@ -151,7 +151,8 @@ in
''; '';
programs.fish.interactiveShellInit = mkIf programs.fish.interactiveShellInit = mkIf
(cfg.termBufferAutoChangeDir || cfg.nvrAliases.enable) shellConfig; (cfg.termBufferAutoChangeDir || cfg.nvrAliases.enable)
shellConfig;
programs.neovim.plugins = lib.singleton ( programs.neovim.plugins = lib.singleton (
pkgs.vimUtils.buildVimPluginFrom2Nix { pkgs.vimUtils.buildVimPluginFrom2Nix {

9
nixpkgs.nix
View File

@ -1,7 +1,6 @@
{ { system ? builtins.currentSystem
system ? builtins.currentSystem, , config ? { }
config ? {}, , overlays ? [ ]
overlays ? [], , ...
...
}@args: }@args:
import (import ./default.nix).inputs.nixpkgs-unstable args import (import ./default.nix).inputs.nixpkgs-unstable args