dachxy/nix-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add fish

Browse source
This commit is contained in:
DACHXY 2024-12-23 13:42:40 +08:00
parent 394f71cfb6
commit 36b9f4e2b0
27 changed files with 362 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

1
home/config/hypr/bind.conf
View file

@ -18,6 +18,7 @@ bind = CTRL SHIFT $mainMod, s, exec, hyprshot -m output --clipboard-only --freez
bind = $mainMod, PERIOD, exec, flatpak run it.mijorus.smile
bind = $mainMod, X, exec, sleep 0.1 && swaync-client -t -sw
bind = $mainMod SHIFT, C, centerwindow
bind = ,F11, fullscreen
# Cycle windows
bind = ALT, TAB, cyclenext

4
home/config/hypr/window.conf
View file

@ -18,8 +18,8 @@ decoration {
ignore_opacity = on
xray = false
}
active_opacity = 0.9
inactive_opacity = 0.9
active_opacity = 0.8
inactive_opacity = 0.8
fullscreen_opacity = 1.0
}

3
home/config/hypr/windowrule.conf
View file

@ -21,6 +21,7 @@ windowrulev2 = float, title:^(Media viewer)$
windowrulev2 = float, title:^(File Operation Progress)$
windowrulev2 = float, class:^(it.mijorus.smile)
windowrulev2 = float, class:^(xdg-desktop-portal-gtk)$
windowrulev2 = float, title:^(Steam Settings)$
# Picture in picture windows
windowrulev2 = float, title:^(Picture-in-Picture)$
@ -32,7 +33,7 @@ windowrulev2 = float, class:^(steam)$,title:^(Friends List)$
# Workspace assign
windowrulev2 = workspace: 4, class:^(steam)$
windowrulev2 = workspace: 5, class:^(steam)$
# Line
windowrulev2 = workspace: 2, initialTitle:^(LINE)$

4
home/config/kitty/kitty.conf
View file

@ -6,7 +6,5 @@ italic_font auto
bold_italic_font auto
mouse_hide_wait 2.0
cursor_shape block
url_color #0087bd
url_style dotted
confirm_os_window_close 0
background_opacity 0.8
background_opacity 1

2
home/config/nushell/config.nu
View file

@ -271,7 +271,7 @@ $env.config = {
reset_application_mode: true
}
render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
use_kitty_protocol: true # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which.
recursion_limit: 50 # the maximum number of times nushell allows recursion before stopping it

3
home/config/nushell/history.txt
View file

@ -1,3 +0,0 @@
cd ~/.conig
ls
exit

11
home/config/starship/starship.toml
View file

@ -3,12 +3,17 @@
# Palettes must be defined _after_ this line
palette = "catppuccin_macchiato"
[shell]
fish_indicator = "󰈺 "
powershell_indicator = ">_"
unknown_indicator = "+>"
# Starship modules
[character]
# Note the use of Catppuccin color 'peach'
success_symbol = "[(green) ❯](peach)"
error_symbol = "[(red) ❯](peach)"
vimcmd_symbol = "[ ❮](subtext1)" # For use with zsh-vi-mode
success_symbol = "[(green) ❯](peach)"
error_symbol = "[(red) ❯](peach)"
vimcmd_symbol = "[ ❮](subtext1)" # For use with zsh-vi-mode
[git_branch]
style = "bold mauve"

1
home/config/uwsm/env-hyprland
View file

@ -1 +0,0 @@
export AQ_DRM_DEVICES="/dev/dri/card1;/dev/dri/card2"

67
home/config/waybar/config
View file

