opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use the unstable overlay in other places

Browse source
This commit is contained in:
Oliver Davies 2024-11-05 12:00:00 +00:00
parent 8876a339b6
commit 1a627d1828
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/shared/home-manager.nix
View file

@ -4,9 +4,6 @@
username, username,
self, self,
}: }:
let
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
in
{ {
home.username = "${username}"; home.username = "${username}";
home.homeDirectory = "/home/${username}"; home.homeDirectory = "/home/${username}";
@ -19,8 +16,8 @@ in
programs.home-manager.enable = true; programs.home-manager.enable = true;
imports = [ imports = [
(import ./modules/git.nix { inherit inputs pkgs pkgsUnstable; }) (import ./modules/git.nix { inherit inputs pkgs; })
(import ./modules/neovim.nix { inherit inputs pkgs pkgsUnstable; }) (import ./modules/neovim.nix { inherit inputs pkgs; })
./modules/bat.nix ./modules/bat.nix
./modules/bin.nix ./modules/bin.nix
./modules/direnv.nix ./modules/direnv.nix

4
lib/shared/modules/git.nix
View file

@ -1,4 +1,4 @@
{ pkgs, pkgsUnstable, ... }: { pkgs, ... }:
{ {
home.file.".gitmessage".text = '' home.file.".gitmessage".text = ''
@ -146,7 +146,7 @@
}; };
}; };
home.packages = with pkgsUnstable; [ git-instafix ]; home.packages = with pkgs.unstable; [ git-instafix ];
home.sessionVariables = { home.sessionVariables = {
GIT_INSTAFIX_UPSTREAM = "origin/main"; GIT_INSTAFIX_UPSTREAM = "origin/main";

9
lib/shared/modules/neovim.nix
View file

@ -1,15 +1,10 @@
{ { inputs, pkgs, ... }:
inputs,
pkgs,
pkgsUnstable,
...
}:
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgsUnstable.neovim-unwrapped; package = pkgs.unstable.neovim-unwrapped;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
comment-nvim comment-nvim