why is vsc so bad with git I hate

This commit is contained in:
blahai 2024-08-30 23:18:40 +03:00
parent 9ea3b83bc6
commit 1d44666920
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
12 changed files with 507 additions and 70 deletions

View file

@ -39,11 +39,11 @@
]
},
"locked": {
"lastModified": 1724781866,
"narHash": "sha256-ItgACCJCwn8Rx7p8hJBpnU9eCtrdmkg4AbqMZL/rXlY=",
"lastModified": 1725016199,
"narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7cc3d3179c06caf3769afb3eb0c69aa55676c96a",
"rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906",
"type": "github"
},
"original": {
@ -64,11 +64,11 @@
"yafas": "yafas"
},
"locked": {
"lastModified": 1724760873,
"narHash": "sha256-pWFGeMQsnj3TpHG/BvOg5Qt5smgupDPeHmsd/ZH+DPg=",
"lastModified": 1725042633,
"narHash": "sha256-ri9tUKMeL+91m5Tfr/ZLpPgUDdNgXOGaycxUisFbnb8=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "f4510aa41ad74a3caa96365defbc356ab94e4521",
"rev": "c15b70230c274d2aa11d6c56ce5d50a198c2a994",
"type": "github"
},
"original": {
@ -101,11 +101,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1724740262,
"narHash": "sha256-cpFasbzOTlwLi4fNas6hDznVUdCJn/lMLxi7MAMG6hg=",
"lastModified": 1724999484,
"narHash": "sha256-AIR8uYGteWS/RyHyZJAHQAUEJ/Mv4ktkPe2mzbJ2zCE=",
"owner": "nix-community",
"repo": "fenix",
"rev": "703efdd9b5c6a7d5824afa348a24fbbf8ff226be",
"rev": "e3bb9176e807e2b166d54153ce8caea5cb2c6700",
"type": "github"
},
"original": {
@ -210,11 +210,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1724848081,
"narHash": "sha256-7mXcMjQv47wo8S/nlhElKuN1rY65KUFr+yTUoGm/k0k=",
"lastModified": 1725032272,
"narHash": "sha256-A0AiFlPoqDK/IwUiV7SGIi8uW2zOqmmiZY6j8i367LU=",
"ref": "refs/heads/main",
"rev": "8210a1d7ac38f6af76ccbb831dc1d62b1ebc53db",
"revCount": 5151,
"rev": "c5fd5771814958ad274ea9abb961fff621a35b9c",
"revCount": 5165,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -293,11 +293,11 @@
]
},
"locked": {
"lastModified": 1722869141,
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
"lastModified": 1724966483,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"type": "github"
},
"original": {
@ -340,11 +340,11 @@
]
},
"locked": {
"lastModified": 1724753550,
"narHash": "sha256-idw4NE/j9j6LVD7nrw7lWq77z2J6S5oCHjJdIaPyGvw=",
"lastModified": 1724999205,
"narHash": "sha256-Lc9kb5hhUohcJlUye5Pu8BNYHDPIOUtejYySTvHTlio=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "1bda3a989a5785e09d710452c817ee2699c89a3a",
"rev": "a14f978f74e89213a5f565f827454dd6178b2bb5",
"type": "github"
},
"original": {
@ -378,11 +378,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718714799,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
"type": "github"
},
"original": {
@ -410,11 +410,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
@ -426,11 +426,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
@ -442,11 +442,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
@ -469,11 +469,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1724666781,
"narHash": "sha256-nOQDgjTDlWe0/+Ptf3o2p6UrznQFHnXBHRV1ZAsSpe8=",
"lastModified": 1724937894,
"narHash": "sha256-M/28TIG+fm5x3GtQ6qSGDw1NHS4nHttz0DM7JcDs4g8=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "095926ea6f008477a15a2ec6b0b8797e2e5be0e5",
"rev": "0ae42bd42576566540a84c62e118aa823edcf2ec",
"type": "github"
},
"original": {

View file

@ -48,6 +48,8 @@
};
};
gnome.gnome-keyring.enable = true;
pipewire = {
enable = true;
alsa.enable = true;
@ -81,22 +83,47 @@
virtualisation.docker.enable = true;
systemd.services."getty@tty1".enable = false;
systemd.services."autovt@tty1".enable = false;
systemd = {
user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1";
wantedBy = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
};
programs = {
firefox.enable = true;
fish.enable = true;
hyprland = {
enable = true;
package = inputs.hyprland.packages."${pkgs.system}".hyprland;
};
direnv = {
dir{
enable = true;
};
nh = {
enable = true;
flake = "/home/pingu/.config/nixos";
};
git = {
enable = true;
lfs.enable = true;
};
};
@ -108,6 +135,7 @@
auto-optimise-store = true;
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
trusted-users = [ "@wheel" "pingu" "root" ];
};
gc = {
automatic = true;

View file

@ -2,8 +2,9 @@
{
imports = [
../../modules/home-manager/hyprland.nix
../../modules/home-manager/ags/ags.nix
../../modules/home-manager/hypr/default.nix
../../modules/home-manager/ags/default.nix
../../modules/nixos/games/default.nix
];
# Home Manager needs a bit of information about you and the paths it should
@ -59,6 +60,25 @@
#
home.sessionVariables = {
EDITOR = "nvim";
XMODIFIERS = "@im=ibus";
GTK_IM_MODULE = "ibus";
QT_IM_MODULE = "ibus"
QT_QPA_PLATFORMTHEME = "qt5ct";
WLR_NO_HARDWARE_CURSORS = "1";
GSK_RENDERER = "cairo";
MOZ_ENABLE_WAYLAND = "1";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
XDG_SESSION_DESKTOP = "Hyprland";
_JAVA_AWT_WM_NONREPARENTING = "1"
XCURSOR_THEME = "Bibata-Modern-Classic";
HYPRCURSOR_THEME = "HyprBibataModernClassicSVG"
XCURSOR_SIZE, 24
__GL_THREADED_OPTIMIZATIONS, 0
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = 1
};
# Let Home Manager install and manage itself.

0
main
View file

View file

@ -0,0 +1,179 @@
{ pkgs, config, inputs, ... }: {
imports = [
./hyprland/rules.nix
./hyprland/keybinds.nix
./hyprland/execs.nix
./hyprlock.nix
];
# apparently hyprcursor doesn't work with hm?
environment.systemPackages = [ pkgs.hyprcursor ];
home.packages = with pkgs; [
hyprshot
hyprpicker
wlr-randr
wl-clipboard
brightnessctl
xwayland
xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
qt5ct
qt6ct
swww
mpvpaper
];
home.file."~/.config/hypr/colors.conf" = {
text = ''
general {
col.active_border = rgba(DFE2EF39)
col.inactive_border = rgba(8C909F30)
}
misc {
background_color = rgba(0F131CFF)
}
windowrulev2 = bordercolor rgba(ADC6FFAA) rgba(ADC6FF77),pinned:1
'';
checkPhase = ''
if [ -f "$out" ]; then
echo "File already exists, skipping creation"
exit 0
fi
'';
};
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
package = inputs.hyprland.packages."${pkgs.system}".hyprland;
settings = {
monitor = [
",prefered,auto,1"
];
input = {
kb_layout = "us,fi";
kb_options = "caps:escape, grp:win_space_toggle";
repeat_delay = 250;
repeat_rate = 35;
follow_mouse = 1;
sensitivity = 0.1;
force_no_accel = true;
};
general = {
# Gaps and border
gaps_in = 4;
gaps_out = 5;
gaps_workspaces = 50;
border_size = 3;
# Fallback colours
"col.active_border" = "rgba(0DB7D4FF)";
"col.inactive_border" = "rgba(31313600)";
resize_on_border = true;
no_focus_fallback = true;
layout = "dwindle";
};
dwindle = {
preserve_split = true;
smart_split = false;
smart_resizing = false;
special_scale_factor = 0.9;
};
decoration = {
rounding = 15;
blur = {
enable = true;
xray = true;
special = true;
new_optimizations = true;
size = 14;
passes = 4;
brightness = 1;
noise = 0.05;
contrast = 1;
popups = true;
popups_ignorealpha = 0.6;
};
# Shadow
drop_shadow = true;
shadow_ignore_window = true;
shadow_range = 20;
shadow_offset = 0 2;
shadow_render_power = 4;
"col.shadow" = "rgba(0000002A)";
# Dim
dim_inactive = false;
dim_strength = 0.1;
dim_special = 0;
};
animations = {
enabled = true;
bezier = [
"linear, 0, 0, 1, 1"
"md3_standard, 0.2, 0, 0, 1"
"md3_decel, 0.05, 0.7, 0.1, 1"
"md3_accel, 0.3, 0, 0.8, 0.15"
"overshot, 0.05, 0.9, 0.1, 1.1"
"crazyshot, 0.1, 1.5, 0.76, 0.92"
"menu_decel, 0.1, 1, 0, 1"
"menu_accel, 0.38, 0.04, 1, 0.07"
"hyprnostretch, 0.05, 0.9, 0.1, 1.0"
"fluent_decel, 0.1, 1, 0, 1"
"easeInOutCirc, 0.85, 0, 0.15, 1"
"easeOutCirc, 0, 0.55, 0.45, 1"
"easeOutExpo, 0.16, 1, 0.3, 1"
"softAcDecel, 0.26, 0.26, 0.15, 1"
"md2, 0.4, 0, 0.2, 1"
];
animation = [
"windows, 1, 3, md3_decel, popin 60%"
"windowsIn, 1, 3, md3_decel, popin 60%"
"windowsOut, 1, 3, md3_accel, popin 60%"
"border, 1, 10, default"
"fade, 1, 3, md3_decel"
"layersIn, 1, 3, menu_decel, slide"
"layersOut, 1, 1.6, menu_accel"
"fadeLayersIn, 1, 2, menu_decel"
"fadeLayersOut, 1, 4.5, menu_accel"
"workspaces, 1, 7, menu_decel, slide"
"specialWorkspace, 1, 3, md3_decel, slidevert"
];
};
misc = {
vfr = 1;
vrr = 2;
focus_on_activate = true;
animate_manual_resizes = false;
animate_mouse_windowdragging = false;
enable_swallow = false;
swallow_regex = "(foot|kitty|allacritty|Alacritty)";
disable_hyprland_logo = true;
force_default_wallpaper = 0;
new_window_takes_over_fullscreen = 2;
allow_session_lock_restore = true;
initial_workspace_tracking = false;
};
};
};
}

View file

@ -0,0 +1,13 @@
{ pkgs, config, inputs, ... }: {
wayland.windowManager.hyprland.settings = {
exec-once = [
"${pkgs.swww}/bin/swww-daemon --format xrgb"
"${pkgs.mpvpaper}/bin/mpvpaper DP-1 -f -o 'loop panscan=1.0' ~/Pictures/wallpapers/videos/current"
"${pkgs.ags}/bin/ags &"
"${pkgs.floorp}/bin/floorp"
"${pkgs.vesktop}/bin/vesktop"
"${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Classic 24"
];
};
}

View file

@ -0,0 +1,32 @@
{ pkgs, config, inputs, ... }: {
wayland.windowManager.hyprland.settings = {
bindm = [
"Super, mouse:272, movewindow"
"Super, mouse:273, resizewindow"
];
bind = [
"Super, mouse_up, workspace, +1"
"Super, mouse_down, workspace, -1"
"Super+Shift, S, togglespecialworkspace"
"Super, Q, exec, ${pkgs.foot}/bin/foot"
"Super, C, killactive"
"Super, V, togglefloating"
"Super, E, exec, ${pkgs.gnome.nautilus} --new-window"
# This horror of a mess is from having more than 10 workspaces and I'm very much considering just removing this shit
] ++ map (n: "Alt, ${toString n}, exec, ~/.config/ags/scripts/hyprland/workspace_adction.sh movetoworkspacesilent ${toString (
if n == 0
then 10
else n
)}") [1 2 3 4 5 6 7 8 9 0]
++ map (n: "Super, ${toString n}, exec, ~/.config/ags/scripts/hyprland/workspace_adction.sh workspace, ${toString (
if n == 0
then 10
else n
)}") [1 2 3 4 5 6 7 8 9 0];
};
}

