eza update, add emacs, update wezterm config and flake/nix updates
This commit is contained in:
parent
8238a99555
commit
c70d6cbe79
4 changed files with 39 additions and 23 deletions
|
@ -32,4 +32,8 @@
|
||||||
distributedBuilds = false;
|
distributedBuilds = false;
|
||||||
};
|
};
|
||||||
services.nix-daemon.enable = true;
|
services.nix-daemon.enable = true;
|
||||||
|
services.emacs = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.emacsMacport;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
24
flake.lock
24
flake.lock
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694810318,
|
"lastModified": 1695424346,
|
||||||
"narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=",
|
"narHash": "sha256-jkjKhxaBpS7p//l90uz9lNdVK5imVe9eo+XH6zbfrJU=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8",
|
"rev": "c286b23c7fd7f0622bc4af898c91f58b8d304ff1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -28,11 +28,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694643239,
|
"lastModified": 1695224363,
|
||||||
"narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
|
"narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
|
"rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -43,11 +43,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694767346,
|
"lastModified": 1695145219,
|
||||||
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
|
"narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
|
"rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -59,11 +59,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694886364,
|
"lastModified": 1695434182,
|
||||||
"narHash": "sha256-MbwCXmTpdBlJPuJwBmAI1wb/z9J84OC4M4d7hz7spSs=",
|
"narHash": "sha256-SRnWqW5+tPa+WhNB5i/cZ7LjesdT/3A+LRULWVNbJ2U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "40cd392b888a4d78044d733b9fee61710f749a05",
|
"rev": "f024b6efcc7bb61c3e55aa906a60531c9e262197",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
33
home.nix
33
home.nix
|
@ -6,18 +6,12 @@
|
||||||
|
|
||||||
imports = (import ./programs);
|
imports = (import ./programs);
|
||||||
|
|
||||||
# nixpkgs.overlays = [
|
|
||||||
# (import (builtins.fetchTarball {
|
|
||||||
# url = https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz;
|
|
||||||
# }))
|
|
||||||
# ];
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
"vscode"
|
"vscode"
|
||||||
];
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
stateVersion = "22.11";
|
stateVersion = "23.05";
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
VISUAL = "$EDITOR";
|
VISUAL = "$EDITOR";
|
||||||
|
@ -35,7 +29,6 @@
|
||||||
coursier
|
coursier
|
||||||
curlFull
|
curlFull
|
||||||
delta
|
delta
|
||||||
eza
|
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
font-awesome
|
font-awesome
|
||||||
|
@ -81,6 +74,7 @@
|
||||||
sbt
|
sbt
|
||||||
scala-cli
|
scala-cli
|
||||||
shellcheck
|
shellcheck
|
||||||
|
slides
|
||||||
sqlite
|
sqlite
|
||||||
stylua
|
stylua
|
||||||
stack
|
stack
|
||||||
|
@ -105,11 +99,29 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.emacs = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.emacsMacport;
|
||||||
|
};
|
||||||
|
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.eza = {
|
||||||
|
enable = true;
|
||||||
|
enableAliases = true;
|
||||||
|
git = true;
|
||||||
|
icons = true;
|
||||||
|
extraOptions = [
|
||||||
|
"--group-directories-first"
|
||||||
|
"--long"
|
||||||
|
"--header"
|
||||||
|
"--all"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
programs.fzf = {
|
programs.fzf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
enableFishIntegration = true;
|
||||||
|
@ -298,7 +310,7 @@
|
||||||
ping="prettyping";
|
ping="prettyping";
|
||||||
".." = "cd ..";
|
".." = "cd ..";
|
||||||
pj="python -m json.tool";
|
pj="python -m json.tool";
|
||||||
l="eza --long --header --git --all";
|
l="ll";
|
||||||
g="git";
|
g="git";
|
||||||
gl="git log";
|
gl="git log";
|
||||||
gc="git commit -m";
|
gc="git commit -m";
|
||||||
|
@ -317,8 +329,7 @@
|
||||||
nixinfo="nix-shell -p nix-info --run \"nix-info -m\"";
|
nixinfo="nix-shell -p nix-info --run \"nix-info -m\"";
|
||||||
nixgc="nix-collect-garbage -d";
|
nixgc="nix-collect-garbage -d";
|
||||||
nixq="nix-env -qa";
|
nixq="nix-env -qa";
|
||||||
nixupdate="sudo nix-channel --update";
|
nixupgrade="nix upgrade-nix";
|
||||||
nixversion="nix eval nixpkgs.lib.version";
|
|
||||||
rmxcodederived="rm -fr ~/Library/Developer/Xcode/DerivedData";
|
rmxcodederived="rm -fr ~/Library/Developer/Xcode/DerivedData";
|
||||||
v="nvim";
|
v="nvim";
|
||||||
wezk="wezterm show-keys --lua";
|
wezk="wezterm show-keys --lua";
|
||||||
|
|
|
@ -6,6 +6,7 @@ wezterm.on('update-right-status', function(window, pane)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
adjust_window_size_when_changing_font_size = false,
|
||||||
check_for_updates = false,
|
check_for_updates = false,
|
||||||
color_scheme = "tokyonight",
|
color_scheme = "tokyonight",
|
||||||
font = wezterm.font("FiraCode Nerd Font Mono"),
|
font = wezterm.font("FiraCode Nerd Font Mono"),
|
||||||
|
|
Loading…
Reference in a new issue