fixed hyprland + others...

home/river/config/fish/config.fish

@@ -9,6 +9,7 @@ if status is-interactive
     alias nrs="sudo nixos-rebuild switch --flake /home/river/nixos-dotfiles#pc"
     alias config="nvim /home/river/nixos-dotfiles/hosts/pc/configuration.nix"
     alias v=nvim
+    alias y=yazi
 end
 
 function fish_greeting

home/river/config/ghostty/config

@@ -2,9 +2,7 @@ window-padding-x = 2
 
 font-family = "JetBrains Mono NL"
 
-macos-icon = custom
+#theme = Catppuccin Mocha
-macos-custom-icon = /Users/Maaz/.config/ghostty/Ghostty.icns
+theme = Harper
-
-theme = Catppuccin Mocha
 
 font-size = 16

home/river/config/hypr/autostart.lua

@@ -1,4 +1,4 @@
-local config = require("variables.lua")
+local config = require("variables")
 
 hl.on("hyprland.start", function () 
   hl.exec_cmd("wayvnc 0.0.0.0 5900")

home/river/config/hypr/decoration.lua

@@ -1,21 +1,21 @@
 hl.config({
-    decoration = {
+	decoration = {
-        rounding       = 0,
+		rounding = 0,
-        rounding_power = 0,
+		rounding_power = 0,
 
-        -- Change transparency of focused and unfocused windows
+		-- Change transparency of focused and unfocused windows
-        active_opacity   = 1.0,
+		active_opacity = 0.9,
-        inactive_opacity = 0.9,
+		inactive_opacity = 0.8,
 
-        shadow = {
+		shadow = {
-            enabled = false,
+			enabled = false,
-        },
+		},
 
-        blur = {
+		blur = {
-            enabled   = true,
+			enabled = true,
-            size      = 3,
+			size = 3,
-            passes    = 1,
+			passes = 1,
-            vibrancy  = 0.1696,
+			vibrancy = 0.1696,
-        },
+		},
-    }
+	},
-})
+})

home/river/config/hypr/general.lua

@@ -1,4 +1,4 @@
-local theme = require("themes.lua")
+local theme = require("themes")
 
 hl.config({
     general = {

home/river/config/hypr/hyprland.lua

@@ -1,7 +1,7 @@
-require("autostart.lua")
+require("autostart")
-require("keybinds.lua")
+require("keybinds")
-require("monitor.lua")
+require("monitor")
-require("decoration.lua")
+require("decoration")
-require("general.lua")
+require("general")
-require("smart-gaps.lua")
+require("smart-gaps")
-require("inputs.lua")
+require("inputs")

home/river/config/hypr/keybinds.lua

@@ -1,18 +1,18 @@
-local config = require("variables.lua")
+local config = require("variables")
-
 
 local mainMod = "SUPER"
 
-
 -- Application Binds
 hl.bind(mainMod .. " + Return", hl.dsp.exec_cmd(config.terminal))
 hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(config.file_manager))
 hl.bind("ALT + SPACE", hl.dsp.exec_cmd(config.menu))
 hl.bind(mainMod .. " + B", hl.dsp.exec_cmd(config.browser))
 
-
 hl.bind(mainMod .. " + Q", hl.dsp.window.close())
-hl.bind(mainMod .. " + Escape", hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'"))
+hl.bind(
+	mainMod .. " + Escape",
+	hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")
+)
 hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
 hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit"))
 hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" }))
@@ -20,33 +20,50 @@ hl.bind(mainMod .. " + I", hl.dsp.exec_cmd('ghostty -e bash -c "ollama"'))
 hl.bind(mainMod .. " + N", hl.dsp.exec_cmd('ghostty -e bash -c "nmtui"'))
 
 -- Window Binds
-hl.bind(mainMod .. " + left",  hl.dsp.focus({ direction = "left" }))
+hl.bind(mainMod .. " + left", hl.dsp.focus({ direction = "left" }))
 hl.bind(mainMod .. " + right", hl.dsp.focus({ direction = "right" }))
-hl.bind(mainMod .. " + up",    hl.dsp.focus({ direction = "up" }))
+hl.bind(mainMod .. " + up", hl.dsp.focus({ direction = "up" }))
-hl.bind(mainMod .. " + down",  hl.dsp.focus({ direction = "down" }))
+hl.bind(mainMod .. " + down", hl.dsp.focus({ direction = "down" }))
-hl.bind(mainMod .. " + SHIFT + LEFT",  hl.dsp.move({ direction = "left" }))
+hl.bind(mainMod .. " + SHIFT + LEFT", hl.dsp.window.move({ direction = "left" }))
-hl.bind(mainMod .. " + SHIFT + RIGHT", hl.dsp.move({ direction = "right" }))
+hl.bind(mainMod .. " + SHIFT + RIGHT", hl.dsp.window.move({ direction = "right" }))
-hl.bind(mainMod .. " + SHIFT + UP",    hl.dsp.move({ direction = "up" }))
+hl.bind(mainMod .. " + SHIFT + UP", hl.dsp.window.move({ direction = "up" }))
-hl.bind(mainMod .. " + SHIFT + DOWN",  hl.dsp.move({ direction = "down" }))
+hl.bind(mainMod .. " + SHIFT + DOWN", hl.dsp.window.move({ direction = "down" }))
 
 -- Workspace Binds
 for i = 1, 10 do
-    local key = i % 10
+	local key = i % 10
-    hl.bind(mainMod .. " + " .. key,             hl.dsp.focus({ workspace = i}))
+	hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i }))
-    hl.bind(mainMod .. " + SHIFT + " .. key,     hl.dsp.window.move({ workspace = i }))
+	hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i }))
 end
 
 -- Resize Windows
-hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(),   { mouse = true })
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
 hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
 
 -- Screenshot
 hl.bind(mainMod .. " + SHIFT + S", hl.dsp.exec_cmd(config.screen_shot_cmd))
 
 -- Laptop Multimedia Keys
-hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
+hl.bind(
-hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),      { locked = true, repeating = true })
+	"XF86AudioRaiseVolume",
-hl.bind("XF86AudioMute",        hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),     { locked = true, repeating = true })
+	hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),
-hl.bind("XF86AudioMicMute",     hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),   { locked = true, repeating = true })
+	{ locked = true, repeating = true }
-hl.bind("XF86MonBrightnessUp",  hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"),                  { locked = true, repeating = true })
+)
-hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"),                  { locked = true, repeating = true })
+hl.bind(
+	"XF86AudioLowerVolume",
+	hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioMute",
+	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioMicMute",
+	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
+	{ locked = true, repeating = true }
+)
+hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
+

home/river/config/hypr/variables.lua

@@ -1,26 +1,20 @@
 local function wallpaper_util(wallpaper_path)
-    local ext = wallpaper_path:lower():match("^.+%.([a-z0-9]+)$")
+	local ext = wallpaper_path:lower():match("^.+%.([a-z0-9]+)$")
-  
+
-    if ext == "mp4" or ext == "mkv" or ext == "webm" or ext == "mov" then
+	if ext == "mp4" or ext == "mkv" or ext == "webm" or ext == "mov" then
-      return string.format(
+		return string.format('mpvpaper ALL "%s" --mpv-options="loop-file=inf no-audio"', wallpaper_path)
-        'mpvpaper ALL "%s" --mpv-options="loop-file=inf no-audio"',
+	end
-        wallpaper_path
+
-      )
+	return string.format('awww-daemon & awww img "%s"', wallpaper_path)
-    end
+end
-  
-    return string.format(
-      'mpvpaper '*' "%s"',
-      wallpaper_path
-    )
-  end
 
 return {
-    terminal = "ghostty",
+	terminal = "ghostty",
-    file_manager = "dolphin",
+	file_manager = "dolphin",
-    screen_shot_cmd = "hyprshot -m region -o ~/Pictures/Screenshots",
+	screen_shot_cmd = "hyprshot -m region -o ~/Pictures/Screenshots",
-    menu = "rofi -show drun",
+	menu = "rofi -show drun",
-    wallpaper_cmd = wallpaper_util("/home/river/Pictures/Wallpapers/bg.png"),
+	wallpaper_cmd = wallpaper_util("/home/river/Pictures/Wallpapers/bg.png"),
-    --wallpaper_cmd = wallpaper_util("/home/river/Videos/Wallpapers/bg.mp4"),
+	--wallpaper_cmd = wallpaper_util("/home/river/Videos/Wallpapers/bg.mp4"),
-    browser = "brave",
+	browser = "brave",
-    bar_cmd = "waybar"
+	bar_cmd = "waybar",
-}
+}

home/river/config/nvim/lua/plugins/lsp.lua

@@ -11,6 +11,20 @@ return {
             },
           },
         },
+        nixd = {},
+      },
+    },
+    setup = {
+      cmd = { "nixd" },
+      settings = {
+        nixd = {
+          nixpkgs = {
+            expr = "import <nixpkgs> { }",
+          },
+          formatting = {
+            command = { "nixfmt" },
+          },
+        },
       },
     },
   },

home/river/default.nix

@@ -9,7 +9,6 @@
     ./programs/fish.nix
     ./programs/vesktop.nix
     ./programs/java.nix
-    #./programs/neovim.nix
   ];
 
   programs.home-manager.enable = true;

hosts/pc/configuration.nix

@@ -51,6 +51,7 @@
     xautoclick
     tsx
     slack
+    mosh
   ];
 
   systemd.network.wait-online.enable = false;

modules/core/default.nix

@@ -36,6 +36,7 @@
     ghostty
     git-credential-manager
     gnupg
+    yazi
   ];
 
   nix = {