servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Move overlays to seperate file

Browse Source
This commit is contained in:
uttarayan21
2024-03-09 22:32:54 +05:30
parent 50fc4bcd44
commit 24b42258cc
5 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/nix/common/home.nix
View File

@@ -14,6 +14,7 @@ in
home.packages = with pkgs;
[
psst
comma
neovide
sqls
@@ -47,7 +48,6 @@ in
nil
pkg-config
lua-language-server
# neovim
(nerdfonts.override { fonts = [ "Hasklig" ]; })
mpv
] ++ (if device.isLinux then [
@@ -73,7 +73,6 @@ in
})
swaynotificationcenter
usbutils
picotool
handlr-regex
webcord-vencord
spotify

99
config/nix/flake.nix
View File

@@ -56,27 +56,9 @@
# nixneovimplugins = {
# url = "github:NixNeovim/NixNeovimPlugins";
# inputs.nixpkgs.follows = "nixpkgs";
# };
nur.url = "github:nix-community/nur";
# { pkgs, inputs, system, ... }:
# {
# nixpkgs.overlays = [
# (final: prev: {
# postman = prev.postman.overrideAttrs(old: rec {
# version = "20230716100528";
# src = final.fetchurl {
# url = "https://web.archive.org/web/${version}/https://dl.pstmn.io/download/latest/linux_64";
# sha256 = "sha256-svk60K4pZh0qRdx9+5OUTu0xgGXMhqvQTGTcmqBOMq8=";
# name = "${old.pname}-${version}.tar.gz";
# };
# });
# })
# ];
# }
};
outputs =
@@ -136,86 +118,9 @@
linux_devices = builtins.filter (x: x.isLinux) devices;
darwin_devices = builtins.filter (x: x.isMac) devices;
anyrun-overlay = final: prev: {
anyrun = inputs.anyrun.packages.${prev.system}.anyrun;
hyprwin = inputs.anyrun-hyprwin.packages.${prev.system}.hyprwin;
nixos-options =
inputs.anyrun-nixos-options.packages.${prev.system}.default;
anyrun-rink = inputs.anyrun-rink.packages.${prev.system}.default;
overlays = import ./overlays.nix {
inherit inputs;
};
vimPlugins = final: prev: {
vimPlugins = prev.vimPlugins // {
comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
name = "comfortable-motion";
src = final.pkgs.fetchFromGitHub {
owner = "yuttie";
repo = "comfortable-motion.vim";
rev = "master";
sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
};
};
sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "sqls-nvim";
src = final.pkgs.fetchFromGitHub {
owner = "nanotee";
repo = "sqls.nvim";
rev = "master";
sha256 = "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s";
};
};
outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "outline-nvim";
src = final.pkgs.fetchFromGitHub {
owner = "hedyhli";
repo = "outline.nvim";
rev = "master";
sha256 = "sha256-HaxfnvgFy7fpa2CS7/dQhf6dK9+Js7wP5qGdIeXLGPY";
};
};
rest-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "rest-nvim";
src = final.pkgs.fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
rev = "main";
sha256 = "sha256-EclCwr0Oi6+5zF47niO0nt8wjNmb6cAADxd7S71DAiI";
};
};
};
};
tmuxPlugins = final: prev: {
tmuxPlugins = prev.tmuxPlugins // {
tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
pluginName = "tmux-super-fingers";
version = "v1-2024-02-14";
src = final.pkgs.fetchFromGitHub {
owner = "artemave";
repo = "tmux_super_fingers";
rev = "518044ef78efa1cf3c64f2e693fef569ae570ddd";
sha256 = "sha256-iKfx9Ytk2vSuINvQTB6Kww8Vv7i51cFEnEBHLje+IJw=";
};
};
};
};
catppuccinThemes = final: prev: {
catppuccinThemes =
import ./themes/catppuccin.nix { pkgs = final.pkgs; };
};
overlays = [
catppuccinThemes
vimPlugins
tmuxPlugins
inputs.neovim-nightly-overlay.overlay
anyrun-overlay
inputs.nixneovim.overlays.default
# inputs.nixneovimplugins.overlays.default
nur.overlay
];
in
{
nixosConfigurations =

1
config/nix/nixos/configuration.nix
View File

@@ -153,6 +153,7 @@
];
environment.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
NIXOS_OZONE_WL = "1";
};
programs = {

2
config/nix/nixos/ryu.nix
View File

@@ -42,7 +42,7 @@
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable;
package = config.boot.kernelPackages.nvidiaPackages.beta;
};

79
config/nix/overlays.nix Normal file
View File

@@ -0,0 +1,79 @@
{ inputs, ... }:
let
anyrun-overlay = final: prev: {
anyrun = inputs.anyrun.packages.${prev.system}.anyrun;
hyprwin = inputs.anyrun-hyprwin.packages.${prev.system}.hyprwin;
nixos-options =
inputs.anyrun-nixos-options.packages.${prev.system}.default;
anyrun-rink = inputs.anyrun-rink.packages.${prev.system}.default;
};
vimPlugins = final: prev: {
vimPlugins = prev.vimPlugins // {
comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
name = "comfortable-motion";
src = final.pkgs.fetchFromGitHub {
owner = "yuttie";
repo = "comfortable-motion.vim";
rev = "master";
sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
};
};
sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "sqls-nvim";
src = final.pkgs.fetchFromGitHub {
owner = "nanotee";
repo = "sqls.nvim";
rev = "master";
sha256 = "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s";
};
};
outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "outline-nvim";
src = final.pkgs.fetchFromGitHub {
owner = "hedyhli";
repo = "outline.nvim";
rev = "master";
sha256 = "sha256-HaxfnvgFy7fpa2CS7/dQhf6dK9+Js7wP5qGdIeXLGPY";
};
};
rest-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "rest-nvim";
src = final.pkgs.fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
rev = "main";
sha256 = "sha256-EclCwr0Oi6+5zF47niO0nt8wjNmb6cAADxd7S71DAiI";
};
};
};
};
tmuxPlugins = final: prev: {
tmuxPlugins = prev.tmuxPlugins // {
tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
pluginName = "tmux-super-fingers";
version = "v1-2024-02-14";
src = final.pkgs.fetchFromGitHub {
owner = "artemave";
repo = "tmux_super_fingers";
rev = "518044ef78efa1cf3c64f2e693fef569ae570ddd";
sha256 = "sha256-iKfx9Ytk2vSuINvQTB6Kww8Vv7i51cFEnEBHLje+IJw=";
};
};
};
};
catppuccinThemes = final: prev: {
catppuccinThemes =
import ./themes/catppuccin.nix { pkgs = final.pkgs; };
};
in
[
catppuccinThemes
vimPlugins
tmuxPlugins
inputs.neovim-nightly-overlay.overlay
anyrun-overlay
inputs.nixneovim.overlays.default
# inputs.nixneovimplugins.overlays.default
inputs.nur.overlay
]