noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-26 07:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass other values as arg

Browse Source
This commit is contained in:
Noah Masur 2022-04-28 20:54:37 -04:00
parent 71e4cc2f5a
commit b922cd8f09
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -22,11 +22,17 @@
};
user = "noah";
fullName = "Noah Masur";
font = {
package = pkgs.victor-mono;
name = "Victor Mono";
};
in {
nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit user; };
specialArgs = { inherit user fullName font; };
modules = [
./nixos/configuration.nix
home-manager.nixosModules.home-manager
@ -34,7 +40,7 @@
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit user; };
extraSpecialArgs = { inherit user fullName font; };
users.${user} = {
imports = [
./nixos/home.nix

4
modules/applications/alacritty.nix
View File

@ -1,4 +1,4 @@
{ pkgs, config, ... }: {
{ pkgs, config, font, ... }: {
programs.alacritty = {
enable = true;
settings = {
@ -15,7 +15,7 @@
scrolling.history = 10000;
font = {
size = 14.0;
normal = { family = "${config.font}"; };
normal = { family = font.name; };
};
key_bindings = [
{

2
modules/shell/default.nix
View File

@ -1 +1 @@
{ pkgs, dotfiles, nixos_config ... }: { imports = [ ./fish.nix ]; }
{ ... }: { imports = [ ./fish.nix ]; }

9
modules/shell/fish.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: {
{ pkgs, ... }: {
programs.fish = {
enable = true;
@ -25,8 +25,9 @@
s = "sudo";
sc = "systemctl";
scs = "systemctl status";
reb =
"nixos-rebuild switch -I nixos-config=${config.nixos_config}/configuration.nix";
reb = "nixos-rebuild switch -I nixos-config=${
builtins.toString ../../nixos/.
}/configuration.nix";
# Tmux
ta = "tmux attach-session";
@ -37,7 +38,7 @@
v = "vim";
vl = "vim -c 'normal! `0'";
vll = "vim -c 'Telescope oldfiles'";
vimrc = "vim ${config.dotfiles}/nvim.configlink/init.lua";
vimrc = "vim ${builtins.toString ../../.}/nvim.configlink/init.lua";
# Notes
qn = "quicknote";

6
modules/shell/git.nix
View File

@ -1,12 +1,12 @@
{ config, pkgs, ... }: {
{ config, pkgs, fullName, ... }: {
programs.git = {
enable = true;
userName = "${config.fullName}";
userName = fullName;
userEmail = "7386960+nmasur@users.noreply.github.com";
extraConfig = {
pager = { branch = "false"; };
safe = { directory = "${config.dotfiles}"; };
safe = { directory = builtins.toString ../../.; };
};
};

13
nixos/home.nix
View File

@ -2,8 +2,6 @@
let
dotfiles = builtins.toString ../.;
nixos_config = builtins.toString ./.;
notes_path = "$HOME/dev/personal/notes";
ignore_patterns = ''
@ -20,11 +18,6 @@ let
in {
options = with lib; {
testuser = mkOption { default = user; };
fullName = mkOption { default = "Noah Masur"; };
font = mkOption { default = "Victor Mono"; };
nixos_config = mkOption { default = nixos_config; };
dotfiles = mkOption { default = dotfiles; };
ignorePatterns = mkOption { default = ignore_patterns; };
};
@ -51,8 +44,8 @@ in {
gtk.theme = { name = "Adwaita-dark"; };
home.sessionVariables = {
NIXOS_CONFIG = "${nixos_config}";
DOTS = "${dotfiles}";
NIXOS_CONFIG = builtins.toString ./.;
DOTS = builtins.toString ../.;
NOTES_PATH = "${notes_path}";
};
@ -66,7 +59,7 @@ in {
programs.direnv = {
enable = true;
nix-direnv.enable = true;
config = { whitelist = { prefix = [ "${dotfiles}/" ]; }; };
config = { whitelist = { prefix = [ "${builtins.toString ../.}/" ]; }; };
};
# Email