View file

@ -0,0 +1,71 @@
{ pkgs, config, inputs, lib, ... }:
{
wayland.windowManager.hyprland.settings = {
workspace = [
"special:special, on-created-empty:exec spotify"
];
windowrule = [
"noblur,.*"
"workspace special, spotify"
"workspace 3 silent, vesktop"
"workspace 1 silent, floorp"
"float, ^(blueberry.py)$"
];
windowrulev2 = [
];
layerrule = [
"layerrule = xray 0, .*"
"layerrule = noanim, walker"
"layerrule = noanim, selection"
"layerrule = noanim, overview"
"layerrule = noanim, anyrun"
"layerrule = noanim, indicator.*"
"layerrule = noanim, osk"
"layerrule = noanim, hyprpicker"
"layerrule = blur, shell:*"
"layerrule = ignorealpha 0.6, shell:*"
"layerrule = blur, eww"
"layerrule = ignorealpha 0.8, eww"
"layerrule = noanim, noanim"
"layerrule = blur, noanim"
"layerrule = blur, gtk-layer-shell"
"layerrule = ignorezero, gtk-layer-shell"
"layerrule = blur, launcher"
"layerrule = ignorealpha 0.5, launcher"
"layerrule = blur, notifications"
"layerrule = ignorealpha 0.69, notifications"
"layerrule = animation slide top, sideleft.*"
"layerrule = animation slide top, sideright.*"
"layerrule = blur, session"
"layerrule = blur, bar"
"layerrule = ignorealpha 0.20, bar"
"layerrule = blur, corner.*"
"layerrule = ignorealpha 0.20, corner.*"
"layerrule = blur, dock"
"layerrule = ignorealpha 0.20, dock"
"layerrule = blur, indicator.*"
"layerrule = ignorealpha 0.20, indicator.*"
"layerrule = blur, overview"
"layerrule = ignorealpha 0.20, overview"
"layerrule = blur, cheatsheet"
"layerrule = ignorealpha 0.20, cheatsheet"
"layerrule = blur, sideright"
"layerrule = ignorealpha 0.20, sideright"
"layerrule = blur, sideleft"
"layerrule = ignorealpha 0.20, sideleft"
"layerrule = blur, indicator*:"
"layerrule = ignorealpha 0.20, indicator*"
"layerrule = blur, osk"
"layerrule = ignorealpha 0.20, osk"
];
};
}

