stuff and also things perhaps

This commit is contained in:
Mars 2024-08-14 01:39:04 -04:00
parent e55f9661a3
commit 59987ac080
Signed by: pupbrained
GPG key ID: 874E22DF2F9DFCB5
5 changed files with 39 additions and 20 deletions

View file

@ -97,11 +97,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1723489118, "lastModified": 1723531925,
"narHash": "sha256-UCsoBuUTLHcwv4e9RzVZ1yzgQZHFs49yPx4FXuOSR2s=", "narHash": "sha256-QPETOkVNZwm3Zx0FRfkrPWScbc46I5QwIOdBmByYtKg=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "54148c6f5370689f50a069db3e7497ae4714004a", "rev": "b8b1c616f8b869af7bce3179ad423e3d45b0d079",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1723525014, "lastModified": 1723612799,
"narHash": "sha256-hW/uF5yIJ0rEDfeZbsY3FX8HS+Nx+FZ+zgzxKPi38mY=", "narHash": "sha256-geqgrVgd7Hbxz2q4Htb/BW4Y9A1F/I3HDogi9UfNG+Y=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "40d6599358cd66ee3b7f7b19452e8e2a9d9b2e97", "rev": "37129faa8379c5e138c7caa46625e5fec0c6719a",
"revCount": 3, "revCount": 15,
"type": "git", "type": "git",
"url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git" "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git"
}, },
@ -783,11 +783,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723488592, "lastModified": 1723579231,
"narHash": "sha256-nPYQrQD8rldLIhrz6px0YHGB4WwIaWLdmBtWsMgLLNI=", "narHash": "sha256-PL9C3aOetj+TS+vXvNhh7q5bm3g70oakg+iSu5eQBUQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "77cf651825c2afac69e3a827ff910a62c73e1218", "rev": "3b4aabe04c7756fb0a70d78b6f0e701228f46345",
"revCount": 5083, "revCount": 5087,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -1222,11 +1222,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723175592, "lastModified": 1723362943,
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1318,11 +1318,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1723175592, "lastModified": 1723362943,
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,5 +1,4 @@
# Do not modify! This file is generated. # Do not modify! This file is generated.
{ {
inputs = { inputs = {
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
@ -44,4 +43,4 @@
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
}; };
outputs = inputs: inputs.flakegen ./flake.in.nix inputs; outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
} }

View file

@ -71,6 +71,11 @@
tealdeer.enable = false; tealdeer.enable = false;
wezterm.extraConfig = builtins.readFile ./wezterm.lua; wezterm.extraConfig = builtins.readFile ./wezterm.lua;
emacs = {
enable = true;
package = inputs.emacs.packages.${pkgs.system}.default;
};
git = { git = {
extraConfig.credential.helper = "osxkeychain"; extraConfig.credential.helper = "osxkeychain";
signing.key = "874E22DF2F9DFCB5"; signing.key = "874E22DF2F9DFCB5";

View file

@ -13,6 +13,15 @@ with pkgs; {
plugins = plugins =
[ [
{
name = "git-abbr";
src = fetchFromGitHub {
owner = "pupbrained";
repo = "fish-git-abbr";
rev = "faa3d2581b800c45960e8cd5087ff09acb936b85";
hash = "sha256-8gxqYGN9XIlX1cZovX6r5zo8C8hOrsYIVN39oVGbWv0=";
};
}
{ {
name = "replay.fish"; name = "replay.fish";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -59,7 +68,7 @@ with pkgs; {
}; };
} }
] ]
++ (mkFishPlugins ["autopair" "bass" "colored-man-pages" "done" "fifc" "git-abbr" "forgit" "grc"]); ++ (mkFishPlugins ["autopair" "bass" "colored-man-pages" "done" "fifc" "forgit" "grc"]);
shellAliases = { shellAliases = {
cat = "${bat}/bin/bat"; cat = "${bat}/bin/bat";

View file

@ -73,6 +73,12 @@
services = { services = {
nix-daemon.enable = true; nix-daemon.enable = true;
emacs = {
enable = true;
package = inputs.emacs.packages.${pkgs.system}.default;
};
skhd = { skhd = {
enable = true; enable = true;
package = pkgs.skhd; package = pkgs.skhd;