Rename directory structure
This commit is contained in:
parent
20991e634f
commit
572e82a249
GPG Key ID:
530DA0331EFE99F5
|
|
@ -49,7 +49,7 @@
|
|||
system = "x86_64-linux";
|
||||
username = "josh";
|
||||
profile = "desktop";
|
||||
homePath = ./. + "/homes/${username}/home.nix";
|
||||
homePath = ./. + "/users/${username}/home.nix";
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
imports = [
|
||||
../../profiles/desktop
|
||||
|
||||
../../modules/core
|
||||
../../modules/nixos
|
||||
../../modules/drivers
|
||||
../../modules/options
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
imports = [
|
||||
../../profiles/desktop
|
||||
|
||||
../../modules/core
|
||||
../../modules/nixos
|
||||
../../modules/drivers
|
||||
../../modules/options
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
imports = [
|
||||
../../profiles/desktop
|
||||
|
||||
../../modules/core
|
||||
../../modules/nixos
|
||||
../../modules/drivers
|
||||
../../modules/options
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,101 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox;
|
||||
configPath = "${config.xdg.configHome}/mozilla/firefox";
|
||||
|
||||
policies = {
|
||||
# Updates & Background Services
|
||||
AppAutoUpdate = false;
|
||||
BackgroundAppUpdate = false;
|
||||
|
||||
# Quality of Life
|
||||
OfferToSaveLogins = false;
|
||||
|
||||
# Extensions
|
||||
ExtensionSettings =
|
||||
let
|
||||
moz = short: "https://addons.mozilla.org/firefox/downloads/latest/${short}/latest.xpi";
|
||||
in
|
||||
{
|
||||
"*".installation_mode = "blocked";
|
||||
|
||||
# uBlock Origin
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url = moz "ublock-origin";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "navbar";
|
||||
};
|
||||
|
||||
# Bitwarden
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
install_url = moz "bitwarden-password-manager";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "navbar";
|
||||
};
|
||||
|
||||
# Dark Reader
|
||||
"addon@darkreader.org" = {
|
||||
install_url = moz "darkreader";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "navbar";
|
||||
};
|
||||
|
||||
# SponsorBlock
|
||||
"sponsorBlocker@ajay.app" = {
|
||||
install_url = moz "sponsorblock";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "menupanel";
|
||||
};
|
||||
|
||||
# Return YouTube Dislike
|
||||
"{762f9885-5a13-4abd-9c77-433dcd38b8fd}" = {
|
||||
install_url = moz "return-youtube-dislikes";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "menupanel";
|
||||
};
|
||||
|
||||
# RES
|
||||
"jid1-xUfzOsOFlzSOXg@jetpack" = {
|
||||
install_url = moz "reddit-enhancement-suite";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "menupanel";
|
||||
};
|
||||
};
|
||||
|
||||
"3rdparty".Extensions = {
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
environment = {
|
||||
base = "https://bitwarden.joshuayuen.me";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
profiles = {
|
||||
${username} = {
|
||||
id = 0;
|
||||
isDefault = true;
|
||||
name = "${username}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,8 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
let hyprlandCfg = config.modules.hyprland;
|
||||
let
|
||||
hyprlandCfg = config.modules.hyprland;
|
||||
in
|
||||
{
|
||||
imports = [ inputs.walker.homeManagerModules.default ];
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.zsh;
|
||||
xdgCfg = config.xdg;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./completion.nix
|
||||
./p10k.nix
|
||||
];
|
||||
|
||||
programs.zsh = {
|
||||
enable = cfg.enable;
|
||||
dotDir = "${xdgCfg.configHome}/zsh";
|
||||
autosuggestion.enable = false;
|
||||
enableCompletion = false;
|
||||
syntaxHighlighting = {
|
||||
enable = true;
|
||||
highlighters = [
|
||||
"main"
|
||||
"brackets"
|
||||
"pattern"
|
||||
"root"
|
||||
];
|
||||
};
|
||||
historySubstringSearch.enable = true;
|
||||
history = {
|
||||
append = true;
|
||||
ignoreDups = false;
|
||||
ignoreSpace = true;
|
||||
save = 100000;
|
||||
share = true;
|
||||
size = 100000;
|
||||
extended = true;
|
||||
};
|
||||
|
||||
initContent =
|
||||
let
|
||||
zshConfigInitEarly = mkOrder 500 ''
|
||||
# p10k
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
|
||||
source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
|
||||
fi
|
||||
source "${xdgCfg.configHome}/zsh/p10k.zsh";
|
||||
'';
|
||||
zshConfig = mkOrder 1000 ''
|
||||
# Autocompletion and menu styling
|
||||
zmodload zsh/complist
|
||||
autoload -Uz compinit && compinit
|
||||
source "${xdgCfg.configHome}/zsh/completion.zsh";
|
||||
|
||||
# vi keybindings for menu select
|
||||
bindkey -M menuselect 'h' vi-backward-char
|
||||
bindkey -M menuselect 'k' vi-up-line-or-history
|
||||
bindkey -M menuselect 'j' vi-down-line-or-history
|
||||
bindkey -M menuselect 'l' vi-forward-char
|
||||
|
||||
# Tab to accept current selection
|
||||
bindkey -M menuselect '^I' accept-and-infer-next-history
|
||||
|
||||
# Control arrow keys
|
||||
bindkey '^[[1;5C' forward-word
|
||||
bindkey '^[[1;5D' backward-word
|
||||
|
||||
# Control backspace
|
||||
bindkey '^H' backward-kill-word
|
||||
'';
|
||||
in
|
||||
mkMerge [
|
||||
zshConfigInitEarly
|
||||
zshConfig
|
||||
];
|
||||
|
||||
shellAliases = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
ls = "ls --color=auto";
|
||||
ll = "ls -al";
|
||||
grep = "grep --color=auto";
|
||||
back = "cd $OLDPWD";
|
||||
gs = "git status";
|
||||
ssha = "eval $(ssh-agent) && ssh-add";
|
||||
};
|
||||
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
|
||||
file = "powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "zsh-autocomplete";
|
||||
src = "${pkgs.zsh-autocomplete}/share/zsh-autocomplete/";
|
||||
file = "zsh-autocomplete.zsh";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox;
|
||||
configPath = "${config.xdg.configHome}/mozilla/firefox";
|
||||
|
||||
policies = {
|
||||
# Updates & Background Services
|
||||
AppAutoUpdate = false;
|
||||
BackgroundAppUpdate = false;
|
||||
|
||||
# Quality of Life
|
||||
OfferToSaveLogins = false;
|
||||
|
||||
# Extensions
|
||||
ExtensionSettings = let
|
||||
moz = short: "https://addons.mozilla.org/firefox/downloads/latest/${short}/latest.xpi";
|
||||
in {
|
||||
"*".installation_mode = "blocked";
|
||||
|
||||
# uBlock Origin
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url = moz "ublock-origin";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "navbar";
|
||||
};
|
||||
|
||||
# Bitwarden
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
install_url = moz "bitwarden-password-manager";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "navbar";
|
||||
};
|
||||
|
||||
# Dark Reader
|
||||
"addon@darkreader.org" = {
|
||||
install_url = moz "darkreader";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "navbar";
|
||||
};
|
||||
|
||||
# SponsorBlock
|
||||
"sponsorBlocker@ajay.app" = {
|
||||
install_url = moz "sponsorblock";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "menupanel";
|
||||
};
|
||||
|
||||
# Return YouTube Dislike
|
||||
"{762f9885-5a13-4abd-9c77-433dcd38b8fd}" = {
|
||||
install_url = moz "return-youtube-dislikes";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "menupanel";
|
||||
};
|
||||
|
||||
# RES
|
||||
"jid1-xUfzOsOFlzSOXg@jetpack" = {
|
||||
install_url = moz "reddit-enhancement-suite";
|
||||
installation_mode = "force_installed";
|
||||
updates_disabled = true;
|
||||
private_browsing = true;
|
||||
default_area = "menupanel";
|
||||
};
|
||||
};
|
||||
|
||||
"3rdparty".Extensions = {
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
environment = {
|
||||
base = "https://bitwarden.joshuayuen.me";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
profiles = {
|
||||
${username} = {
|
||||
id = 0;
|
||||
isDefault = true;
|
||||
name = "${username}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.zsh;
|
||||
xdgCfg = config.xdg;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./completion.nix
|
||||
./p10k.nix
|
||||
];
|
||||
|
||||
programs.zsh = {
|
||||
enable = cfg.enable;
|
||||
dotDir = "${xdgCfg.configHome}/zsh";
|
||||
autosuggestion.enable = false;
|
||||
enableCompletion = false;
|
||||
syntaxHighlighting = {
|
||||
enable = true;
|
||||
highlighters = [
|
||||
"main"
|
||||
"brackets"
|
||||
"pattern"
|
||||
"root"
|
||||
];
|
||||
};
|
||||
historySubstringSearch.enable = true;
|
||||
history = {
|
||||
append = true;
|
||||
ignoreDups = false;
|
||||
ignoreSpace = true;
|
||||
save = 100000;
|
||||
share = true;
|
||||
size = 100000;
|
||||
extended = true;
|
||||
};
|
||||
|
||||
initContent =
|
||||
let
|
||||
zshConfigInitEarly = mkOrder 500 ''
|
||||
# p10k
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
|
||||
source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
|
||||
fi
|
||||
source "${xdgCfg.configHome}/zsh/p10k.zsh";
|
||||
'';
|
||||
zshConfig = mkOrder 1000 ''
|
||||
# Autocompletion and menu styling
|
||||
zmodload zsh/complist
|
||||
autoload -Uz compinit && compinit
|
||||
source "${xdgCfg.configHome}/zsh/completion.zsh";
|
||||
|
||||
# vi keybindings for menu select
|
||||
bindkey -M menuselect 'h' vi-backward-char
|
||||
bindkey -M menuselect 'k' vi-up-line-or-history
|
||||
bindkey -M menuselect 'j' vi-down-line-or-history
|
||||
bindkey -M menuselect 'l' vi-forward-char
|
||||
|
||||
# Tab to accept current selection
|
||||
bindkey -M menuselect '^I' accept-and-infer-next-history
|
||||
|
||||
# Control arrow keys
|
||||
bindkey '^[[1;5C' forward-word
|
||||
bindkey '^[[1;5D' backward-word
|
||||
|
||||
# Control backspace
|
||||
bindkey '^H' backward-kill-word
|
||||
'';
|
||||
in mkMerge [ zshConfigInitEarly zshConfig ];
|
||||
|
||||
shellAliases = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
ls = "ls --color=auto";
|
||||
ll = "ls -al";
|
||||
grep = "grep --color=auto";
|
||||
back = "cd $OLDPWD";
|
||||
gs = "git status";
|
||||
ssha = "eval $(ssh-agent) && ssh-add";
|
||||
};
|
||||
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
|
||||
file = "powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "zsh-autocomplete";
|
||||
src = "${pkgs.zsh-autocomplete}/share/zsh-autocomplete/";
|
||||
file = "zsh-autocomplete.zsh";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
in
|
||||
{
|
||||
imports = [
|
||||
../../modules/homes
|
||||
../../modules/home
|
||||
../../modules/options
|
||||
../../profiles/${profile}
|
||||
];
|
||||
Loading…
Reference in New Issue