View file

@ -0,0 +1,99 @@
{ config, ... }: {
programs.hyprlock = {
enable = true;
settings = {
general = {
disable_loading_bar = true;
grace = 5;
no_fade_in = true;
no_fade_out = true;
};
backgruond = {
color = "rgba(000000FF)"
};
input-field = [{
monitor = "";
size = "250, 50";
outline_thickness = 2;
dots_size = 0.1;
dots_spacing = 0.3;
outer_color = "rgba(8C909F55)";
inner_color = "rgba(0F131C11)";
font_color = "rgba(C2C6D6FF)";
position = "0, 20";
halign = "center";
valign = "center";
}];
label = [
{ # Clock
monitor = "";
text = "$TIME";
shadow_passes = 1;
shadow_boost = 0.5;
color = "rgba(FFFFFFFF)";
font_size = "65";
font_family = "Rubik Light";
position = "0, 300"
}
{ # Greeting
monitor = "";
text = "Hi $USER !!!";
shadow_passes = 1;
shadow_boost = 0.5;
color = "rgba(FFFFFFFF)";
font_size = "20";
font_family = "Rubik Light";
position = "0, 240";
halign = "center";
valign = "center";
}
{ # lock icon
monitor = "";
text = "lock";
shadow_passes = 1;
shadow_boost = 0.5;
color = "rgba(FFFFFFFF)";
font_size = "21";
font_family = "Material Symbols Rounded";
position = "0, 65";
halign = "center";
valign = "center";
}
{ # "locked" text
monitor = "";
text = "locked";
shadow_passes = 1;
shadow_boost = 0.5;
color = "rgba(FFFFFFFF)";
font_size = "14";
font_family = "Rubik Light";
position = "0, 45";
halign = "center";
valign = "center";
}
#{ # Status
# monitor = "";
# text = "";
# shadow_passes = 1;
# shadow_boost = 0.5;
# color = "rgba(FFFFFFFF)";
# font_size = "24";
# font_family = "Rubik Light";
#}
];
};
};
}

View file

@ -1,31 +0,0 @@
{ inputs, options, config, pkgs, lib, ... }:
{
home.packages = with pkgs; [
foot
swww
mpvpaper
libnotify
cliphist
wl-clipboard
fzf
fuzzel
pywal
yad
jq
python312Packages.pywayland
python312Packages.psutil
python312Packages.pillow
python312Packages.wheel
python312Packages.materialyoucolor
python312Packages.libsass
python312Packages.material-color-utilities
dart-sass
hyprlock
hyprpicker
];
#wayland.windowManager.hyprland = {
# enable = true;
#};
}

View file

@ -0,0 +1,26 @@
{ config, pkgs, ... }: {
home.packages = with pkgs; [
protonup-qt
prismlauncher
osu-lazer-bin
obs-studio
];
programs = {
steam = {
enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
};
gamemode.enable = true;
};
hardware.opentabletdriver.enable = true;
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};
}