phundrak/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: phundrak:275cd012431c403079a67a61cbc6af02f7a0350a
Branches Tags
phundrak:main
phundrak:develop
..
compare: phundrak:ddf67af125fc3d2dcb4f6b54f146336e5518555d
Branches Tags
phundrak:main
phundrak:develop

No commits in common. "275cd012431c403079a67a61cbc6af02f7a0350a" and "ddf67af125fc3d2dcb4f6b54f146336e5518555d" have entirely different histories.
275cd01243 ... ddf67af125

15 changed files with 50 additions and 150 deletions
Show Stats Expand all files Collapse all files

67
flake.lock generated
View File

@ -142,11 +142,11 @@
]
},
"locked": {
"lastModified": 1748134483,
"narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=",
"lastModified": 1747978958,
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c1e671036224089937e111e32ea899f59181c383",
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
"type": "github"
},
"original": {
@ -211,11 +211,11 @@
]
},
"locked": {
"lastModified": 1748145500,
"narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=",
"lastModified": 1747540584,
"narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "a98adbf54d663395df0b9929f6481d4d80fc8927",
"rev": "ec179dd13fb7b4c6844f55be91436f7857226dce",
"type": "github"
},
"original": {
@ -274,11 +274,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1748026106,
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"lastModified": 1747744144,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
"type": "github"
},
"original": {
@ -288,59 +288,16 @@
"type": "github"
}
},
"pumo-system-info": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1748127405,
"narHash": "sha256-5Xh7VXmjeK5m8Dxt2bti8A2HdkpmPftHc2+WXH3tQH8=",
"ref": "refs/heads/develop",
"rev": "06fa652f9626590a9727f3ec8b48330ad3fcb78f",
"revCount": 6,
"type": "git",
"url": "https://labs.phundrak.com/phundrak/pumo-system-info"
},
"original": {
"type": "git",
"url": "https://labs.phundrak.com/phundrak/pumo-system-info"
}
},
"root": {
"inputs": {
"devenv": "devenv",
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_4",
"pumo-system-info": "pumo-system-info",
"sops-nix": "sops-nix",
"zen-browser": "zen-browser"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"pumo-system-info",
"nixpkgs"
]
},
"locked": {
"lastModified": 1748054080,
"narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -368,11 +325,11 @@
]
},
"locked": {
"lastModified": 1748059546,
"narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=",
"lastModified": 1747886840,
"narHash": "sha256-onMR+v1i/Wf4MhaBtZ8N0ciRYOJITZDJrfZ4FxDmODw=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "716a5af28d686d67146d01b14112c919b6133a84",
"rev": "47237b74af73d19729fd5d851665b2ecdd775745",
"type": "github"
},
"original": {

5
flake.nix
View File

@ -15,11 +15,6 @@
devenv.url = "github:cachix/devenv";
pumo-system-info = {
url = "git+https://labs.phundrak.com/phundrak/pumo-system-info";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";

1
users/modules/default.nix
View File

@ -12,6 +12,7 @@
./shell
./ssh.nix
./tealdeer.nix
./tmux.nix
./vcs
];
}

1
users/modules/emacs.nix
View File

@ -7,6 +7,7 @@
with lib; let
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
epkgs: [
epkgs.vterm
epkgs.mu4e
epkgs.pdf-tools
]

2
users/modules/hyprland.nix
View File