@ -1,29 +1,61 @@
{
"include": "~/.config/waybar/modules",
"layer": "top",
"exclusive": true,
"passthrough": false,
"position": "top",
"spacing": 3,
"fixed-center": true,
"ipc": true,
"margin-top": 0,
"margin-left": 0,
"margin-right": 0,
"margin-bottom": 0,
[
{
"output": "!DP-3",
"include": "~/.config/waybar/modules.json",
"layer": "top",
"exclusive": true,
"passthrough": false,
"position": "top",
"spacing": 3,
"fixed-center": true,
"ipc": true,
"margin-top": 0,
"margin-left": 0,
"margin-right": 0,
"margin-bottom": 0,
"modules-left": [
"modules-left": [
"hyprland/workspaces",
"mpris"
],
"modules-center": [
"hyprland/window"
],
"modules-right": [
"wlr/taskbar",
"custom/swaync",
"pulseaudio"
]
},
{
"output": "DP-3",
"include": "~/.config/waybar/modules.json",
"layer": "top",
"exclusive": true,
"passthrough": false,
"position": "top",
"spacing": 3,
"fixed-center": true,
"ipc": true,
"margin-top": 0,
"margin-left": 0,
"margin-right": 0,
"margin-bottom": 0,
"modules-left": [
"hyprland/workspaces",
"clock",
"custom/cava",
"mpris"
],
"modules-center": [
"modules-center": [
"hyprland/window"
],
"modules-right": [
"modules-right": [
"wlr/taskbar",
"cpu",
"temperature",
@ -31,4 +63,5 @@
"custom/swaync",
"pulseaudio"
]
}
}
]

168
home/config/waybar/modules
View file

@ -1,168 +0,0 @@
{
"hyprland/workspaces": {
"active-only": false,
"all-outputs": true,
"format": "{icon}",
"show-special": false,
"on-click": "activate",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
"persistent-workspaces": {
"1": [],
"2": [],
"3": [],
"4": [],
},
"format-icons": {
"active": "👁️‍🗨️",
"default": "🗨️",
},
},
"clock": {
"interval": 1,
"format": " 🕑 {:%H:%M} ",
"format-alt": " 🕑 {:%H:%M 🗓️ %Y, %d %B, %A} ",
"tooltip-format": "<tt><small>{calendar}</small></tt>",
"calendar": {
"mode" : "year",
"mode-mon-col" : 3,
"weeks-pos" : "right",
"on-scroll" : 1,
"format": {
"days": "<span color='#ebdbb2'><b>{}</b></span>",
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
"weekdays": "<span color='#ebdbb2'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
}
}
},
"actions": {
"on-click-right": "mode",
"on-click-forward": "tz_up",
"on-click-backward": "tz_down",
"on-scroll-up": "shift_up",
"on-scroll-down": "shift_down"
},
"cpu": {
"format": " {usage}% 🧠 ",
"interval": 1,
"on-click-right": "gnome-system-monitor"
},
"hyprland/window": {
"format": " {} ",
"max-length": 60,
"separate-outputs": true,
"offscreen-css" : true,
"offscreen-css-text": "(inactive)",
"rewrite": {
"(.*) — Mozilla Firefox": " $1",
"(.*) - fish": "> [$1]",
"(.*) - zsh": "> [$1]",
"(.*) - kitty": "> [$1]"
}
},
"memory": {
"interval": 10,
"format": " {percentage}% 📊 ",
"format-alt-click": "click",
"tooltip": true,
"tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
"on-click-right": "kitty -c ~/.config/kitty/kitty.conf --title btop sh -c 'btop'"
},
"mpris": {
"interval": 10,
"format": " {title} ",
"format-paused": " {title} {status_icon} ",
"on-click": "playerctl play-pause",
"on-click-right": "playerctl next",
"scroll-step": 5.0,
"smooth-scrolling-threshold": 1,
"status-icons": {
"paused": "󰐎",
"playing": "🎶",
"stopped": ""
},
"max-length": 30
},
"pulseaudio": {
"format": " {volume}% {icon} ",
"format-bluetooth": " 󰂰 {volume}% {icon} ",
"format-muted": "🔇",
"format-icons": {
"headphone": "🔈",
"hands-free": "🔈",
"headset": "🔈",
"phone": "🔈",
"portable": "🔈",
"car": "🔈",
"default": ["🔈", "🔈", "🔈", "🔈"],
"ignored-sinks": ["Easy Effects Sink"]
},
"scroll-step": 5.0,
"on-click": "pavucontrol -t 3",
"tooltip-format": "{icon} {desc} | {volume}%",
"smooth-scrolling-threshold": 1
},
"temperature": {
"interval": 10,
"tooltip": true,
"hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
"critical-threshold": 82,
"format-critical": "{temperatureC}°C {icon}",
"format": " {temperatureC}°C {icon} ",
"format-icons": ["🔥"],
"on-click-right": "kitty -c ~/.config/kitty/kitty.conf --title nvtop sh -c 'nvtop'"
},
"custom/swaync": {
"tooltip":true,
"format": " {} {icon} ",
"format-icons": {
"notification": "🔔<span foreground='red'><sup></sup></span>",
"none": "🔔",
"dnd-notification": "🔕<span foreground='red'><sup></sup></span>",
"dnd-none": "🔕",
"inhibited-notification": "🔔<span foreground='red'><sup></sup></span>",
"inhibited-none": "🔔",
"dnd-inhibited-notification": "🔕<span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": "🔕"
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "sleep 0.1 && swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
},
"wlr/taskbar": {
"format": " {icon} ",
"icon-size": 20,
"all-outputs": false,
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
"ignore-list": [
"rofi",
"firefox",
"kitty",
"jetbrains-studio",
"Brave-browser",
"Spotify"
]
},
"custom/cava": {
"exec": "~/.config/scripts/waybarCava.sh",
"format": "{}",
"on-click": "kitty -c ~/.config/kitty/kitty.conf nvim -c cd ~/.config/"
}
}

171
home/config/waybar/modules.json Normal file
View file

@ -0,0 +1,171 @@
{
"hyprland/workspaces": {
"active-only": false,
"all-outputs": true,
"format": "{icon}",
"show-special": false,
"on-click": "activate",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
"persistent-workspaces": {
"1": [],
"2": [],
"3": [],
"4": []
},
"format-icons": {
"active": "👁️‍🗨️",
"default": "🗨️"
}
},
"clock": {
"interval": 1,
"format": " 🕑 {:%H:%M} ",
"format-alt": " 🕑 {:%H:%M 🗓️ %Y, %d %B, %A} ",
"tooltip-format": "<tt><small>{calendar}</small></tt>",
"calendar": {
"mode": "year",
"mode-mon-col": 3,
"weeks-pos": "right",
"on-scroll": 1,
"format": {
"days": "<span color='#ebdbb2'><b>{}</b></span>",
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
"weekdays": "<span color='#ebdbb2'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
}
}
},
"actions": {
"on-click-right": "mode",
"on-click-forward": "tz_up",
"on-click-backward": "tz_down",
"on-scroll-up": "shift_up",
"on-scroll-down": "shift_down"
},
"cpu": {
"format": " {usage}% 🧠 ",
"interval": 1,
"on-click-right": "kitty -c ~/.config/kitty/kitty.conf --title btop sh -c 'btop'"
},
"hyprland/window": {
"format": "{}",
"max-length": 60,
"separate-outputs": true,
"offscreen-css": true,
"offscreen-css-text": "(inactive)",
"rewrite": {
"(.*)> nvim": " $1",
"(.*) - Discord": " $1",
"(.*) — Mozilla Firefox": " $1"
}
},
"memory": {
"interval": 10,
"format": " {percentage}% 📊 ",
"format-alt-click": "click",
"tooltip": true,
"tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
"on-click-right": "kitty -c ~/.config/kitty/kitty.conf --title btop sh -c 'btop'"
},
"mpris": {
"interval": 10,
"format": " {title} ",
"format-paused": " {title} {status_icon} ",
"on-click": "playerctl play-pause",
"on-click-right": "playerctl next",
"scroll-step": 5.0,
"smooth-scrolling-threshold": 1,
"status-icons": {
"paused": "󰐎",
"playing": "🎶",
"stopped": ""
},
"max-length": 30
},
"pulseaudio": {
"format": " {volume}% {icon} ",
"format-bluetooth": " 󰂰 {volume}% {icon} ",
"format-muted": "🔇",
"format-icons": {
"headphone": "🔈",
"hands-free": "🔈",
"headset": "🔈",
"phone": "🔈",
"portable": "🔈",
"car": "🔈",
"default": ["🔈", "🔈", "🔈", "🔈"],
"ignored-sinks": ["Easy Effects Sink"]
},
"scroll-step": 5.0,
"on-click": "pavucontrol -t 3",
"tooltip-format": "{icon} {desc} | {volume}%",
"smooth-scrolling-threshold": 1
},
"temperature": {
"interval": 10,
"tooltip": true,
"hwmon-path": [
"/sys/class/hwmon/hwmon1/temp1_input",
"/sys/class/thermal/thermal_zone0/temp"
],
"critical-threshold": 82,
"format-critical": "{temperatureC}°C {icon}",
"format": " {temperatureC}°C {icon} ",
"format-icons": ["🔥"],
"on-click-right": "kitty -c ~/.config/kitty/kitty.conf --title nvtop sh -c 'nvtop'"
},
"custom/swaync": {
"tooltip": true,
"format": " {} {icon} ",
"format-icons": {
"notification": "🔔<span foreground='red'><sup></sup></span>",
"none": "🔔",
"dnd-notification": "🔕<span foreground='red'><sup></sup></span>",
"dnd-none": "🔕",
"inhibited-notification": "🔔<span foreground='red'><sup></sup></span>",
"inhibited-none": "🔔",
"dnd-inhibited-notification": "🔕<span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": "🔕"
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "sleep 0.1 && swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
},
"wlr/taskbar": {
"format": " {icon} ",
"icon-size": 20,
"all-outputs": false,
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
"ignore-list": [
"rofi",
"firefox",
"kitty",
"jetbrains-studio",
"Brave-browser",
"Spotify",
"thunar",
"vlc"
]
},
"custom/cava": {
"exec": "~/.config/scripts/waybarCava.sh",
"format": "{}",
"on-click": "kitty -c ~/.config/kitty/kitty.conf nvim -c cd ~/.config/"
}
}

1
home/user/config.nix
View file

@ -23,7 +23,6 @@ in
".config/mako".source = "${configDir}/mako";
".config/scripts".source = "${configDir}/scripts";
".config/swaync".source = "${configDir}/swaync";
# ".config/uwsm".source = "${configDir}/uwsm";
".config/starship.toml".source = "${configDir}/starship/starship.toml";
".config/macchiato.toml".source = "${configDir}/starship/macchiato.toml";
".config/gh" = {

2
home/user/environment.nix
View file

@ -17,7 +17,7 @@
CLUTTER_BACKEND = "wayland";
WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "32";
GTK_THEME = "Catppuccin-Macchiato-Compact-Blue-Dark";
GTK_THEME = "Catppuccin-Macchiato-Compact-Lavender-Dark";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";

5
home/user/git.nix
View file

@ -1,7 +1,8 @@
let
userName = "danny";
userName = "dachxy";
email = "Danny10132024@gmail.com";
in {
in
{
programs.git = {
enable = true;
userName = userName;

16
home/user/packages.nix
View file

@ -3,7 +3,7 @@
{
home.packages = [
pkgs.vscode
pkgs.discord
pkgs.vesktop # discord
pkgs.firefox
# Dev stuff
@ -25,22 +25,20 @@
pkgs.blueberry
# Gaming
pkgs.steam
# pkgs.steam
pkgs.steam-run
(pkgs.lutris.override {
extraPkgs = pkgs: [ pkgs.wineWowPackages.stable pkgs.winetricks ];
})
# (pkgs.lutris.override {
# extraPkgs = pkgs: [ pkgs.wineWowPackages.stable pkgs.winetricks ];
# })
# Downloads
pkgs.qbittorrent
# Utils
pkgs.viewnior
pkgs.catppuccin-cursors.macchiatoBlue
pkgs.catppuccin-cursors.macchiatoLavender
pkgs.catppuccin-gtk
pkgs.cava
# pkgs.papirus-folders
pkgs.nushell
pkgs.papirus-folders
];
}

3
home/user/programs.nix
View file

@ -4,10 +4,9 @@
neovim = {
enable = true;
withNodeJs = true;
withPython3 = true;
extraLuaPackages = ps: [ ps.magick ];
extraPackages = [ pkgs.imagemagick ];
};
bash.enable = true;
};
}

28
home/user/shell.nix
View file

@ -1,22 +1,36 @@
{ ... }:
{ pkgs, ... }:
{
programs = {
nushell = {
# nushell = {
# enable = true;
# configFile.source = ../config/nushell/config.nu;
# envFile.source = ../config/nushell/env.nu;
# };
fish = {
enable = true;
configFile.source = ../config/nushell/config.nu;
envFile.source = ../config/nushell/env.nu;
interactiveShellInit = ''
set fish_greeting # Disable greeting
'';
plugins = [
{ name = "grc"; src = pkgs.fishPlugins.grc.src; }
# Other plugins can be located in config file
];
};
carapace.enable = true;
carapace.enableNushellIntegration = true;
carapace = {
enable = true;
enableFishIntegration = true;
};
starship = {
enable = true;
enableFishIntegration = true;
};
zoxide = {
enable = true;
enableNushellIntegration = true;
enableFishIntegration = true;
};
};
}

5
system/modules/fonts.nix
View file

@ -6,15 +6,20 @@
jetbrains-mono
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji
(nerdfonts.override { fonts = [ "CascadiaCode" ]; })
];
fonts.fontDir.enable = true;
fonts.fontconfig = {
enable = true;
defaultFonts = {
serif = [ "CaskaydiaCove Nerd Font" "Noto Sans CJK" ];
sansSerif = [ "CaskaydiaCove Nerd Font" "Noto Sans CJK" ];
monospace = [ "CaskaydiaCove Nerd Font Mono" ];
};
cache32Bit = true;
};
}

5
system/modules/gaming.nix
View file

@ -6,7 +6,8 @@
warn-dirty = false;
experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true;
substituters = ["https://nix-gaming.cachix.org"];
trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="]; };
substituters = [ "https://nix-gaming.cachix.org" ];
trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ];
};
};
}

27
system/modules/hardware.nix
View file

@ -1,16 +1,29 @@
{ config, pkgs, nixpkgs, ... }:
{
services.xserver.videoDrivers = ["nvidia"];
services.xserver.videoDrivers = [ "nvidia" ];
nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; } ;
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
};
hardware = {
steam-hardware.enable = true;
bluetooth.enable = true;
bluetooth = {
enable = true;
powerOnBoot = true;
settings.General = {
experimental = true;
Privacy = "device";
JustWorksRepairing = "always";
Class = "0x000100";
FastConnectable = true;
};
};
xpadneo.enable = true;
graphics = {
enable = true;
enable32Bit = true;
@ -40,4 +53,12 @@
nvidiaBusId = "PCI:1:0:0";
};
};
# Enable bluetooth
boot = {
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
extraModprobeConfig = ''
options bluetooth disable_ertm=Y
'';
};
}

