Compare commits

...

3 Commits

7 changed files with 33 additions and 17 deletions

18
flake.lock generated
View File

@ -3,11 +3,11 @@
"alacritty-theme": { "alacritty-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732882063, "lastModified": 1733116860,
"narHash": "sha256-Xwb7yiJ1yAEoMi+lHUg//PEe9LaAJbMg2aaIp2tX7jc=", "narHash": "sha256-D37MQtNS20ESny5UhW1u6ELo9czP4l+q0S8neH7Wdbc=",
"owner": "alacritty", "owner": "alacritty",
"repo": "alacritty-theme", "repo": "alacritty-theme",
"rev": "5c90d86e6a9c95d47f8dbd1f8597136fa5556376", "rev": "95a7d695605863ede5b7430eb80d9e80f5f504bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -821,11 +821,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728031945, "lastModified": 1733124938,
"narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=", "narHash": "sha256-rEZ8SPMC4t5GdRNoas15uoj4qf9+mGKy3ITwmOQxpKc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2", "rev": "87e8fb4e970d04de3a4cd6ec964f89839cc5ec28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -959,11 +959,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1733015953,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -32,8 +32,18 @@
}; };
topgrade.enable = true; topgrade.enable = true;
neovim.enable = true; neovim.enable = true;
# kitty.enable = true; kitty = {
wezterm.enable = true; enable = true;
mkDefault = false;
};
wezterm = {
enable = true;
mkDefault = true;
};
alacritty = {
enable = true;
mkDefault = false;
};
yazi.enable = true; yazi.enable = true;
emacs.enable = true; emacs.enable = true;

View File

@ -25,6 +25,7 @@ in
{ {
options.modules.alacritty = { options.modules.alacritty = {
enable = lib.mkOption { default = false; }; enable = lib.mkOption { default = false; };
mkDefault = lib.mkOption { default = true; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -35,6 +36,6 @@ in
".config/alacritty/alacritty.toml".source = ./alacritty.toml; ".config/alacritty/alacritty.toml".source = ./alacritty.toml;
}; };
home.sessionVariables.TERMINAL = "alacritty"; home.sessionVariables.TERMINAL = lib.mkIf cfg.mkDefault "alacritty";
}; };
} }

View File

@ -25,6 +25,7 @@ in
{ {
options.modules.kitty = { options.modules.kitty = {
enable = lib.mkOption { default = false; }; enable = lib.mkOption { default = false; };
mkDefault = lib.mkOption { default = true; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -43,6 +44,10 @@ in
}; };
}; };
home.sessionVariables.TERMINAL = "kitty"; # home.shellAliases = {
# ssh = "kitten ssh"; # Copy kitten terminfo to remote
# };
home.sessionVariables.TERMINAL = lib.mkIf cfg.mkDefault "kitty";
}; };
} }

View File

@ -80,7 +80,6 @@ in
unstable.path-of-building # Path of Building unstable.path-of-building # Path of Building
# frajul.pob-dev-version # Path of Building # frajul.pob-dev-version # Path of Building
vlc vlc
wezterm # Terminal
wine wine
winetricks winetricks
xclip # x11 clipboard access from terminal xclip # x11 clipboard access from terminal

View File

@ -25,6 +25,7 @@ in
{ {
options.modules.wezterm = { options.modules.wezterm = {
enable = lib.mkOption { default = false; }; enable = lib.mkOption { default = false; };
mkDefault = lib.mkOption { default = true; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -35,7 +36,7 @@ in
local config = {} local config = {}
config.color_scheme = 'Catppuccin Mocha' config.color_scheme = 'Catppuccin Mocha'
-- config.font = wezterm.font 'DejaVu Sans' -- config.font = wezterm.font 'JetBrains Mono'
-- config.font_size = 12.0 -- config.font_size = 12.0
config.hide_tab_bar_if_only_one_tab = true config.hide_tab_bar_if_only_one_tab = true
config.audible_bell = 'Disabled' config.audible_bell = 'Disabled'
@ -47,7 +48,7 @@ in
''; '';
}; };
home.sessionVariables.TERMINAL = "wezterm-start-here"; home.sessionVariables.TERMINAL = lib.mkIf cfg.mkDefault "wezterm-start-here";
# Otherwise wezterm does not start in directory of parent process # Otherwise wezterm does not start in directory of parent process
home.packages = [ home.packages = [

View File

@ -45,7 +45,7 @@ in
]; ];
home.shellAliases = { home.shellAliases = {
y = "ya"; # Yazi shell wrapper (cd on quit) y = "yy"; # Yazi shell wrapper (cd on quit)
}; };
programs.yazi.enable = true; programs.yazi.enable = true;