@ -121,7 +121,7 @@ in {
$down = t
$menu = ${pkgs.wofi}/bin/wofi --show drun
bind = SUPER, Return, exec, ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux
bind = SUPER, Return, exec, kitty
bind = SUPER, Space, submap, leader
bind = , Print, submap, screenshot

2
users/modules/kitty.nix
View File

@ -1,4 +1,4 @@
{pkgs, ...}: {
{pkgs, ...}:{
programs.kitty = {
enable = true;
themeFile = "Nord";

16
users/modules/shell/bash.nix
View File

@ -7,8 +7,8 @@ with lib; let
cfg = config.modules.bash;
in {
options.modules.bash = {
enable = mkEnableOption "Enables bash";
aliases = mkOption {
enable = lib.mkEnableOption "enables bash";
aliases = lib.mkOption {
type = types.attrsOf types.str;
default = {};
example = {
@ -16,23 +16,15 @@ in {
lns = "ln -si";
};
};
eatIntegration = mkEnableOption "Enable Emacs Eat integration";
bashrcExtra = mkOption {
bashrcExtra = lib.mkOption {
type = types.lines;
default = "";
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
programs.bash = {
enable = true;
# inherit (cfg) bashrcExtra;
bashrcExtra =
concatLines
[
(strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"'')
cfg.bashrcExtra
];
shellAliases = cfg.aliases;
shellOptions = [
"histappend"

23
users/modules/shell/default.nix
View File

@ -17,19 +17,6 @@ with lib; let
psmem10 = "ps auxf | sort -nr -k 4 | head -10";
s = "systemctl";
ss = "systemctl status";
sst = "systemctl stop";
sr = "systemctl restart";
sre = "systemctl reload";
se = "systemctl enable";
sen = "systemctl enable --now";
su = "systemctl --user";
sus = "systemctl --user status";
sust = "systemctl --user stop";
sur = "systemctl --user restart";
sure = "systemctl --user reload";
sue = "systemctl --user enable";
suen = "systemctl --user enable --now";
dc = "docker compose";
dcd = "docker compose down";
@ -67,32 +54,29 @@ in {
./bash.nix
./fish.nix
./starship.nix
./tmux.nix
./zsh.nix
];
options.modules.shell = {
eatIntegration = mkEnableOption "Enable Emacs Eat integration in Bash or Zsh";
enableBash = mkOption {
type = types.bool;
default = true;
description = "Enables bash";
description = "enables bash";
};
enableFish = mkOption {
type = types.bool;
default = true;
description = "Enables fish";
description = "enables fish";
};
enableZsh = mkOption {
type = types.bool;
default = true;
description = "Enables zsh";
description = "enables zsh";
};
starship = {
enable = mkEnableOption "Enables the starship prompt.";
jjIntegration = mkEnableOption "Enables Jujutsu integration in starship.";
};
tmux.enable = mkEnableOption "Enables tmux";
zoxide = {
enable = mkOption {
type = types.bool;
@ -127,7 +111,6 @@ in {
enable = mkDefault cfg.enableZsh;
abbrs = mkDefault aliases;
};
tmux.enable = cfg.tmux.enable;
inherit (cfg) starship;
};

18
users/modules/shell/fish.nix
View File

@ -17,10 +17,6 @@ in {
lns = "ln -si";
};
};
extraShellInit = mkOption {
type = types.lines;
default = "";
};
};
config = lib.mkIf cfg.enable {
@ -28,15 +24,11 @@ in {
enable = true;
shellAbbrs = cfg.abbrs;
preferAbbrs = true;
shellInit = with lib;
concatLines [
''
function fish_command_not_found
__fish_default_command_not_found_handler $argv
end
''
cfg.extraShellInit
];
shellInit = ''
function fish_command_not_found
__fish_default_command_not_found_handler $argv
end
'';
plugins = [
{
name = "bass";

6
users/modules/shell/starship.nix
View File

@ -14,8 +14,8 @@ in {
config.programs.starship = mkIf cfg.enable {
inherit (cfg) enable;
enableTransience = true;
settings = {
custom.jj = {
settings.custom = {
jj = {
description = "The current jj status";
detect_folders = [".jj"];
symbol = "🥋 ";
@ -36,7 +36,7 @@ in {
truncate_end(29, description.first_line(), "…"),
"(no description set)",
) ++ raw_escape_sequence("\x1b[0m"),
)
)
'
'';
};

32
users/modules/shell/zsh.nix
View File

@ -8,7 +8,7 @@ with lib; let
cfg = config.modules.zsh;
in {
options.modules.zsh = {
enable = lib.mkEnableOption "Enables zsh";
enable = lib.mkEnableOption "enables zsh";
abbrs = lib.mkOption {
type = types.attrsOf types.str;
default = {};
@ -17,10 +17,19 @@ in {
lns = "ln -si";
};
};
eatIntegration = mkEnableOption "Enable Emacs Eat integration";
zshrcExtra = lib.mkOption {
type = types.lines;
default = "";
default = ''
bindkey -e
bindkey '^p' history-search-backward
bindkey '^n' history-search-forward
# Completion styling
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
zstyle ':completion:*' menu no
zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath'
'';
};
};
@ -41,22 +50,7 @@ in {
saveNoDups = true;
};
historySubstringSearch.enable = true;
initContent = with lib;
concatLines [
''
bindkey -e
bindkey '^p' history-search-backward
bindkey '^n' history-search-forward
# Completion styling
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
zstyle ':completion:*' menu no
zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath'
''
(strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"'')
cfg.zshrcExtra
];
initContent = cfg.zshrcExtra;
oh-my-zsh = {
enable = true;
plugins = [

15
users/modules/shell/tmux.nix → users/modules/tmux.nix
View File

@ -1,15 +1,6 @@
{
pkgs,
lib,
config,
...
}:
with lib; let
cfg = config.modules.tmux;
in {
options.modules.tmux.enable = mkEnableOption "Enable tmux";
config.programs.tmux = mkIf cfg.enable {
inherit (cfg) enable;
{pkgs, ...}: {
programs.tmux = {
enable = true;
baseIndex = 1;
clock24 = true;
customPaneNavigationAndResize = true;

6
users/phundrak/home.nix
View File

@ -24,6 +24,7 @@
config = let
emacsPkg = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
epkgs: [
epkgs.vterm
epkgs.mu4e
epkgs.pdf-tools
]
@ -48,10 +49,7 @@
};
modules = {
shell = {
eatIntegration = true;
starship.jjIntegration = true;
};
shell.starship.jjIntegration = true;
bat.extras = true;
packages.emacsPackage = emacsPkg;
mopidy.enable = true;

5
users/phundrak/light-home.nix
View File

@ -51,10 +51,7 @@ in {
};
modules = {
shell = {
starship.enable = true;
tmux.enable = true;
};
shell.starship.enable = true;
vcs = {
git.enable = true;
jj.enable = true;

1
users/phundrak/packages.nix
View File

@ -62,7 +62,6 @@ in {
syncthing
watchmate
inputs.zen-browser.packages.${system}.default
inputs.pumo-system-info.packages.${system}.default
# Games
atlauncher