Merge branch 'niri' of ssh://gitea.sparkle.gay:9173/vivian/.dotfiles into niri

B
:
B

i

.config/fish/config.fish

@@ -24,12 +24,13 @@ alias girlboss="sudo"
 alias anifetch="python3 ~/.anifetch/anifetch.py -f \"~/.anifetch/video.mp4\" --framerate 30 --width 60 --height 60 -c \"--symbols wide --fg-only\""
 
 alias vifish="nvim $HOME/.config/fish/config.fish"
+alias thmvpn="sudo openvpn $HOME/Documents/VPNConfig/TheSparkle.ovpn"
 
 alias obs-fix="__NV_DISABLE_EXPLICIT_SYNC=1 flatpak run com.obsproject.Studio"
 
 # pnpm
 set -gx PNPM_HOME "/home/vivian/.local/share/pnpm"
 if not string match -q -- $PNPM_HOME $PATH
-  set -gx PATH "$PNPM_HOME" $PATH
+    set -gx PATH "$PNPM_HOME" $PATH
 end
 # pnpm end

.config/hypr/hyprland.conf

@@ -26,4 +26,3 @@ source = ~/.config/hypr/land/keybinds.conf
 source = ~/.config/hypr/land/look-and-feel.conf
 source = ~/.config/hypr/land/monitors.conf
 source = ~/.config/hypr/land/windows.conf
-

.config/hypr/land/autostart.conf

@@ -9,4 +9,4 @@
 # exec-once = nm-applet &
 # exec-once = waybar & hyprpaper & firefox
 
-exec-once = waybar & swaync & hypridle & hyprpaper & poweralertd
+exec-once = waybar & swaync & hypridle & hyprpaper & kwalletd6

.config/hypr/land/input.conf

@@ -22,9 +22,9 @@ input {
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = true
-}
+#gestures {
+#    workspace_swipe = true
+#}
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more

.config/hypr/land/keybinds/tools.conf

@@ -5,3 +5,6 @@ bind = CONTROL SHIFT, PRINT, exec, hyprshot -m output -z -o $screenshotDir
 
 # Hyprlock
 bind = $mainMod SHIFT, l, exec, hyprlock
+
+# Hyprview
+bind = $mainMod, H, hyprview:toggle

.config/hypr/land/look-and-feel.conf