2
system/modules/hyprland.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
programs.hyprland = { enable = true; };

1
system/modules/nixsettings.nix
View file

@ -9,6 +9,7 @@
"steam-unwrapped"
"steam-run"
];
nixpkgs.config.rcomSupport = true;
nix = {

6
system/modules/packages.nix
View file

@ -61,6 +61,12 @@
xdg-desktop-portal-wlr
# Shell
fishPlugins.done
fishPlugins.fzf-fish
fishPlugins.forgit
fishPlugins.hydro
fishPlugins.grc
grc # Colorize
zoxide # Dir jumper
starship # Shell theme
carapace # Autocomplete

22
system/modules/programs.nix
View file

@ -1,4 +1,4 @@
{ inputs, config, pkgs, ... }:
{ pkgs, ... }:
{
xdg.portal = {
@ -16,8 +16,6 @@
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;
fontPackages = with pkgs; [ wqy_zenhei noto-fonts-cjk-sans noto-fonts-cjk-serif ];
extraPackages = with pkgs; [ wqy_zenhei noto-fonts-cjk-sans noto-fonts-cjk-serif ];
};
hyprland = {
@ -86,6 +84,24 @@
zsh.enable = true;
mtr.enable = true;
fish.enable = true;
nix-index = {
enable = true;
enableFishIntegration = true;
enableBashIntegration = false;
enableZshIntegration = false;
};
# Set fish as default shell but not login shell
bash = {
interactiveShellInit = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
};
};
}

3
system/modules/services.nix
View file

@ -12,6 +12,9 @@
services = {
dbus.enable = true;
picom.enable = true;
blueman.enable = true;
openssh = {
enable = true;
ports = [ 22 ];

2
system/modules/users.nix
View file

@ -3,7 +3,7 @@
{
users.users.danny = {
isNormalUser = true;
shell = pkgs.nushell;
shell = pkgs.bash; # Actually fish
extraGroups = [ "wheel" "input" "networkmanager" "docker" ];
};
}

2
system/modules/virtualization.nix
View file

@ -15,6 +15,8 @@
libvirtd = {
enable = true;
qemu.swtpm.enable = true;
qemu.ovmf.enable = true;
};
spiceUSBRedirection.enable = true;