From 02e133d48cc5777d81a65902b53b2d0382983898 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 02:51:39 +1000 Subject: [PATCH] hmmmmmmmmmmmmmmmmm massive changes, forgor to commit whoops --- STRUCTURE.md | 35 +-- hosts/proserpina/network-configuration.nix | 3 + modules/core/audio.nix | 17 ++ modules/core/configuration.nix | 117 +------- modules/core/display.nix | 21 +- modules/core/packages/default.nix | 2 + modules/core/packages/packages.nix | 68 ++++- modules/core/services.nix | 13 +- modules/home/default.nix | 15 +- modules/home/hyprland/config.nix | 282 ++++++++++++++++++ modules/home/hyprland/default.nix | 57 +--- modules/home/hyprland/hypr2.nix | 52 ++++ modules/home/hyprland/hyprland.nix | 28 ++ modules/home/hyprland/variables.nix | 28 ++ modules/home/hyprland/waybar/default.nix | 6 + modules/home/hyprland/waybar/settings.nix | 101 +++++++ modules/home/hyprland/waybar/style.nix | 95 ++++++ modules/home/hyprland/waybar/waybar.nix | 9 + modules/home/hyprland/wofi/config/config | 15 + modules/home/hyprland/wofi/config/style.css | 94 ++++++ modules/home/hyprland/wofi/default.nix | 5 + modules/home/misc/default.nix | 13 - modules/home/programs/btop.nix | 14 + modules/home/programs/discord/default.nix | 9 + .../home/programs/discord/theme-template.nix | 15 + modules/home/programs/fish.nix | 7 + modules/home/programs/gaming/gaming.nix | 27 ++ modules/home/programs/gaming/steam.nix | 21 ++ .../{git/default.nix => programs/git.nix} | 5 - modules/home/programs/gtk.nix | 45 +++ .../{kitty/default.nix => programs/kitty.nix} | 42 +-- modules/home/programs/micro.nix | 7 + modules/home/programs/starship.nix | 41 +++ modules/home/programs/vscodium.nix | 100 +++++++ modules/home/scripts/default.nix | 49 +++ modules/home/scripts/scripts/ascii.sh | 45 +++ modules/home/scripts/scripts/compress.sh | 10 + modules/home/scripts/scripts/extract.sh | 6 + modules/home/scripts/scripts/keybinds.sh | 6 + modules/home/scripts/scripts/lofi.sh | 7 + modules/home/scripts/scripts/maxfetch.sh | 53 ++++ modules/home/scripts/scripts/music.sh | 10 + modules/home/scripts/scripts/runbg.sh | 16 + .../home/scripts/scripts/shutdown-script.sh | 15 + modules/home/scripts/scripts/toggle_blur.sh | 7 + .../home/scripts/scripts/toggle_oppacity.sh | 9 + modules/home/scripts/scripts/vm-start.sh | 11 + .../home/scripts/scripts/wallpaper-picker.sh | 12 + 48 files changed, 1410 insertions(+), 255 deletions(-) create mode 100644 modules/core/audio.nix create mode 100644 modules/home/hyprland/config.nix create mode 100644 modules/home/hyprland/hypr2.nix create mode 100644 modules/home/hyprland/hyprland.nix create mode 100644 modules/home/hyprland/variables.nix create mode 100644 modules/home/hyprland/waybar/default.nix create mode 100644 modules/home/hyprland/waybar/settings.nix create mode 100644 modules/home/hyprland/waybar/style.nix create mode 100644 modules/home/hyprland/waybar/waybar.nix create mode 100644 modules/home/hyprland/wofi/config/config create mode 100644 modules/home/hyprland/wofi/config/style.css create mode 100644 modules/home/hyprland/wofi/default.nix delete mode 100644 modules/home/misc/default.nix create mode 100644 modules/home/programs/btop.nix create mode 100644 modules/home/programs/discord/default.nix create mode 100644 modules/home/programs/discord/theme-template.nix create mode 100644 modules/home/programs/fish.nix create mode 100644 modules/home/programs/gaming/gaming.nix create mode 100644 modules/home/programs/gaming/steam.nix rename modules/home/{git/default.nix => programs/git.nix} (79%) create mode 100644 modules/home/programs/gtk.nix rename modules/home/{kitty/default.nix => programs/kitty.nix} (57%) create mode 100644 modules/home/programs/micro.nix create mode 100644 modules/home/programs/starship.nix create mode 100644 modules/home/programs/vscodium.nix create mode 100644 modules/home/scripts/default.nix create mode 100644 modules/home/scripts/scripts/ascii.sh create mode 100755 modules/home/scripts/scripts/compress.sh create mode 100755 modules/home/scripts/scripts/extract.sh create mode 100755 modules/home/scripts/scripts/keybinds.sh create mode 100755 modules/home/scripts/scripts/lofi.sh create mode 100755 modules/home/scripts/scripts/maxfetch.sh create mode 100755 modules/home/scripts/scripts/music.sh create mode 100755 modules/home/scripts/scripts/runbg.sh create mode 100755 modules/home/scripts/scripts/shutdown-script.sh create mode 100755 modules/home/scripts/scripts/toggle_blur.sh create mode 100755 modules/home/scripts/scripts/toggle_oppacity.sh create mode 100755 modules/home/scripts/scripts/vm-start.sh create mode 100755 modules/home/scripts/scripts/wallpaper-picker.sh diff --git a/STRUCTURE.md b/STRUCTURE.md index cb63d3e..64a5335 100644 --- a/STRUCTURE.md +++ b/STRUCTURE.md @@ -4,45 +4,16 @@ ``` . -├── README.md -├── TODO.md -├── STRUCTURE.md ├── flake.nix ├── hosts +│ ├── hades │ └── proserpina -│ ├── configuration.nix -│ ├── disko-config.nix -│ ├── hardware-configuration.nix -│ └── network-configuration.nix └── modules ├── core - │ ├── configuration.nix - │ ├── display.nix - │ ├── home.nix - │ ├── packages - │ │ ├── default.nix - │ │ └── packages.nix - │ └── services.nix └── home - ├── default.nix - ├── direnv - ├── fish - ├── git - │ └── default.nix ├── hyprland - │ ├── default.nix - │ └── environment.nix - ├── kitty - │ └── default.nix - ├── micro - ├── misc - │ └── default.nix + ├── programs ├── resources - │ ├── icons - │ └── wallpapers - ├── starship - ├── stylix - └── waybar + └── scripts ``` - --- diff --git a/hosts/proserpina/network-configuration.nix b/hosts/proserpina/network-configuration.nix index 6d641e2..ded6728 100644 --- a/hosts/proserpina/network-configuration.nix +++ b/hosts/proserpina/network-configuration.nix @@ -12,6 +12,9 @@ networkmanager = { enable = true; }; + # nameservers = [ + # "1.1.1.1" + # ]; }; # networking.proxy = { diff --git a/modules/core/audio.nix b/modules/core/audio.nix new file mode 100644 index 0000000..ba6ed67 --- /dev/null +++ b/modules/core/audio.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + + sound.enable = true; + hardware.pulseaudio.enable = false; + services.pipewire = { + + enable = true; + jack.enable = true; + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + lowLatency.enable = true; + }; + +} diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index 59d9e29..6615776 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -8,123 +8,18 @@ ./packages ]; - security = { - sudo.execWheelOnly = true; - }; - # Set your time zone. + # Timezone & locale time.timeZone = "Australia/Brisbane"; - - # Select internationalisation properties. i18n.defaultLocale = "en_GB.UTF-8"; - # Enable X11 - services.xserver = { - enable = true; - layout = "us"; - xkbVariant = ""; + # security, apparently + security = { + rtkit.enable = true; + sudo.execWheelOnly = true; + pam.services.swaylock = { }; }; - # Enable sound with pipewire. - # sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - # Use the example session manager (this is enabled by default) - # media-session.enable = true; - }; - - - environment.systemPackages = with pkgs; [ - - # file system support - ntfs3g - xfsprogs - - # nixos specific - appimage-run - # home-manager - # nix-output-monitor - # nixpkgs-review - # nix-index - # nix-tree - # nix-init - - # web browsers - firefox - # lagrange - tor-browser-bundle-bin - - # misc/Fonts - (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) - - # terminal stuff - kitty - micro - hyfetch - - # cli utilities - file - zip - unzip - gnupg - busybox - killall - usbutils - pciutils - moreutils - libsecret - git-crypt - - ]; - - # Qt dark mode - # qt.style = "adwaita-dark"; - - # More programs I want - programs = { - # home-manager.enable = true; - # hyprland = { - # enable = true; - # xwayland.enable = true; - # }; - traceroute.enable = true; - corectrl.enable = true; - firefox.enable = true; - htop.enable = true; - git.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = false; - }; - fish = { - enable = true; - # import programs/fish.nix pkgs; - }; - - # starship.enable = true; - - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - - # Set up hardware acceleration - # https://nixos.wiki/wiki/Accelerated_Video_Playback - hardware = { - }; - - # Disable these cuz they cause problems. see: https://github.com/NixOS/nixpkgs/issues/180175 - # systemd.services = { - # NetworkManager-wait-online.enable = lib.mkForce false; - # systemd-networkd-wait-online.enable = lib.mkForce false; - # }; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/modules/core/display.nix b/modules/core/display.nix index 48b955a..d635a1f 100644 --- a/modules/core/display.nix +++ b/modules/core/display.nix @@ -2,7 +2,11 @@ { - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + xdg.portal = { enable = true; wlr.enable = true; @@ -15,20 +19,27 @@ services.xserver = { enable = true; - xkb.layout = "us"; + layout = "us"; # what is the difference # + xkbVariant = ""; # between + xkb.layout = "us"; # these 2 lolwut # displayManager.autoLogin = { enable = true; user = "${USERNAME}"; }; libinput = { enable = true; - # mouse = { - # accelProfile = "flat"; - # }; + mouse = { + accelProfile = "flat"; + }; }; }; # apparently prevents getting stuck at shutdown systemd.extraConfig = "DefaultTimeoutStopSec=10s"; + # set up hardware video acceleration + # https://nixos.wiki/wiki/Accelerated_Video_Playback + + system.stateVersion = "23.11" + } diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 8d7742a..fc1b359 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -8,6 +8,8 @@ services.flatpak.enable = true; + + qt.style = "adwaita-dark"; nix = { settings = { diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index 3198fe7..cb7339a 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -1,7 +1,69 @@ +{ ... }: + { - insert.nixcode = { - here = true; + environment.systemPackages = with pkgs; [ + + ## web browsers + tor-browser-bundle=bin + # lagrange + firefox + + ## filsesystem support + ntfs3g + xfsprogs + + ## nixos specific + # home-manager + appimage-run + # nix-tree + # nix-init + # nix-index + # nixpkgs-review + # nix-output-monitor + + + ## terminal + kitty + micro + + ## cli tools + hyfetch + file + zip + unzip + gnupg + busybox + killall + usbutils + pciutils + moreutils + libsecret + git-crypt + + ## misc/fonts + (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) + + ## maybe more + + ]; + + + programs = { + # home-manager.enable = true; + traceroute.enable = true; + starship.enable = true; + corectrl.enable = true; + firefox.enable = true; + fish.enable = true; + # htop.enable = true; + git.enable = true; + gnupg.agent = { + enable = false; + enableSSHSupport = false; + }; + }; - + + } diff --git a/modules/core/services.nix b/modules/core/services.nix index 46938a5..15776ad 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -7,10 +7,12 @@ services = { + + gvfs.enable = true; + dbus.enable = true; + gnome-keyring.enable = true; - openssh = { - enable = false; - }; + openssh.enable = false avahi = { enable = false; @@ -25,7 +27,10 @@ }; }; - + + + # disable these cuz they cause problems + # see: https://github.com/NixOS/nixpkgs/issues/180175 systemd.services = { networkManager-wait-online.enable = lib.mkForce false; systemd-networkd-wait-online.enable = lib.mkForce false; diff --git a/modules/home/default.nix b/modules/home/default.nix index 0f5a6d6..0c4f419 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,20 +1,9 @@ { imports = [ - - ./git - ./fish - ./micro - ./kitty - ./direnv - ./starship - - ./rofi - ./dunst - ./waybar - ./stylix + # ./shell + # ./kitty ./hyprland - ]; } diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix new file mode 100644 index 0000000..f01066a --- /dev/null +++ b/modules/home/hyprland/config.nix @@ -0,0 +1,282 @@ +{ ... }: +{ + wayland.windowManager.hyprland = { + extraConfig = " + $mainMod = SUPER + + monitor=,preferred,auto,auto + monitor=,1920x1200,auto,auto + + # autostart + exec-once = systemctl --user import-environment & + exec-once = hash dbus-update-activation-environment 2>/dev/null & + exec-once = dbus-update-activation-environment --systemd & + exec-once = nm-applet & + exec-once = wl-paste --primary --watch wl-copy --primary --clear + exec-once = swaybg -m fill -i $(find ~/Pictures/wallpapers/ -maxdepth 1 -type f) & + exec-once = sleep 1 && swaylock + exec-once = hyprctl setcursor Nordzy-cursors 22 & + exec-once = waybar & + exec-once = mako & + + input { + kb_layout = us + numlock_by_default = true + follow_mouse = 1 + sensitivity = 0 + } + + misc { + disable_autoreload = true + disable_hyprland_logo = true + always_follow_on_dnd = true + layers_hog_keyboard_focus = true + animate_manual_resizes = false + enable_swallow = true + # swallow_regex = + focus_on_activate = true + } + + general { + layout = dwindle + + gaps_in = 0 + gaps_out = 0 + border_size = 2 + col.active_border = rgb(cba6f7) rgb(94e2d5) 45deg + col.inactive_border = 0x00000000 + border_part_of_window = false + no_border_on_floating = false + + # gaps_in = 5 + # gaps_out = 10 + # border_size = 2 + # col.active_border = rgb(cba6f7) rgb(94e2d5) 45deg + # col.inactive_border = 0x00000000 + # border_part_of_window = false + } + + xwayland { + force_zero_scaling = true + } + + dwindle { + no_gaps_when_only = true + force_split = 0 + special_scale_factor = 1.0 + split_width_multiplier = 1.0 + use_active_for_splits = true + pseudotile = yes + preserve_split = yes + } + + master { + new_is_master = true + special_scale_factor = 1 + no_gaps_when_only = false + } + + decoration { + rounding = 5 + # rounding = 12 + + active_opacity = 0.90; + inactive_opacity = 0.90; + fullscreen_opacity = 1.0; + + blur { + enabled = true + + size = 4 + passes = 2 + + brightness = 1 + contrast = 1.300000 + ignore_opacity = true + noise = 0.011700 + + new_optimizations = true + + xray = true + } + + drop_shadow = true; + + shadow_ignore_window = true; + shadow_offset = 0 2 + shadow_range = 20 + shadow_render_power = 3 + col.shadow = rgba(00000055) + } + + + animations { + enabled = true + + bezier = fluent_decel, 0, 0.2, 0.4, 1 + bezier = easeOutCirc, 0, 0.55, 0.45, 1 + bezier = easeOutCubic, 0.33, 1, 0.68, 1 + bezier = easeinoutsine, 0.37, 0, 0.63, 1 + + # Windows + animation = windowsIn, 1, 3, easeOutCubic, popin 30% # window open + animation = windowsOut, 1, 3, fluent_decel, popin 70% # window close. + animation = windowsMove, 1, 2, easeinoutsine, slide # everything in between, moving, dragging, resizing. + + # Fade + animation = fadeIn, 1, 3, easeOutCubic # fade in (open) -> layers and windows + animation = fadeOut, 1, 2, easeOutCubic # fade out (close) -> layers and windows + animation = fadeSwitch, 0, 1, easeOutCirc # fade on changing activewindow and its opacity + animation = fadeShadow, 1, 10, easeOutCirc # fade on changing activewindow for shadows + animation = fadeDim, 1, 4, fluent_decel # the easing of the dimming of inactive windows + animation = border, 1, 2.7, easeOutCirc # for animating the border's color switch speed + animation = borderangle, 1, 30, fluent_decel, once # for animating the border's gradient angle - styles: once (default), loop + animation = workspaces, 1, 4, easeOutCubic, fade # styles: slide, slidevert, fade, slidefade, slidefadevert + } + + + # ---------------------------------------------------------------- + + # show keybinds list + bind = $mainMod, F1, exec, show-keybinds + + # keybindings + bind = $mainMod, Return, exec, kitty + bind = ALT, Return, exec, kitty --title float_kitty + bind = $mainMod SHIFT, Return, exec, kitty --start-as=fullscreen -o 'font_size=16' + bind = $mainMod, B, exec, hyprctl dispatch exec '[workspace 1 silent] floorp' + bind = $mainMod, Q, killactive, + bind = $mainMod, F, fullscreen, 0 + bind = $mainMod SHIFT, F, fullscreen, 1 + bind = $mainMod, Space, togglefloating, + bind = $mainMod, D, exec, pkill wofi || wofi --show drun + bind = $mainMod SHIFT, D, exec, hyprctl dispatch exec '[workspace 4 silent] discord' + bind = $mainMod SHIFT, S, exec, hyprctl dispatch exec '[workspace 5 silent] SoundWireServer' + bind = $mainMod, Escape, exec, swaylock + bind = $mainMod SHIFT, Escape, exec, shutdown-script + bind = $mainMod, P, pseudo, + bind = $mainMod, J, togglesplit, + bind = $mainMod, E, exec, nemo + bind = $mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped + bind = $mainMod, C ,exec, hyprpicker -a + bind = $mainMod, G,exec, $HOME/.local/bin/toggle_layout + bind = $mainMod, W,exec, pkill wofi || wallpaper-picker + bind = $mainMod SHIFT, W, exec, vm-start + + # screenshot + bind = $mainMod, Print, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png + bind = ,Print, exec, grimblast --notify --cursor copy area + + # switch focus + bind = $mainMod, left, movefocus, l + bind = $mainMod, right, movefocus, r + bind = $mainMod, up, movefocus, u + bind = $mainMod, down, movefocus, d + + # switch workspace + bind = $mainMod, 1, workspace, 1 + bind = $mainMod, 2, workspace, 2 + bind = $mainMod, 3, workspace, 3 + bind = $mainMod, 4, workspace, 4 + bind = $mainMod, 5, workspace, 5 + bind = $mainMod, 6, workspace, 6 + bind = $mainMod, 7, workspace, 7 + bind = $mainMod, 8, workspace, 8 + bind = $mainMod, 9, workspace, 9 + bind = $mainMod, 0, workspace, 10 + + # same as above, but switch to the workspace + bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 # movetoworkspacesilent + bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 + bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 + bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 + bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 + bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 + bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 + bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 + bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 + bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 + bind = $mainMod CTRL, c, movetoworkspace, empty + + # window control + bind = $mainMod SHIFT, left, movewindow, l + bind = $mainMod SHIFT, right, movewindow, r + bind = $mainMod SHIFT, up, movewindow, u + bind = $mainMod SHIFT, down, movewindow, d + bind = $mainMod CTRL, left, resizeactive, -80 0 + bind = $mainMod CTRL, right, resizeactive, 80 0 + bind = $mainMod CTRL, up, resizeactive, 0 -80 + bind = $mainMod CTRL, down, resizeactive, 0 80 + bind = $mainMod ALT, left, moveactive, -80 0 + bind = $mainMod ALT, right, moveactive, 80 0 + bind = $mainMod ALT, up, moveactive, 0 -80 + bind = $mainMod ALT, down, moveactive, 0 80 + + # media and volume controls + bind = ,XF86AudioRaiseVolume,exec, pamixer -i 2 + bind = ,XF86AudioLowerVolume,exec, pamixer -d 2 + bind = ,XF86AudioMute,exec, pamixer -t + bind = ,XF86AudioPlay,exec, playerctl play-pause + bind = ,XF86AudioNext,exec, playerctl next + bind = ,XF86AudioPrev,exec, playerctl previous + bind = , XF86AudioStop, exec, playerctl stop + bind = $mainMod, mouse_down, workspace, e-1 + bind = $mainMod, mouse_up, workspace, e+1 + + # mouse binding + bindm = $mainMod, mouse:272, movewindow + bindm = $mainMod, mouse:273, resizewindow + + # windowrule + windowrule = float,audacious + windowrule = workspace 8 silent, audacious + windowrule = pin,wofi + windowrule = float,wofi + windowrule = noborder,wofi + windowrule = tile, neovide + windowrule = idleinhibit focus,mpv + windowrule = float,udiskie + windowrule = float,title:^(Transmission)$ + windowrule = float,title:^(Volume Control)$ + windowrule = float,title:^(Firefox — Sharing Indicator)$ + windowrule = move 0 0,title:^(Firefox — Sharing Indicator)$ + windowrule = size 700 450,title:^(Volume Control)$ + windowrule = move 40 55%,title:^(Volume Control)$ + windowrulev2 = float, title:^(Picture-in-Picture)$ + windowrulev2 = opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$ + # windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*YouTube.*)$ + windowrulev2 = pin, title:^(Picture-in-Picture)$ + windowrule = float,imv + windowrule = center,imv + windowrule = size 1200 725,imv + windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*imv.*)$ + windowrule = float,mpv + windowrule = center,mpv + windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*mpv.*)$ + windowrule = tile,Aseprite + windowrulev2 = opacity 1.0 override 1.0 override, class:(Aseprite) + windowrulev2 = opacity 1.0 override 1.0 override, class:(Unity) + windowrule = size 1200 725,mpv + windowrulev2 = idleinhibit focus, class:^(mpv)$ + windowrulev2 = idleinhibit fullscreen, class:^(firefox)$ + + windowrule = float,title:^(float_kitty)$ + windowrule = center,title:^(float_kitty)$ + windowrule = size 950 600,title:^(float_kitty)$ + + windowrulev2 = float,class:^(pavucontrol)$ + windowrulev2 = float,class:^(SoundWireServer)$ + windowrulev2 = float,class:^(file_progress)$ + windowrulev2 = float,class:^(confirm)$ + windowrulev2 = float,class:^(dialog)$ + windowrulev2 = float,class:^(download)$ + windowrulev2 = float,class:^(notification)$ + windowrulev2 = float,class:^(error)$ + windowrulev2 = float,class:^(confirmreset)$ + windowrulev2 = float,title:^(Open File)$ + windowrulev2 = float,title:^(branchdialog)$ + windowrulev2 = float,title:^(Confirm to replace files)$ + windowrulev2 = float,title:^(File Operation Progress)$ + "; + }; +} diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 27ca178..c8e98f1 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,52 +1,7 @@ -{ config, lib, pkgs, osConfig, ... } - -{ - - imports = [ - hyprland.homeManagerModules.default - ./hyprland-environment.nix - - ]; - - home = { - packages = with pkgs; [ - waybar - ]; - }; - - programs = { - hyperland = { - enable = true; - xwayland.enable = true; - }; - }; - - wayland.windowManager.hyprland = { - enable = true; - systemdIntegration = true; - settings = { - "$mod" = "SUPER"; - bind = [ - "$mod, F, exec, firefox" - ", Print, exec, grimblast copy area" - ] ++ ( # workspaces - # binds $mod + [shift+] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ); - }; - }; - - home.stateVersion = "23.11"; - +{ inputs, ... }: +{ + imports = [ (import ./hyprland.nix) ] + ++ [ (import ./config.nix) ] + ++ [ (import ./variables.nix) ] + ++ [ inputs.hyprland.homeManagerModules.default ]; } diff --git a/modules/home/hyprland/hypr2.nix b/modules/home/hyprland/hypr2.nix new file mode 100644 index 0000000..27ca178 --- /dev/null +++ b/modules/home/hyprland/hypr2.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, osConfig, ... } + +{ + + imports = [ + hyprland.homeManagerModules.default + ./hyprland-environment.nix + + ]; + + home = { + packages = with pkgs; [ + waybar + ]; + }; + + programs = { + hyperland = { + enable = true; + xwayland.enable = true; + }; + }; + + wayland.windowManager.hyprland = { + enable = true; + systemdIntegration = true; + settings = { + "$mod" = "SUPER"; + bind = [ + "$mod, F, exec, firefox" + ", Print, exec, grimblast copy area" + ] ++ ( # workspaces + # binds $mod + [shift+] {1..10} to [move to] workspace {1..10} + builtins.concatLists (builtins.genList ( + x: let + ws = let + c = (x + 1) / 10; + in + builtins.toString (x + 1 - (c * 10)); + in [ + "$mod, ${ws}, workspace, ${toString (x + 1)}" + "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" + ] + ) + 10) + ); + }; + }; + + home.stateVersion = "23.11"; + +} diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix new file mode 100644 index 0000000..859a7db --- /dev/null +++ b/modules/home/hyprland/hyprland.nix @@ -0,0 +1,28 @@ +{ inputs, pkgs, ...}: +{ + home.packages = with pkgs; [ + # swww + swaybg + inputs.hypr-contrib.packages.${pkgs.system}.grimblast + hyprpicker + wofi + grim + slurp + wl-clipboard + # cliphist + wf-recorder + glib + wayland + direnv + ]; + systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; + wayland.windowManager.hyprland = { + enable = true; + xwayland = { + enable = true; + # hidpi = true; + }; + # enableNvidiaPatches = false; + systemd.enable = true; + }; +} diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix new file mode 100644 index 0000000..7e530d6 --- /dev/null +++ b/modules/home/hyprland/variables.nix @@ -0,0 +1,28 @@ +{ ... }: +{ + home.sessionVariables = { + NIXOS_OZONE_WL = "1"; + __GL_GSYNC_ALLOWED = "0"; + __GL_VRR_ALLOWED = "0"; + _JAVA_AWT_WM_NONEREPARENTING = "1"; + SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; + DISABLE_QT5_COMPAT = "0"; + GDK_BACKEND = "wayland"; + ANKI_WAYLAND = "1"; + DIRENV_LOG_FORMAT = ""; + WLR_DRM_NO_ATOMIC = "1"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORM = "xcb"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_STYLE_OVERRIDE = "kvantum"; + MOZ_ENABLE_WAYLAND = "1"; + WLR_BACKEND = "vulkan"; + WLR_RENDERER = "vulkan"; + WLR_NO_HARDWARE_CURSORS = "1"; + XDG_SESSION_TYPE = "wayland"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + GTK_THEME = "Catppuccin-Mocha-Compact-Lavender-Dark"; + }; +} diff --git a/modules/home/hyprland/waybar/default.nix b/modules/home/hyprland/waybar/default.nix new file mode 100644 index 0000000..9b8b240 --- /dev/null +++ b/modules/home/hyprland/waybar/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ (import ./waybar.nix) ] + ++ [ (import ./settings.nix) ] + ++ [ (import ./style.nix) ]; +} diff --git a/modules/home/hyprland/waybar/settings.nix b/modules/home/hyprland/waybar/settings.nix new file mode 100644 index 0000000..1aaeeeb --- /dev/null +++ b/modules/home/hyprland/waybar/settings.nix @@ -0,0 +1,101 @@ +{ ... }: +{ + programs.waybar.settings.mainBar = { + position= "bottom"; + layer= "top"; + height= 5; + margin-top= 0; + margin-bottom= 0; + margin-left= 0; + margin-right= 0; + modules-left= [ + "custom/launcher" + "hyprland/workspaces" + ]; + modules-center= [ + "clock" + ]; + modules-right= [ + "tray" + "cpu" + "memory" + "disk" + "pulseaudio" + "network" + ]; + clock= { + calendar = { + format = { today = "{}"; }; + }; + format = " {:%H:%M}"; + tooltip= "true"; + tooltip-format= "{:%Y %B}\n{calendar}"; + format-alt= " {:%d/%m}"; + }; + "hyprland/workspaces"= { + active-only= false; + disable-scroll= true; + format = "{icon}"; + on-click= "activate"; + format-icons= { + "1"= "󰈹"; + "2"= ""; + "3"= "󰘙"; + "4"= "󰙯"; + "5"= ""; + "6"= ""; + urgent= ""; + default = ""; + sort-by-number= true; + }; + persistent-workspaces = { + "1"= []; + "2"= []; + "3"= []; + "4"= []; + "5"= []; + }; + }; + memory= { + format= "󰟜 {}%"; + format-alt= "󰟜 {used} GiB"; #  + interval= 2; + }; + cpu= { + format= " {usage}%"; + format-alt= " {avg_frequency} GHz"; + interval= 2; + }; + disk = { + # path = "/"; + format = "󰋊 {percentage_used}%"; + interval= 60; + }; + network = { + format-wifi = " {signalStrength}%"; + format-ethernet = "󰀂 "; + tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; + format-linked = "{ifname} (No IP)"; + format-disconnected = "󰖪 "; + }; + tray= { + icon-size= 20; + spacing= 8; + }; + pulseaudio= { + format= "{icon} {volume}%"; + format-muted= "󰖁 "; + format-icons= { + default= [" "]; + }; + scroll-step= 5; + on-click= "pamixer -t"; + }; + "custom/launcher"= { + format= ""; + on-click= "pkill wofi || wofi --show drun"; + on-click-right= "pkill wofi || wallpaper-picker"; + tooltip= "false"; + }; + }; +} diff --git a/modules/home/hyprland/waybar/style.nix b/modules/home/hyprland/waybar/style.nix new file mode 100644 index 0000000..db32a12 --- /dev/null +++ b/modules/home/hyprland/waybar/style.nix @@ -0,0 +1,95 @@ +{ ... }: +let custom = { + font = "JetBrainsMono Nerd Font"; + font_size = "15px"; + font_weight = "bold"; + text_color = "#cdd6f4"; + secondary_accent= "89b4fa"; + tertiary_accent = "f5f5f5"; + background = "11111B"; + opacity = "0.98"; +}; +in +{ + programs.waybar.style = '' + + * { + border: none; + border-radius: 0px; + padding: 0; + margin: 0; + min-height: 0px; + font-family: ${custom.font}; + font-weight: ${custom.font_weight}; + opacity: ${custom.opacity}; + } + + window#waybar { + background: none; + } + + #workspaces { + font-size: 18px; + padding-left: 15px; + + } + #workspaces button { + color: ${custom.text_color}; + padding-left: 6px; + padding-right: 6px; + } + #workspaces button.empty { + color: #6c7086; + } + #workspaces button.active { + color: #b4befe; + } + + #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock { + font-size: ${custom.font_size}; + color: ${custom.text_color}; + } + + #cpu { + padding-left: 15px; + padding-right: 9px; + margin-left: 7px; + } + #memory { + padding-left: 9px; + padding-right: 9px; + } + #disk { + padding-left: 9px; + padding-right: 15px; + } + + #tray { + padding: 0 20px; + margin-left: 7px; + } + + #pulseaudio { + padding-left: 15px; + padding-right: 9px; + margin-left: 7px; + } + #network { + padding-left: 9px; + padding-right: 15px; + } + + #clock { + padding-left: 9px; + padding-right: 15px; + } + + #custom-launcher { + font-size: 20px; + color: #b4befe; + font-weight: ${custom.font_weight}; + padding-left: 10px; + padding-right: 15px; + } + ''; +} diff --git a/modules/home/hyprland/waybar/waybar.nix b/modules/home/hyprland/waybar/waybar.nix new file mode 100644 index 0000000..c50e873 --- /dev/null +++ b/modules/home/hyprland/waybar/waybar.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + programs.waybar = { + enable = true; + }; + programs.waybar.package = pkgs.waybar.overrideAttrs (oa: { + mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; + }); +} diff --git a/modules/home/hyprland/wofi/config/config b/modules/home/hyprland/wofi/config/config new file mode 100644 index 0000000..4506e27 --- /dev/null +++ b/modules/home/hyprland/wofi/config/config @@ -0,0 +1,15 @@ +width=400 +height=350 +location=center +show=drun +prompt=Search... +filter_rate=100 +allow_markup=true +no_actions=true +halign=fill +orientation=vertical +content_halign=fill +insensitive=true +allow_images=true +image_size=40 +gtk_dark=true diff --git a/modules/home/hyprland/wofi/config/style.css b/modules/home/hyprland/wofi/config/style.css new file mode 100644 index 0000000..a17b2fb --- /dev/null +++ b/modules/home/hyprland/wofi/config/style.css @@ -0,0 +1,94 @@ +/* Mocha Mauve */ +@define-color accent #cba6f7; +@define-color txt #cad3f5; +@define-color bg #24273a; +@define-color bg2 #494d64; + + * { + font-family: 'JetBrains Mono Nerd Font', monospace; + font-size: 14px; + } + + /* Window */ + window { + margin: 0px; + padding: 10px; + border: 3px solid @accent; + border-radius: 7px; + background-color: @bg; + animation: slideIn 0.5s ease-in-out both; + } + + /* Slide In */ + @keyframes slideIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + + /* Inner Box */ + #inner-box { + margin: 5px; + padding: 10px; + border: none; + background-color: @bg; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Fade In */ + @keyframes fadeIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + + /* Outer Box */ + #outer-box { + margin: 5px; + padding: 10px; + border: none; + background-color: @bg; + } + + /* Scroll */ + #scroll { + margin: 0px; + padding: 10px; + border: none; + } + + /* Input */ + #input { + margin: 5px; + padding: 10px; + border: none; + color: @accent; + background-color: @bg2; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Text */ + #text { + margin: 5px; + padding: 10px; + border: none; + color: @txt; + animation: fadeIn 0.5s ease-in-out both; + } + + /* Selected Entry */ + #entry:selected { + background-color: @accent; + } + + #entry:selected #text { + color: @bg2; + } \ No newline at end of file diff --git a/modules/home/hyprland/wofi/default.nix b/modules/home/hyprland/wofi/default.nix new file mode 100644 index 0000000..8a341da --- /dev/null +++ b/modules/home/hyprland/wofi/default.nix @@ -0,0 +1,5 @@ +{ ... }: +{ + # https://github.com/prtce/wofi + xdg.configFile."wofi".source = ./config; +} \ No newline at end of file diff --git a/modules/home/misc/default.nix b/modules/home/misc/default.nix deleted file mode 100644 index d98980f..0000000 --- a/modules/home/misc/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, lib, osConfig, ... }: - -{ - - imports = { - # ./insert - } - - programs = { - # insert misc home programs - }; - -} diff --git a/modules/home/programs/btop.nix b/modules/home/programs/btop.nix new file mode 100644 index 0000000..6d19044 --- /dev/null +++ b/modules/home/programs/btop.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + programs.btop = { + enable = true; + + settings = { + color_theme = "dracula"; + theme_background = false; + update_ms = 500; + }; + }; + + home.packages = (with pkgs; [ nvtopPackages.intel ]); +} \ No newline at end of file diff --git a/modules/home/programs/discord/default.nix b/modules/home/programs/discord/default.nix new file mode 100644 index 0000000..f48a6db --- /dev/null +++ b/modules/home/programs/discord/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + imports = [ (import ./theme-template.nix) ]; + home.packages = with pkgs; [ + (discord.override { + withVencord = true; + }) + ]; +} \ No newline at end of file diff --git a/modules/home/programs/discord/theme-template.nix b/modules/home/programs/discord/theme-template.nix new file mode 100644 index 0000000..616993c --- /dev/null +++ b/modules/home/programs/discord/theme-template.nix @@ -0,0 +1,15 @@ +{ + xdg.configFile."Vencord/themes/custom.css".text = '' + /** + * @name Catppuccin Mocha + * @author winston#0001 + * @authorId 505490445468696576 + * @version 0.2.0 + * @description 🎮 Soothing pastel theme for Discord + * @website https://github.com/catppuccin/discord + * @invite r6Mdz5dpFc + * **/ + + @import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"); + ''; +} \ No newline at end of file diff --git a/modules/home/programs/fish.nix b/modules/home/programs/fish.nix new file mode 100644 index 0000000..db30b33 --- /dev/null +++ b/modules/home/programs/fish.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + + + +} diff --git a/modules/home/programs/gaming/gaming.nix b/modules/home/programs/gaming/gaming.nix new file mode 100644 index 0000000..f2353cb --- /dev/null +++ b/modules/home/programs/gaming/gaming.nix @@ -0,0 +1,27 @@ +{ pkgs, config, inputs, ... }: +{ + home.packages = with pkgs;[ + ## Utils + gamemode + gamescope + winetricks + inputs.nix-gaming.packages.${pkgs.system}.wine-ge + + ## Cli games + _2048-in-terminal + vitetris + nethack + + ## Celeste + celeste-classic + celeste-classic-pm + + ## Doom + # gzdoom + crispy-doom + + ## Emulation + # cemu + # dolphin-emu + ]; +} diff --git a/modules/home/programs/gaming/steam.nix b/modules/home/programs/gaming/steam.nix new file mode 100644 index 0000000..beaa0a8 --- /dev/null +++ b/modules/home/programs/gaming/steam.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, ... }: +{ + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = false; + }; + programs.gamemode.enable = true; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-runtime" + ]; + # proton-ge-bin + +# warning: The package proton-ge in nix-gaming has been deprecated as of 2024-03-17. + +# You should use proton-ge-bin from Nixpkgs, which conforms to +# the new `extraCompatTools` module option under `programs.steam` +# For details, see the relevant pull request: +} diff --git a/modules/home/git/default.nix b/modules/home/programs/git.nix similarity index 79% rename from modules/home/git/default.nix rename to modules/home/programs/git.nix index 09dec81..e595627 100644 --- a/modules/home/git/default.nix +++ b/modules/home/programs/git.nix @@ -13,9 +13,4 @@ }; }; - home.packages = [ - pkgs.gh - pkgs.git-lfs - ]; - } diff --git a/modules/home/programs/gtk.nix b/modules/home/programs/gtk.nix new file mode 100644 index 0000000..4fee87c --- /dev/null +++ b/modules/home/programs/gtk.nix @@ -0,0 +1,45 @@ +{ pkgs, ... }: +{ + fonts.fontconfig.enable = true; + home.packages = [ + pkgs.nerdfonts + (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + pkgs.twemoji-color-font + pkgs.noto-fonts-emoji + ]; + + gtk = { + enable = true; + font = { + name = "JetBrainsMono Nerd Font"; + size = 11; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.catppuccin-papirus-folders.override { + flavor = "mocha"; + accent = "lavender"; + }; + }; + theme = { + name = "Catppuccin-Mocha-Compact-Lavender-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = [ "lavender" ]; + size = "compact"; + # tweaks = [ "rimless" ]; + variant = "mocha"; + }; + }; + cursorTheme = { + name = "Nordzy-cursors"; + package = pkgs.nordzy-cursor-theme; + size = 22; + }; + }; + + home.pointerCursor = { + name = "Nordzy-cursors"; + package = pkgs.nordzy-cursor-theme; + size = 22; + }; +} diff --git a/modules/home/kitty/default.nix b/modules/home/programs/kitty.nix similarity index 57% rename from modules/home/kitty/default.nix rename to modules/home/programs/kitty.nix index bf458aa..e17c3fb 100644 --- a/modules/home/kitty/default.nix +++ b/modules/home/programs/kitty.nix @@ -1,24 +1,24 @@ -{ pkgs, ... }: - +{ pkgs, ... }: { - programs.kitty = { - enable = true; + enable = true; - # theme = "insert-theme" + theme = "Catppuccin-Mocha"; + + font = { + name = "JetBrainsMono Nerd Font"; + size = 13; + }; - # font = { - # name = "insert-font" - # size = 12 - # }; - - settings ={ + settings = { confirm_os_window_close = 0; background_opacity = "0.55"; window_padding_width = 10; scrollback_lines = 10000; enable_audio_bell = false; mouse_hide_wait = 60; + + ## Tabs tab_title_template = "{index}"; active_tab_font_style = "normal"; inactive_tab_font_style = "normal"; @@ -28,12 +28,18 @@ active_tab_background = "#cba6f7"; inactive_tab_foreground = "#bac2de"; inactive_tab_background = "#313244"; - }; + }; - keybindings = { - - }; - + keybindings = { + ## Tabs + "alt+1" = "goto_tab 1"; + "alt+2" = "goto_tab 2"; + "alt+3" = "goto_tab 3"; + "alt+4" = "goto_tab 4"; + + ## Unbind + "ctrl+shift+left" = "no_op"; + "ctrl+shift+right" = "no_op"; + }; }; - -} +} \ No newline at end of file diff --git a/modules/home/programs/micro.nix b/modules/home/programs/micro.nix new file mode 100644 index 0000000..db30b33 --- /dev/null +++ b/modules/home/programs/micro.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + + + +} diff --git a/modules/home/programs/starship.nix b/modules/home/programs/starship.nix new file mode 100644 index 0000000..0858c08 --- /dev/null +++ b/modules/home/programs/starship.nix @@ -0,0 +1,41 @@ +{ lib, inputs, ... }: +{ + programs.starship = { + enable = true; + + enableBashIntegration = true; + enableZshIntegration = true; + enableNushellIntegration = true; + + settings = { + right_format = "$cmd_duration"; + + directory = { + format = "[ ](bold #89b4fa)[ $path ]($style)"; + style = "bold #b4befe"; + }; + + character = { + success_symbol = "[ ](bold #89b4fa)[ ➜](bold green)"; + error_symbol = "[ ](bold #89b4fa)[ ➜](bold red)"; + # error_symbol = "[ ](bold #89dceb)[ ✗](bold red)"; + }; + + cmd_duration = { + format = "[]($style)[[󰔚 ](bg:#161821 fg:#d4c097 bold)$duration](bg:#161821 fg:#BBC3DF)[ ]($style)"; + disabled = false; + style = "bg:none fg:#161821"; + }; + + # directory.substitutions = { + # "~" = "󰋞"; + # "Documents" = " "; + # "Downloads" = " "; + # "Music" = " "; + # "Pictures" = " "; + # }; + + palette = "catppuccin_mocha"; + } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml"); + }; +} \ No newline at end of file diff --git a/modules/home/programs/vscodium.nix b/modules/home/programs/vscodium.nix new file mode 100644 index 0000000..8c7103d --- /dev/null +++ b/modules/home/programs/vscodium.nix @@ -0,0 +1,100 @@ +{ pkgs, ... }: +{ + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + # nix language + bbenoist.nix + # nix-shell suport + arrterian.nix-env-selector + # python + ms-python.python + # C/C++ + ms-vscode.cpptools + # OCaml + ocamllabs.ocaml-platform + + # Color theme + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + ]; + userSettings = { + "update.mode" = "none"; + "extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update + "window.titleBarStyle" = "custom"; # needed otherwise vscode crashes, see https://github.com/NixOS/nixpkgs/issues/246509 + + "window.menuBarVisibility" = "toggle"; + "editor.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont', 'monospace', monospace"; + "terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont'"; + "editor.fontSize" = 16; + "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.iconTheme" = "catppuccin-mocha"; + "vsicons.dontShowNewVersionMessage" = true; + "explorer.confirmDragAndDrop" = false; + "editor.fontLigatures" = true; + "editor.minimap.enabled" = false; + "workbench.startupEditor" = "none"; + + "editor.formatOnSave" = true; + "editor.formatOnType" = true; + "editor.formatOnPaste" = true; + + "workbench.layoutControl.type" = "menu"; + "workbench.editor.limit.enabled" = true; + "workbench.editor.limit.value" = 10; + "workbench.editor.limit.perEditorGroup" = true; + "workbench.editor.showTabs" = "single"; + "files.autoSave" = "onWindowChange"; + "explorer.openEditors.visible" = 0; + "breadcrumbs.enabled" = false; + "editor.renderControlCharacters" = false; + "workbench.activityBar.location" = "hidden"; + "workbench.statusBar.visible" = false; + "editor.scrollbar.verticalScrollbarSize" = 2; + "editor.scrollbar.horizontalScrollbarSize" = 2; + "editor.scrollbar.vertical" = "hidden"; + "editor.scrollbar.horizontal" = "hidden"; + "workbench.layoutControl.enabled" = false; + + "editor.mouseWheelZoom" = true; + + "C_Cpp.autocompleteAddParentheses" = true; + "C_Cpp.formatting" = "vcFormat"; + "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction" = true; + "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyType" = true; + "C_Cpp.vcFormat.space.beforeEmptySquareBrackets" = true; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.block" = "sameLine"; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.function" = "sameLine"; + "C_Cpp.vcFormat.newLine.beforeElse" = false; + "C_Cpp.vcFormat.newLine.beforeCatch" = false; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.type" = "sameLine"; + "C_Cpp.vcFormat.space.betweenEmptyBraces" = true; + "C_Cpp.vcFormat.space.betweenEmptyLambdaBrackets" = true; + "C_Cpp.vcFormat.indent.caseLabels" = true; + "C_Cpp.intelliSenseCacheSize" = 2048; + "C_Cpp.intelliSenseMemoryLimit" = 2048; + "C_Cpp.default.browse.path" = [ + ''''${workspaceFolder}/**'' + ]; + "C_Cpp.default.cStandard" = "gnu11"; + "C_Cpp.inlayHints.parameterNames.hideLeadingUnderscores" = false; + "C_Cpp.intelliSenseUpdateDelay" = 500; + "C_Cpp.workspaceParsingPriority" = "medium"; + "C_Cpp.clang_format_sortIncludes" = true; + "C_Cpp.doxygen.generatedStyle" = "/**"; + }; + # Keybindings + keybindings = [ + { + key = "ctrl+q"; + command = "editor.action.commentLine"; + when = "editorTextFocus && !editorReadonly"; + } + { + key = "ctrl+s"; + command = "workbench.action.files.saveFiles"; + } + ]; + }; +} diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix new file mode 100644 index 0000000..90e0adf --- /dev/null +++ b/modules/home/scripts/default.nix @@ -0,0 +1,49 @@ +{pkgs, ...}: let + wall-change = pkgs.writeShellScriptBin "wall-change" ''swaybg -m fill -i $1''; + wallpaper-picker = pkgs.writeShellScriptBin "wallpaper-picker" (builtins.readFile ./scripts/wallpaper-picker.sh); + + runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh); + music = pkgs.writeShellScriptBin "music" (builtins.readFile ./scripts/music.sh); + lofi = pkgs.writeScriptBin "lofi" (builtins.readFile ./scripts/lofi.sh); + + toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh); + toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (builtins.readFile ./scripts/toggle_oppacity.sh); + + maxfetch = pkgs.writeScriptBin "maxfetch" (builtins.readFile ./scripts/maxfetch.sh); + + compress = pkgs.writeScriptBin "compress" (builtins.readFile ./scripts/compress.sh); + extract = pkgs.writeScriptBin "extract" (builtins.readFile ./scripts/extract.sh); + + shutdown-script = pkgs.writeScriptBin "shutdown-script" (builtins.readFile ./scripts/shutdown-script.sh); + + show-keybinds = pkgs.writeScriptBin "show-keybinds" (builtins.readFile ./scripts/keybinds.sh); + + vm-start = pkgs.writeScriptBin "vm-start" (builtins.readFile ./scripts/vm-start.sh); + + ascii = pkgs.writeScriptBin "ascii" (builtins.readFile ./scripts/ascii.sh); +in { + home.packages = with pkgs; [ + wall-change + wallpaper-picker + + runbg + music + lofi + + toggle_blur + toggle_oppacity + + maxfetch + + compress + extract + + shutdown-script + + show-keybinds + + vm-start + + ascii + ]; +} diff --git a/modules/home/scripts/scripts/ascii.sh b/modules/home/scripts/scripts/ascii.sh new file mode 100644 index 0000000..0ff7489 --- /dev/null +++ b/modules/home/scripts/scripts/ascii.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env zsh + +RED=$(tput setaf 1) +GREEN=$(tput setaf 2) +BLUE=$(tput setaf 4) +MAGENTA=$(tput setaf 5) +CYAN=$(tput setaf 6) +NORMAL=$(tput sgr0) + +echo -e "┌─────────────┬─────────────┬─────────────┬─────────────┐" +echo -e "│ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │" +echo -e "├─────────────┼─────────────┼─────────────┼─────────────┤" +echo -e "│ 0 0 \033[2mNUL\033[0m\033[0m │ 32 20 │ 64 40 ${CYAN}@${NORMAL} │ 96 60 ${CYAN}\`${NORMAL} │" +echo -e "│ 1 1 \033[2mSOH\033[0m │ 33 21 ${CYAN}!${NORMAL} │ 65 41 ${GREEN}A${NORMAL} │ 97 61 ${GREEN}a${NORMAL} │" +echo -e "│ 2 2 \033[2mSTX\033[0m │ 34 22 ${CYAN}\"${NORMAL} │ 66 42 ${GREEN}B${NORMAL} │ 98 62 ${GREEN}b${NORMAL} │" +echo -e "│ 3 3 \033[2mETX\033[0m │ 35 23 ${CYAN}#${NORMAL} │ 67 43 ${GREEN}C${NORMAL} │ 99 63 ${GREEN}c${NORMAL} │" +echo -e "│ 4 4 \033[2mEOT\033[0m │ 36 24 ${CYAN}\$${NORMAL} │ 68 44 ${GREEN}D${NORMAL} │ 100 64 ${GREEN}d${NORMAL} │" +echo -e "│ 5 5 \033[2mENQ\033[0m │ 37 25 ${CYAN}%${NORMAL} │ 69 45 ${GREEN}E${NORMAL} │ 101 65 ${GREEN}e${NORMAL} │" +echo -e "│ 6 6 \033[2mACK\033[0m │ 38 26 ${CYAN}&${NORMAL} │ 70 46 ${GREEN}F${NORMAL} │ 102 66 ${GREEN}f${NORMAL} │" +echo -e "│ 7 7 \033[2mBEL\033[0m │ 39 27 ${CYAN}'${NORMAL} │ 71 47 ${GREEN}G${NORMAL} │ 103 67 ${GREEN}g${NORMAL} │" +echo -e "│ 8 8 \033[2mBS\033[0m │ 40 28 ${CYAN}(${NORMAL} │ 72 48 ${GREEN}H${NORMAL} │ 104 68 ${GREEN}h${NORMAL} │" +echo -e "│ 9 9 \033[2mHT\033[0m │ 41 29 ${CYAN})${NORMAL} │ 73 49 ${GREEN}I${NORMAL} │ 105 69 ${GREEN}i${NORMAL} │" +echo -e "│ 10 A \033[2mLF\033[0m │ 42 2A ${CYAN}*${NORMAL} │ 74 4A ${GREEN}J${NORMAL} │ 106 6A ${GREEN}j${NORMAL} │" +echo -e "│ 11 B \033[2mVT\033[0m │ 43 2B ${CYAN}+${NORMAL} │ 75 4B ${GREEN}K${NORMAL} │ 107 6B ${GREEN}k${NORMAL} │" +echo -e "│ 12 C \033[2mFF\033[0m │ 44 2C ${CYAN},${NORMAL} │ 76 4C ${GREEN}L${NORMAL} │ 108 6C ${GREEN}l${NORMAL} │" +echo -e "│ 13 D \033[2mCR\033[0m │ 45 2D ${CYAN}-${NORMAL} │ 77 4D ${GREEN}M${NORMAL} │ 109 6D ${GREEN}m${NORMAL} │" +echo -e "│ 14 E \033[2mSO\033[0m │ 46 2E ${CYAN}.${NORMAL} │ 78 4E ${GREEN}N${NORMAL} │ 110 6E ${GREEN}n${NORMAL} │" +echo -e "│ 15 F \033[2mSI\033[0m │ 47 2F ${CYAN}/${NORMAL} │ 79 4F ${GREEN}O${NORMAL} │ 111 6F ${GREEN}o${NORMAL} │" +echo -e "│ 16 10 \033[2mDLE\033[0m │ 48 30 ${RED}0${NORMAL} │ 80 50 ${GREEN}P${NORMAL} │ 112 70 ${GREEN}p${NORMAL} │" +echo -e "│ 17 11 \033[2mDC1\033[0m │ 49 31 ${RED}1${NORMAL} │ 81 51 ${GREEN}Q${NORMAL} │ 113 71 ${GREEN}q${NORMAL} │" +echo -e "│ 18 12 \033[2mDC2\033[0m │ 50 32 ${RED}2${NORMAL} │ 82 52 ${GREEN}R${NORMAL} │ 114 72 ${GREEN}r${NORMAL} │" +echo -e "│ 19 13 \033[2mDC3\033[0m │ 51 33 ${RED}3${NORMAL} │ 83 53 ${GREEN}S${NORMAL} │ 115 73 ${GREEN}s${NORMAL} │" +echo -e "│ 20 14 \033[2mDC4\033[0m │ 52 34 ${RED}4${NORMAL} │ 84 54 ${GREEN}T${NORMAL} │ 116 74 ${GREEN}t${NORMAL} │" +echo -e "│ 21 15 \033[2mNAK\033[0m │ 53 35 ${RED}5${NORMAL} │ 85 55 ${GREEN}U${NORMAL} │ 117 75 ${GREEN}u${NORMAL} │" +echo -e "│ 22 16 \033[2mSYN\033[0m │ 54 36 ${RED}6${NORMAL} │ 86 56 ${GREEN}V${NORMAL} │ 118 76 ${GREEN}v${NORMAL} │" +echo -e "│ 23 17 \033[2mETB\033[0m │ 55 37 ${RED}7${NORMAL} │ 87 57 ${GREEN}W${NORMAL} │ 119 77 ${GREEN}w${NORMAL} │" +echo -e "│ 24 18 \033[2mCAN\033[0m │ 56 38 ${RED}8${NORMAL} │ 88 58 ${GREEN}X${NORMAL} │ 120 78 ${GREEN}x${NORMAL} │" +echo -e "│ 25 19 \033[2mEM\033[0m │ 57 39 ${RED}9${NORMAL} │ 89 59 ${GREEN}Y${NORMAL} │ 121 79 ${GREEN}y${NORMAL} │" +echo -e "│ 26 1A \033[2mSUB\033[0m │ 58 3A ${CYAN}:${NORMAL} │ 90 5A ${GREEN}Z${NORMAL} │ 122 7A ${GREEN}z${NORMAL} │" +echo -e "│ 27 1B \033[2mESC\033[0m │ 59 3B ${CYAN};${NORMAL} │ 91 5B ${CYAN}[${NORMAL} │ 123 7B ${CYAN}{${NORMAL} │" +echo -e "│ 28 1C \033[2mFS\033[0m │ 60 3C ${CYAN}<${NORMAL} │ 92 5C ${CYAN}\\${NORMAL} │ 124 7C ${CYAN}|${NORMAL} │" +echo -e "│ 29 1D \033[2mGS\033[0m │ 61 3D ${CYAN}=${NORMAL} │ 93 5D ${CYAN}]${NORMAL} │ 125 7D ${CYAN}}${NORMAL} │" +echo -e "│ 30 1E \033[2mRS\033[0m │ 62 3E ${CYAN}>${NORMAL} │ 94 5E ${CYAN}^${NORMAL} │ 126 7E ${CYAN}~${NORMAL} │" +echo -e "│ 31 1F \033[2mUS\033[0m │ 63 3F ${CYAN}?${NORMAL} │ 95 5F ${CYAN}_${NORMAL} │ 127 7F \033[2mDEL\033[0m │" +echo -e "└─────────────┴─────────────┴─────────────┴─────────────┘" diff --git a/modules/home/scripts/scripts/compress.sh b/modules/home/scripts/scripts/compress.sh new file mode 100755 index 0000000..5c31e62 --- /dev/null +++ b/modules/home/scripts/scripts/compress.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if (( $# == 1 )) then + # echo -ne "Archive name: " + # read name + # tar -cvzf "$name.tar.gz" $1 + tar -cvzf "$1.tar.gz" $1 +else + echo "Wrong number of arguments..." +fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/extract.sh b/modules/home/scripts/scripts/extract.sh new file mode 100755 index 0000000..ecc25dd --- /dev/null +++ b/modules/home/scripts/scripts/extract.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +for i in "$@" ; do + tar -xvzf $i + break +done diff --git a/modules/home/scripts/scripts/keybinds.sh b/modules/home/scripts/scripts/keybinds.sh new file mode 100755 index 0000000..c1837e1 --- /dev/null +++ b/modules/home/scripts/scripts/keybinds.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +config_file=~/.config/hypr/hyprland.conf +keybinds=$(grep -oP '(?<=bind = ).*' $config_file) +keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') +wofi -dmenu -p "Keybinds" <<< "$keybinds" diff --git a/modules/home/scripts/scripts/lofi.sh b/modules/home/scripts/scripts/lofi.sh new file mode 100755 index 0000000..76cdc8f --- /dev/null +++ b/modules/home/scripts/scripts/lofi.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if (ps aux | grep mpv | grep -v grep > /dev/null) then + pkill mpv +else + runbg mpv --no-video https://www.youtube.com/live/jfKfPfyJRdk?si=OF0HKrYFFj33BzMo +fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/maxfetch.sh b/modules/home/scripts/scripts/maxfetch.sh new file mode 100755 index 0000000..486f411 --- /dev/null +++ b/modules/home/scripts/scripts/maxfetch.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +unicode=" " +version="1.2.0" + +_black=$(tput setaf 0) +red=$(tput setaf 1) +green=$(tput setaf 2) +yellow=$(tput setaf 3) +blue=$(tput setaf 4) +magenta=$(tput setaf 5) +cyan=$(tput setaf 6) +_white=$(tput setaf 7) +_bright=$(tput bold) +normal=$(tput sgr0) +_underline=$(tput smul) + +up=$(uptime | awk -F'( |,|:)+' '{ + d=h=m=0; + if ($7=="min") + m=$6; + else { + if ($7~/^day/) { d=$6; h=$8; m=$9} + else {h=$6;m=$7} + } + } + { print h+0,"h",m+0,"m" } +') +up=$(sed -e "s/ h/h/g" <<< ${up}) +up=$(sed -e "s/ m/m/g" <<< ${up}) + +pkgs=$(nix-store --query --requisites /run/current-system | wc -l) + +fetch() { + echo "${cyan}$(tput bold) _ ___ ____ ____ ${normal}$(tput sgr0)" + echo "${cyan}$(tput bold) / |/ (_)_ __/ __ \/ __/ ${normal}$(tput sgr0)" + echo "${cyan}$(tput bold) / / /\ \ / /_/ /\ \ ${normal}$(tput sgr0)" + echo "${cyan}$(tput bold) /_/|_/_//_\_"'\\'"____/___/ ${normal}$(tput sgr0)" + echo "" + echo " ╭─────────────╮ " + echo " │ ${red} ${normal} user │ ${red}$(whoami)${normal}" + echo " │ ${yellow} ${normal} distro │ ${yellow}$(sed -nE "s@PRETTY_NAME=\"([^\"]*)\"@\1@p" /etc/os-release)${normal} " + echo " │ ${green} ${normal} kernel │ ${green}$(uname -r)${normal} " + echo " │ ${cyan}󱂬 ${normal} de/wm │ ${cyan}$XDG_CURRENT_DESKTOP${normal} " + echo " │ ${blue} ${normal} uptime │ ${blue}${up}${normal} " + echo " │ ${magenta} ${normal} shell │ ${magenta}$(echo ${SHELL##*/})${normal} " + echo " │ ${red}󰏖 ${normal} pkgs │ ${red}${pkgs}${normal} " + echo " ├─────────────┤ " + echo " │ ${_white} ${normal}colors │${_white}$unicode${normal}${red}$unicode${normal}${yellow}$unicode${normal}${green}$unicode${normal}${cyan}$unicode${normal}${blue}$unicode${normal}${magenta}$unicode${normal}${_black}$unicode${normal}" + echo " ╰─────────────╯ " +} + +fetch && exit 0 \ No newline at end of file diff --git a/modules/home/scripts/scripts/music.sh b/modules/home/scripts/scripts/music.sh new file mode 100755 index 0000000..4cebae1 --- /dev/null +++ b/modules/home/scripts/scripts/music.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if (ps aux | grep audacious | grep -v grep > /dev/null) then + pkill audacious +else + hyprctl dispatch exec "[workspace 5 silent] audacious -t" + sleep 0.5 + audtool playlist-repeat-status |grep "on" || audtool playlist-repeat-toggle + audtool playlist-shuffle-status|grep "on" || audtool playlist-shuffle-toggle +fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/runbg.sh b/modules/home/scripts/scripts/runbg.sh new file mode 100755 index 0000000..dc5088d --- /dev/null +++ b/modules/home/scripts/scripts/runbg.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +[ $# -eq 0 ] && { # $# is number of args + echo "$(basename $0): missing command" >&2 + exit 1 +} +prog="$(which "$1")" # see below +[ -z "$prog" ] && { + echo "$(basename $0): unknown command: $1" >&2 + exit 1 +} +shift # remove $1, now $prog, from args +tty -s && exec /dev/null # if stdout is a terminal, redirect to null +tty -s <&2 && exec 2>&1 # stderr to stdout (which might not be null) +"$prog" "$@" & # $@ is all args \ No newline at end of file diff --git a/modules/home/scripts/scripts/shutdown-script.sh b/modules/home/scripts/scripts/shutdown-script.sh new file mode 100755 index 0000000..96aa7ed --- /dev/null +++ b/modules/home/scripts/scripts/shutdown-script.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env zsh + +respond="$(echo "---------------- Yes ----------------\n-------------- Restart --------------\n---------------- Nah ----------------" | wofi --show dmenu -k /dev/null)" + +if [ $respond = '---------------- Yes ----------------' ] +then + echo "shutdown" + shutdown now +elif [ $respond = '-------------- Restart --------------' ] +then + echo "restart" + reboot +else + notify-send "cancel shutdown" +fi diff --git a/modules/home/scripts/scripts/toggle_blur.sh b/modules/home/scripts/scripts/toggle_blur.sh new file mode 100755 index 0000000..9e970a4 --- /dev/null +++ b/modules/home/scripts/scripts/toggle_blur.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if hyprctl getoption decoration:blur:enabled | grep "int: 1" >/dev/null ; then + hyprctl keyword decoration:blur:enabled false >/dev/null +else + hyprctl keyword decoration:blur:enabled true >/dev/null +fi diff --git a/modules/home/scripts/scripts/toggle_oppacity.sh b/modules/home/scripts/scripts/toggle_oppacity.sh new file mode 100755 index 0000000..9f1062e --- /dev/null +++ b/modules/home/scripts/scripts/toggle_oppacity.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +if hyprctl getoption decoration:active_opacity | grep "float: 1" >/dev/null ; then + hyprctl keyword decoration:active_opacity 0.90 >/dev/null + hyprctl keyword decoration:inactive_opacity 0.90 >/dev/null +else + hyprctl keyword decoration:active_opacity 1 >/dev/null + hyprctl keyword decoration:inactive_opacity 1 >/dev/null +fi diff --git a/modules/home/scripts/scripts/vm-start.sh b/modules/home/scripts/scripts/vm-start.sh new file mode 100755 index 0000000..ba2fd15 --- /dev/null +++ b/modules/home/scripts/scripts/vm-start.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env zsh + +# VM name +vm_name="win10" +export LIBVIRT_DEFAULT_URI="qemu:///system" + +# change workspace +hyprctl dispatch workspace 6 + +virsh start ${vm_name} +virt-viewer -f -w -a ${vm_name} \ No newline at end of file diff --git a/modules/home/scripts/scripts/wallpaper-picker.sh b/modules/home/scripts/scripts/wallpaper-picker.sh new file mode 100755 index 0000000..1c2bece --- /dev/null +++ b/modules/home/scripts/scripts/wallpaper-picker.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +wallpaper_path=$HOME/Pictures/wallpapers +wallpapers_folder=$HOME/Pictures/wallpapers/others +wallpaper_name="$(ls $wallpapers_folder | wofi --show dmenu --sort-order=alphabetical)" +if [[ -f $wallpapers_folder/$wallpaper_name ]]; then + find ~/Pictures/wallpapers -maxdepth 1 -type f -delete + cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name + wall-change $wallpaper_path/$wallpaper_name +else + exit 1 +fi \ No newline at end of file