@@ -35,10 +35,10 @@ decoration {
 
     # Change transparency of focused and unfocused windows
     active_opacity = 1.0
-    inactive_opacity = .98
+    inactive_opacity = 1.0
 
     shadow {
-        enabled = false
+        enabled = true
         range = 4
         render_power = 3
         color = rgba(1a1a1aee)

.config/hypr/land/variables.conf

@@ -6,6 +6,6 @@
 
 # Set programs that you use
 $terminal = ghostty
-$fileManager = nautilus
+$fileManager = dolphin
 $menu = wofi --show drun -i
 $screenshotDir = ~/Pictures/Screenshots

.config/niri/config.kdl

@@ -106,6 +106,68 @@ output "eDP-1" {
     position x=0 y=0
 }
 
+output "DP-1" {
+    // Uncomment this line to disable this output.
+    // off
+
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    mode "2560x1440@60"
+
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    scale 1.5
+
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    transform "normal"
+
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    position x=0 y=0
+}
+
+output "HDMI-A-1" {
+    // Uncomment this line to disable this output.
+    // off
+
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    mode "1920x1080@60"
+
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    scale 1
+
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    transform "normal"
+
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    position x=2560 y=360
+}
+
 // Settings that influence how windows are positioned and sized.
 // Find more information on the wiki:
 // https://yalter.github.io/niri/Configuration:-Layout
@@ -273,6 +335,7 @@ layout {
 spawn-at-startup "waybar"
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
+spawn-at-startup "kwalletd6"
 // spawn-at-startup "vesktop"
 
 // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
@@ -332,6 +395,25 @@ window-rule {
     open-floating true
 }
 
+window-rule {
+  match app-id="vesktop"
+
+  open-on-output "HDMI-A-1"
+  default-column-width { proportion 1.0; }
+}
+
+window-rule {
+  match app-id=r"^app\.zen_browser\.zen"
+
+  default-column-width { proportion 1.0; }
+}
+
+window-rule {
+  match app-id=r"^app\.zen_browser\.zen" title="^Picture-in-Picture$"
+
+  open-floating true
+}
+
 // Example: block out two password managers from screen capture.
 // (This example rule is commented out with a "/-" in front.)
 /-window-rule {

.config/nvim/lazy-lock.json

@@ -1,47 +1,47 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "f68deee85b8d734db1a9fbf63ce17a8164921267" },
-  "LazyVim": { "branch": "main", "commit": "dc1ffa5bcb66f46284f91a8593dda5c7c54a1824" },
-  "LuaSnip": { "branch": "master", "commit": "21e9fecfc07fb2cd707b6c7c3fa148550a34d053" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "667eaa5da8f66f1dd97c905a12dd1eb544a2d259" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "a7138a0ee04d8af42c262554eccee168bbf1454f" },
+  "LazyVim": { "branch": "main", "commit": "8b8ceb6c878cd9c44dac4b6beb70a7bb82d86c30" },
+  "LuaSnip": { "branch": "master", "commit": "ccf25a5452b8697a823de3e5ecda63ed3d723b79" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "4341619da06779ae310ee9c3d6d70edfefed7152" },
   "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" },
   "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" },
-  "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "catppuccin": { "branch": "main", "commit": "8c4125e3c746976ba025dc5d908fa22c6aa09486" },
+  "conform.nvim": { "branch": "master", "commit": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081" },
   "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flash.nvim": { "branch": "main", "commit": "2febce67ff9cf7638d2569d17c41af02c38401eb" },
+  "flash.nvim": { "branch": "main", "commit": "3be9bf7e85550045ec576379a0c45aac144d0438" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
-  "grug-far.nvim": { "branch": "main", "commit": "2e991081c0e653e151fc9e659514d7c2fc31d22a" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
-  "lualine.nvim": { "branch": "master", "commit": "e533fac71bc361768f90004af695cd1f1aa1900a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
+  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
+  "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" },
+  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
+  "lazydev.nvim": { "branch": "main", "commit": "01bc2aacd51cf9021eb19d048e70ce3dd09f7f93" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1d77bd86e1c3eaa777010c95dad455b83823f247" },
   "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
   "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" },
   "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
   "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" },
-  "noice.nvim": { "branch": "main", "commit": "38c702be0d8fea81527ee6a73e1e834e72481193" },
+  "noice.nvim": { "branch": "main", "commit": "c86aea584d98be7ee1167ce4d4ef946fbd7f3ae0" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-jdtls": { "branch": "master", "commit": "380ac148f989e1291aac002dc959ecc68c5243d0" },
   "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
-  "nvim-treesitter": { "branch": "main", "commit": "4968877bb2dceac45948e24ee14298b1006b4cbf" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a9b2fb560c4ab22c10728fd5149dbd7b62aa4f69" },
+  "nvim-treesitter": { "branch": "main", "commit": "98fe644cb3b5ba390d1bc3f89299f93c70020803" },
   "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" },
   "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
   "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rustaceanvim": { "branch": "master", "commit": "2f5afad4fc62c609dfd2ef4613999a0e8bddcccc" },
-  "snacks.nvim": { "branch": "main", "commit": "454ba02d69347c0735044f159b95d2495fc79a73" },
+  "rustaceanvim": { "branch": "master", "commit": "509d2e98a893767a1aad42f30354fc957e470862" },
+  "snacks.nvim": { "branch": "main", "commit": "f33aa2017a2671fb4a0e71316f385c8010c8b81b" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "tokyonight.nvim": { "branch": "main", "commit": "d14614cbfc63b6037bfccd48bb982d2ad2003352" },
-  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "tokyonight.nvim": { "branch": "main", "commit": "4fe1b0c44f5d6ee769cdfbdffc7ccb703f53feda" },
+  "trouble.nvim": { "branch": "main", "commit": "76030c5542c5d132aeeb467ca0ab370f3f79a697" },
   "ts-comments.nvim": { "branch": "main", "commit": "217ab9cc137fceb6659b53790bd25e608219abe1" },
-  "venv-selector.nvim": { "branch": "main", "commit": "7fff64b5b1455207b9a9fd2ae8697cf9ac0b2a2d" },
+  "venv-selector.nvim": { "branch": "main", "commit": "9d528643ab17795c69dc42ce018120c397a36f8b" },
   "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
   "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
   "vim-dadbod-ui": { "branch": "master", "commit": "5a83ee1fdafcdedb03222bb46f7cfd70646025ee" },

.config/nvim/lazyvim.json

@@ -3,7 +3,6 @@
     "lazyvim.plugins.extras.ai.copilot-chat",
     "lazyvim.plugins.extras.coding.luasnip",
     "lazyvim.plugins.extras.editor.telescope",
-    "lazyvim.plugins.extras.formatting.prettier",
     "lazyvim.plugins.extras.lang.docker",
     "lazyvim.plugins.extras.lang.git",
     "lazyvim.plugins.extras.lang.go",

.config/waybar/style.css

@@ -1,57 +1,57 @@
 @import "mocha.css";
 
 * {
-	font-family: "MesloLGS Nerd Font Mono Bold";
-	font-size: 16px;
-	min-height: 0;
-	font-weight: bold;
+  font-family: "SauceCodePro NFM Bold";
+  font-size: 16px;
+  min-height: 0;
+  font-weight: bold;
 }
 
 window#waybar {
-	background: transparent;
-	background-color: @crust;
-	color: @overlay0;
-	transition-property: background-color;
-	transition-duration: 0.1s;
-	/* border-bottom: 1px solid @overlay1; */
+  background: transparent;
+  background-color: @crust;
+  color: @overlay0;
+  transition-property: background-color;
+  transition-duration: 0.1s;
+  /* border-bottom: 1px solid @overlay1; */
 }
 
 #window {
-	margin: 8px;
-	padding-left: 8;
-	padding-right: 8;
+  margin: 8px;
+  padding-left: 8;
+  padding-right: 8;
 }
 
 button {
-	box-shadow: inset 0 -3px transparent;
-	border: none;
-	border-radius: 0;
+  box-shadow: inset 0 -3px transparent;
+  border: none;
+  border-radius: 0;
 }
 
 button:hover {
-	background: inherit;
-	color: @mauve;
-	border-top: 2px solid @mauve;
+  background: inherit;
+  color: @mauve;
+  border-top: 2px solid @mauve;
 }
 
 #workspaces button {
-	padding: 0 4px;
+  padding: 0 4px;
 }
 
 #workspaces button.focused {
-	background-color: rgba(0, 0, 0, 0.3);
-	color: @rosewater;
-	border-top: 2px solid @rosewater;
+  background-color: rgba(0, 0, 0, 0.3);
+  color: @rosewater;
+  border-top: 2px solid @rosewater;
 }
 
 #workspaces button.active {
-	background-color: rgba(0, 0, 0, 0.3);
-	color: @mauve;
-	border-top: 2px solid @mauve;
+  background-color: rgba(0, 0, 0, 0.3);
+  color: @mauve;
+  border-top: 2px solid @mauve;
 }
 
 #workspaces button.urgent {
