parent
a4829b0bab
commit
8ba117e22b
40 changed files with 176 additions and 169 deletions
homeManagerModules
firefox
neovim/langs/web
shell
|
@ -4,7 +4,7 @@ self: {
|
|||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (self.scopedPackages.${pkgs.system}) firefoxAddons;
|
||||
inherit (pkgs.scopedPackages) firefoxAddons;
|
||||
|
||||
inherit (lib) attrsToList attrValues mkIf mkOption singleton types;
|
||||
|
||||
|
|
|
@ -4,8 +4,7 @@
|
|||
nodejs_latest,
|
||||
vscode-langservers-extracted,
|
||||
nodePackages,
|
||||
self,
|
||||
system,
|
||||
some-sass-language-server,
|
||||
...
|
||||
}:
|
||||
mkShell {
|
||||
|
@ -16,6 +15,6 @@ mkShell {
|
|||
|
||||
nodePackages.npm
|
||||
|
||||
self.packages.${system}.some-sass-language-server
|
||||
some-sass-language-server
|
||||
];
|
||||
}
|
||||
|
|
|
@ -9,10 +9,10 @@ self: {
|
|||
in {
|
||||
imports = [
|
||||
./starship
|
||||
./trash
|
||||
(import ./git self)
|
||||
(import ./misc self)
|
||||
(import ./nix-tools self)
|
||||
(import ./trash self)
|
||||
];
|
||||
|
||||
options.programs.bash = {
|
||||
|
|
|
@ -26,7 +26,7 @@ in {
|
|||
signing.format = "ssh";
|
||||
|
||||
includes = [
|
||||
{path = toString self.scopedPackages.${pkgs.system}.dracula.git;}
|
||||
{path = toString pkgs.scopedPackages.dracula.git;}
|
||||
|
||||
(mkDefaultRemote "https://github.com")
|
||||
(mkDefaultRemote "git@github.com")
|
||||
|
|
|
@ -48,7 +48,7 @@ in {
|
|||
enable = true;
|
||||
|
||||
config.theme = "dracula-bat";
|
||||
themes.dracula-bat.src = self.scopedPackages.${pkgs.system}.dracula.bat;
|
||||
themes.dracula-bat.src = pkgs.scopedPackages.dracula.bat;
|
||||
|
||||
extraPackages = attrValues {
|
||||
inherit (pkgs.bat-extras) batman;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
self: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
|
@ -7,7 +7,7 @@ self: {
|
|||
inherit (lib) elem mkIf;
|
||||
|
||||
cfg = config.programs.bash;
|
||||
trashPkg = self.packages.${pkgs.system}.trash-d;
|
||||
trashPkg = pkgs.selfPackages.trash-d;
|
||||
isCorrectPlatform = elem pkgs.system (trashPkg.meta.platforms or [pkgs.system]);
|
||||
in {
|
||||
config = mkIf (cfg.enable && isCorrectPlatform) {
|
||||
|
@ -15,7 +15,4 @@ in {
|
|||
|
||||
programs.bash.shellAliases.rm = "trash";
|
||||
};
|
||||
|
||||
# For accurate stack trace
|
||||
_file = ./default.nix;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue