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

refactor: simplify HM extraSpecialArgs

Browse source
This commit is contained in:
winston 2023-02-10 06:34:05 +01:00
parent 300d7aa00a
commit fa5caa32d7
Signed by: winston
GPG key ID: 3786770EDBC2B481
7 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -55,12 +55,8 @@
extraSpecialArgs = { extraSpecialArgs = {
nur = nur.nixosModules.nur; nur = nur.nixosModules.nur;
sops = sops.homeManagerModules.sops; sops = sops.homeManagerModules.sops;
machine = { flakePath = "/Users/winston/.config/nixpkgs";
username = "winston"; machine.personal = true;
homeDirectory = "/Users/winston";
personal = true;
flakePath = "/Users/winston/.config/nixpkgs";
};
}; };
}; };
}; };

6
home.nix
View file

@ -92,8 +92,8 @@ in
xdg = { xdg = {
enable = true; enable = true;
userDirs.enable = isLinux; userDirs.enable = isLinux;
cacheHome = "${machine.homeDirectory}/.cache"; cacheHome = "${config.home.homeDirectory}/.cache";
configHome = "${machine.homeDirectory}/.config"; configHome = "${config.home.homeDirectory}/.config";
dataHome = "${machine.homeDirectory}/.local/share"; dataHome = "${config.home.homeDirectory}/.local/share";
}; };
} }

4
modules/i3.nix
View file

@ -1,4 +1,4 @@
{ config, lib, machine, pkgs, ... }: { config, lib, flakePath, pkgs, ... }:
let let
inherit (pkgs.stdenv.hostPlatform) isLinux; inherit (pkgs.stdenv.hostPlatform) isLinux;
@ -168,7 +168,7 @@ in
xdg = lib.mkIf isLinux { xdg = lib.mkIf isLinux {
configFile = { configFile = {
"i3" = { "i3" = {
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/i3"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/i3";
recursive = true; recursive = true;
}; };
}; };

4
modules/neovim.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, machine, ... }: { config, pkgs, flakePath, ... }:
{ {
programs.neovim = { programs.neovim = {
@ -72,7 +72,7 @@
}; };
xdg.configFile."nvim" = { xdg.configFile."nvim" = {
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/nvim"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/nvim";
recursive = true; recursive = true;
}; };
} }

6
modules/vscode.nix
View file

@ -1,4 +1,4 @@
{ config, lib, machine, pkgs, ... }: { config, flakePath, lib, pkgs, ... }:
let let
inherit (pkgs.stdenv.hostPlatform) isLinux; inherit (pkgs.stdenv.hostPlatform) isLinux;
@ -20,11 +20,11 @@ in
home.file = { home.file = {
"${config.xdg.configHome}/Code/User/settings.json" = { "${config.xdg.configHome}/Code/User/settings.json" = {
enable = isLinux; enable = isLinux;
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json";
}; };
"Library/Application Support/Code/User/settings.json" = { "Library/Application Support/Code/User/settings.json" = {
enable = isDarwin; enable = isDarwin;
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json";
}; };
}; };
} }

4
modules/wezterm.nix
View file

@ -1,9 +1,9 @@
{ config, machine, ... }: { config, flakePath, ... }:
{ {
xdg.configFile = { xdg.configFile = {
"wezterm" = { "wezterm" = {
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/wezterm"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/wezterm";
recursive = true; recursive = true;
}; };
}; };

8
modules/zsh.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, machine, ... }: { config, flakePath, lib, pkgs, ... }:
{ {
programs = { programs = {
@ -33,7 +33,7 @@
enableSyntaxHighlighting = true; enableSyntaxHighlighting = true;
initExtra = let initExtra = let
functionsDir = "${machine.homeDirectory}/${config.programs.zsh.dotDir}/functions"; functionsDir = "${config.home.homeDirectory}/${config.programs.zsh.dotDir}/functions";
in in
'' ''
for conf in "${functionsDir}"/**/*.zsh; do for conf in "${functionsDir}"/**/*.zsh; do
@ -87,11 +87,11 @@
xdg.configFile = { xdg.configFile = {
"lsd" = { "lsd" = {
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/lsd/themes"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/lsd/themes";
recursive = true; recursive = true;
}; };
"zsh/functions" = { "zsh/functions" = {
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/zsh/functions"; source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/zsh/functions";
recursive = true; recursive = true;
}; };
}; };