flake and nvim updates
This commit is contained in:
parent
8e5335ee33
commit
55468c89f6
2 changed files with 19 additions and 49 deletions
24
flake.lock
24
flake.lock
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696360011,
|
"lastModified": 1697723594,
|
||||||
"narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
|
"narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
|
"rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -28,11 +28,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696940889,
|
"lastModified": 1697838989,
|
||||||
"narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
|
"narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
|
"rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -43,11 +43,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697059129,
|
"lastModified": 1697723726,
|
||||||
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
|
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
|
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -59,11 +59,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697291160,
|
"lastModified": 1697866785,
|
||||||
"narHash": "sha256-WV4TsmIi2vGu6cO5Xq4FPA/iSHsOEy1/Vy2uUC3p1jM=",
|
"narHash": "sha256-68Qf0RuGKnihfsR45ugZZsBhnVY7dtX7lKbjOF3A43Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "383bba42753ac667dc9904b83eca755c5f0324ca",
|
"rev": "f45bab34a6b89a8d004517012d3285fd00d6b114",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
44
home.nix
44
home.nix
|
@ -17,8 +17,7 @@
|
||||||
VISUAL = "$EDITOR";
|
VISUAL = "$EDITOR";
|
||||||
};
|
};
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# ( python310.withPackages (ps: with ps; [ pip flake8 black ]) )
|
jdk21
|
||||||
jdk17
|
|
||||||
any-nix-shell
|
any-nix-shell
|
||||||
aspell
|
aspell
|
||||||
bloop
|
bloop
|
||||||
|
@ -31,6 +30,9 @@
|
||||||
delta
|
delta
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
fishPlugins.bass
|
||||||
|
fishPlugins.foreign-env
|
||||||
|
fishPlugins.bobthefish
|
||||||
font-awesome
|
font-awesome
|
||||||
gitAndTools.diff-so-fancy
|
gitAndTools.diff-so-fancy
|
||||||
ghc
|
ghc
|
||||||
|
@ -56,6 +58,7 @@
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
nodejs
|
nodejs
|
||||||
nodePackages.pyright
|
nodePackages.pyright
|
||||||
|
nodePackages.bash-language-server
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
nodePackages.vscode-html-languageserver-bin
|
nodePackages.vscode-html-languageserver-bin
|
||||||
nodePackages.vscode-json-languageserver
|
nodePackages.vscode-json-languageserver
|
||||||
|
@ -98,11 +101,6 @@
|
||||||
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;
|
||||||
|
@ -227,35 +225,7 @@
|
||||||
gitignore = "curl -sL https://www.gitignore.io/api/$argv";
|
gitignore = "curl -sL https://www.gitignore.io/api/$argv";
|
||||||
};
|
};
|
||||||
|
|
||||||
plugins = [
|
plugins = [ ];
|
||||||
{
|
|
||||||
name = "bass";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "edc";
|
|
||||||
repo = "bass";
|
|
||||||
rev = "2fd3d2157d5271ca3575b13daec975ca4c10577a";
|
|
||||||
sha256 = "0ppmajynpb9l58xbrcnbp41b66g7p0c9l2nlsvyjwk6d16g4p4gy";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "foreign-env";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "oh-my-fish";
|
|
||||||
repo = "plugin-foreign-env";
|
|
||||||
rev = "3ee95536106c11073d6ff466c1681cde31001383";
|
|
||||||
sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "bobthefish";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "oh-my-fish";
|
|
||||||
repo = "theme-bobthefish";
|
|
||||||
rev = "2dcfcab653ae69ae95ab57217fe64c97ae05d8de";
|
|
||||||
sha256 = "1fssb5bqd2d7856gsylf93d28n3rw4rlqkhbg120j5ng27c7v7lq";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
loginShellInit = ''
|
loginShellInit = ''
|
||||||
set -xg TERM xterm-256color
|
set -xg TERM xterm-256color
|
||||||
|
@ -346,7 +316,7 @@
|
||||||
# Neovim Configuration
|
# Neovim Configuration
|
||||||
xdg.configFile."nvim".source = builtins.fetchGit {
|
xdg.configFile."nvim".source = builtins.fetchGit {
|
||||||
url = "https://git.softinio.com/nvim-config.git";
|
url = "https://git.softinio.com/nvim-config.git";
|
||||||
rev = "c2d6d6379dba1c85381e8f18ff5bd1127255306c";
|
rev = "543a87b647e771b58941bc6cbf461a9da7b5459a";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue