added significant items

added fish shellInit, removed top level empty configuration, removed
lib.mkIf logic for fish aliases
This commit is contained in:
Wyatt J. Miller 2024-07-21 10:03:25 -04:00
parent d6690e87b7
commit 08a543fabe
8 changed files with 25 additions and 16 deletions

View File

@ -1,7 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
homebrew = import ./homebrew.nix; homebrew = import ./homebrew.nix // { enable = true; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim

View File

@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721135958, "lastModified": 1721534365,
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721270582, "lastModified": 1721550066,
"narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=", "narHash": "sha256-wr6sSb+VpXy8HCvBqU6xvhpaARzWUbEK7uN5tLnqYDg=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec", "rev": "33bf7df5bbfcbbb49e6559b0c96c9e3b26d14e58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1721303309, "lastModified": 1721497942,
"narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=", "narHash": "sha256-EDPL9qJfklXoowl3nEBmjDIqcvXKUZInt5n6CCc1Hn4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed", "rev": "d43f0636fc9492e83be8bbb41f9595d7a87106b8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -13,8 +13,7 @@
}; };
outputs = inputs@{ self, nix-darwin, home-manager, nixpkgs, mac-app-util }: outputs = inputs@{ self, nix-darwin, home-manager, nixpkgs, mac-app-util }:
let configuration = { pkgs, ... }: { }; {
in {
# Build darwin flake using: # Build darwin flake using:
# $ darwin-rebuild build --flake .#sephiroth # $ darwin-rebuild build --flake .#sephiroth
darwinConfigurations."sephiroth" = nix-darwin.lib.darwinSystem { darwinConfigurations."sephiroth" = nix-darwin.lib.darwinSystem {

View File

@ -14,11 +14,17 @@
]; ];
config = { config = {
programs.home-manager.enable = true;
fonts.fontconfig.enable = true;
home.stateVersion = "24.05"; home.stateVersion = "24.05";
home.username = "wyatt";
home.homeDirectory = "/Users/wyatt";
home.packages = with pkgs; [ home.packages = with pkgs; [
discord discord
babelfish
obsidian obsidian
tmux
zoxide zoxide
wget wget
nerdfonts nerdfonts
@ -36,8 +42,5 @@
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
fonts.fontconfig.enable = true;
programs.home-manager.enable = true;
}; };
} }

View File

@ -3,6 +3,7 @@
{ {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
nix-direnv.enable = true;
config = { config = {
global = { global = {

View File

@ -1,5 +1,4 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
programs.fish = { programs.fish = {
shellAliases = { shellAliases = {

View File

@ -8,5 +8,10 @@
programs.fish = { programs.fish = {
enable = true; enable = true;
shellInit = "
if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
end
";
}; };
} }

View File

@ -3,5 +3,7 @@
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
# nvim configuration here soon!
}; };
} }