unclutter
This commit is contained in:
@ -18,6 +18,12 @@ in {
|
||||
config = lib.mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd = {
|
||||
enable = true;
|
||||
variables = [
|
||||
"--all"
|
||||
];
|
||||
};
|
||||
package = pkgs.hyprland;
|
||||
plugins = with pkgs.hyprlandPlugins; [
|
||||
hyprexpo
|
||||
@ -52,14 +58,11 @@ in {
|
||||
xwayland.force_zero_scaling = true;
|
||||
monitor = [
|
||||
", preferred, auto, 1"
|
||||
# "desc:AOC 27V2G5 0x0000026C, highrr, -1920x0, 1" # , bitdepth, 10"
|
||||
"desc:AOC 27V2G5 0x0000026C, addreserved, 0, 300, 0, 0"
|
||||
# "HDMI-A-1, addreserved, 0, 300, 0, 0"
|
||||
"desc:Samsung Electric Company S24R65x H4TMA03291, preferred, 0x0, 1, bitdepth, 10, vrr, 1"
|
||||
"desc:Philips Consumer Electronics Company 27M2N5500 UK02418033254, 2560x1440@180.00Hz, 0x0, 1.3333333, bitdepth, 10, vrr, 1"
|
||||
"desc:BOE 0x08E8, preferred, 1920x0, 1.2, bitdepth, 10"
|
||||
# "desc:Samsung Electric Company S24R65x H4TMA03291, preferred, 0x0, 1, bitdepth, 10"
|
||||
"desc:BOE 0x08E8, preferred, 1920x0, 1.2"
|
||||
"desc:LG Display 0x068B, preferred, 1920x0, 1.2, bitdepth, 10"
|
||||
"desc:Chimei Innolux Corporation 0x1406, preferred, 1920x0, 1.2"
|
||||
];
|
||||
env = [
|
||||
@ -410,24 +413,14 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
services.playerctld.enable = true;
|
||||
services.gnome-keyring = {
|
||||
enable = true;
|
||||
components = ["secrets" "ssh"];
|
||||
};
|
||||
services.ssh-agent.enable = true;
|
||||
programs.keychain = {
|
||||
enable = false;
|
||||
keys = ["id_ed25519"];
|
||||
enableNushellIntegration = true;
|
||||
extraFlags = [
|
||||
"--quiet"
|
||||
"--noask"
|
||||
];
|
||||
};
|
||||
services = {
|
||||
network-manager-applet.enable = true;
|
||||
blueman-applet.enable = true;
|
||||
playerctld.enable = true;
|
||||
copyq.enable = true;
|
||||
};
|
||||
gtk = {
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
osConfig,
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
@ -19,7 +18,6 @@ in {
|
||||
hyprlock.enable = false;
|
||||
};
|
||||
services = {
|
||||
ssh-agent.enable = true;
|
||||
playerctld.enable = true;
|
||||
network-manager-applet.enable = true;
|
||||
copyq.enable = true;
|
||||
@ -1278,16 +1276,6 @@ in {
|
||||
};
|
||||
|
||||
programs.wpaperd.enable = true;
|
||||
programs.keychain = {
|
||||
enable = true;
|
||||
keys = ["gitea-local"];
|
||||
enableNushellIntegration = true;
|
||||
extraFlags = [
|
||||
"--quiet"
|
||||
"--noask"
|
||||
];
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
niri
|
||||
nautilus
|
||||
|
@ -12,89 +12,101 @@ in {
|
||||
mkEnableOption "enable nushell";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.oh-my-posh.enableNushellIntegration = true;
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
programs.carapace = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
programs.atuin = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
flags = [
|
||||
"--disable-up-arrow"
|
||||
];
|
||||
};
|
||||
programs.nushell = {
|
||||
enable = true;
|
||||
environmentVariables = {
|
||||
CARAPACE_BRIDGES = "zsh,fish,bash,inshellisense";
|
||||
CARAPACE_MATCH = 1;
|
||||
EDITOR = "hx";
|
||||
programs = {
|
||||
atuin = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
flags = [
|
||||
"--disable-up-arrow"
|
||||
];
|
||||
};
|
||||
shellAliases = {
|
||||
cd = "z";
|
||||
cat = "bat";
|
||||
l = "ls -l";
|
||||
nix-shell = "nix-shell --command nu";
|
||||
carapace = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
extraConfig = ''
|
||||
$env.config = {
|
||||
show_banner: false
|
||||
shell_integration: {
|
||||
# osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
|
||||
osc2: true
|
||||
# osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
|
||||
osc7: true
|
||||
# osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
|
||||
osc8: true
|
||||
# osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
|
||||
osc9_9: false
|
||||
# osc133 is several escapes invented by Final Term which include the supported ones below.
|
||||
# 133;A - Mark prompt start
|
||||
# 133;B - Mark prompt end
|
||||
# 133;C - Mark pre-execution
|
||||
# 133;D;exit - Mark execution finished with exit code
|
||||
# This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
|
||||
osc133: true
|
||||
# osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
|
||||
# 633;A - Mark prompt start
|
||||
# 633;B - Mark prompt end
|
||||
# 633;C - Mark pre-execution
|
||||
# 633;D;exit - Mark execution finished with exit code
|
||||
# 633;E - Explicitly set the command line with an optional nonce
|
||||
# 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
|
||||
# and also helps with the run recent menu in vscode
|
||||
osc633: true
|
||||
# reset_application_mode is escape \x1b[?1l and was added to help ssh work better
|
||||
reset_application_mode: true
|
||||
}
|
||||
zoxide = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
oh-my-posh.enableNushellIntegration = true;
|
||||
keychain = {
|
||||
enable = true;
|
||||
keys = ["id_ed25519"];
|
||||
enableNushellIntegration = true;
|
||||
extraFlags = [
|
||||
"--quiet"
|
||||
"--noask"
|
||||
];
|
||||
};
|
||||
nushell = {
|
||||
enable = true;
|
||||
environmentVariables = {
|
||||
CARAPACE_BRIDGES = "zsh,fish,bash,inshellisense";
|
||||
CARAPACE_MATCH = 1;
|
||||
EDITOR = "hx";
|
||||
};
|
||||
shellAliases = {
|
||||
cd = "z";
|
||||
cat = "bat";
|
||||
la = "ls -a";
|
||||
l = "ls -la";
|
||||
nix-shell = "nix-shell --command nu";
|
||||
};
|
||||
extraConfig = ''
|
||||
$env.config = {
|
||||
show_banner: false
|
||||
shell_integration: {
|
||||
# osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
|
||||
osc2: true
|
||||
# osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
|
||||
osc7: true
|
||||
# osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
|
||||
osc8: true
|
||||
# osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
|
||||
osc9_9: false
|
||||
# osc133 is several escapes invented by Final Term which include the supported ones below.
|
||||
# 133;A - Mark prompt start
|
||||
# 133;B - Mark prompt end
|
||||
# 133;C - Mark pre-execution
|
||||
# 133;D;exit - Mark execution finished with exit code
|
||||
# This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
|
||||
osc133: true
|
||||
# osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
|
||||
# 633;A - Mark prompt start
|
||||
# 633;B - Mark prompt end
|
||||
# 633;C - Mark pre-execution
|
||||
# 633;D;exit - Mark execution finished with exit code
|
||||
# 633;E - Explicitly set the command line with an optional nonce
|
||||
# 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
|
||||
# and also helps with the run recent menu in vscode
|
||||
osc633: true
|
||||
# reset_application_mode is escape \x1b[?1l and was added to help ssh work better
|
||||
reset_application_mode: true
|
||||
}
|
||||
|
||||
ls: {
|
||||
use_ls_colors: true
|
||||
clickable_links: true
|
||||
}
|
||||
ls: {
|
||||
use_ls_colors: true
|
||||
clickable_links: true
|
||||
}
|
||||
|
||||
rm: {
|
||||
always_trash: true
|
||||
}
|
||||
edit_mode: 'vi'
|
||||
completions: {
|
||||
case_sensitive: false
|
||||
quick: true
|
||||
partial: true
|
||||
algorithm: "fuzzy"
|
||||
external: {
|
||||
enable: true
|
||||
# max_results: 100
|
||||
# completer: $carapace_completer # check 'carapace_completer'
|
||||
rm: {
|
||||
always_trash: true
|
||||
}
|
||||
edit_mode: 'vi'
|
||||
completions: {
|
||||
case_sensitive: false
|
||||
quick: true
|
||||
partial: true
|
||||
algorithm: "fuzzy"
|
||||
external: {
|
||||
enable: true
|
||||
# max_results: 100
|
||||
# completer: $carapace_completer # check 'carapace_completer'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user