-	background-color: #eb4d4b;
+  background-color: #eb4d4b;
 }
 
 #pulseaudio,
@@ -68,71 +68,71 @@ button:hover {
 #mode,
 #scratchpad,
 #custom-swaync {
-	margin-top: 2px;
-	margin-bottom: 2px;
-	margin-left: 4px;
-	margin-right: 4px;
-	padding-left: 4px;
-	padding-right: 4px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-left: 4px;
+  margin-right: 4px;
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 #clock {
-	color: @maroon;
-	border-bottom: 2px solid @maroon;
+  color: @maroon;
+  border-bottom: 2px solid @maroon;
 }
 
 #clock.date {
-	color: @mauve;
-	border-bottom: 2px solid @mauve;
+  color: @mauve;
+  border-bottom: 2px solid @mauve;
 }
 
 #pulseaudio {
-	color: @blue;
-	border-bottom: 2px solid @blue;
+  color: @blue;
+  border-bottom: 2px solid @blue;
 }
 
 #network {
-	color: @yellow;
-	border-bottom: 2px solid @yellow;
+  color: @yellow;
+  border-bottom: 2px solid @yellow;
 }
 
 #idle_inhibitor {
-	margin-right: 12px;
-	color: #7cb342;
+  margin-right: 12px;
+  color: #7cb342;
 }
 
 #idle_inhibitor.activated {
-	color: @red;
+  color: @red;
 }
 
 #battery {
-	color: @green;
-	border-bottom: 2px solid @green;
+  color: @green;
+  border-bottom: 2px solid @green;
 }
 
 #tray menu {
-	background-color: @crust;
-	color: @text;
+  background-color: @crust;
+  color: @text;
 }
 
 #custom-swaync,
 #custom-logout {
-	margin-right: 16px;
+  margin-right: 16px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
-	margin-left: 0;
+  margin-left: 0;
 }
 
 /* If workspaces is the rightmost module, omit right margin */
 .modules-right > widget:last-child > #workspaces {
-	margin-right: 0;
+  margin-right: 0;
 }
 
 #custom-vpn {
-	color: @lavender;
-	border-radius: 15px;
-	padding-left: 6px;
-	padding-right: 6px;
+  color: @lavender;
+  border-radius: 15px;
+  padding-left: 6px;
+  padding-right: 6px;
 }