Merge pull request 'migration: lua' (#2) from features/hypr_lua_config into features/adding_quickshell
Reviewed-on: #2 pulling into changes
This commit was merged in pull request #2.
This commit is contained in:
@@ -2,8 +2,9 @@
|
||||
-- Ported from UserConfigs/UserAnimations.conf (the active preset)
|
||||
--
|
||||
-- The 14 alternative presets from animations/*.conf were also ported, flat, as
|
||||
-- anim-*.lua (see the plan) — none of them are wired in. To switch styles, replace
|
||||
-- the body of this file with `require("anim-<preset>")`, e.g. require("anim-ml4w-classic").
|
||||
-- anim-*.lua (see the plan) — none of them are wired in. They now live in ../presets/.
|
||||
-- To switch styles, replace the body of this file with `require("presets.anim-<preset>")`,
|
||||
-- e.g. require("presets.anim-ml4w-classic").
|
||||
|
||||
hl.config({
|
||||
animations = {
|
||||
@@ -6,7 +6,7 @@
|
||||
-- Animation - https://wiki.hyprland.org/Configuring/Animations/
|
||||
-- Decoration - https://wiki.hyprland.org/Configuring/Variables/#decoration
|
||||
|
||||
local colors = require("colors")
|
||||
local colors = require("appearance.colors")
|
||||
|
||||
hl.config({
|
||||
general = {
|
||||
@@ -2,9 +2,13 @@
|
||||
-- Ported from hyprland.conf — see https://wiki.hyprland.org/
|
||||
--
|
||||
-- This mirrors the old source= chain 1:1, just as require()'d Lua modules instead
|
||||
-- of hyprlang includes. See each file for its origin. The animations/ preset library
|
||||
-- of hyprlang includes. See each file for its origin. The presets/ preset library
|
||||
-- (anim-*.lua) is also ported but intentionally not required from here — only the
|
||||
-- currently-active style (animations.lua) is wired in, exactly like before.
|
||||
-- currently-active style (appearance/animations.lua) is wired in, exactly like before.
|
||||
--
|
||||
-- Modules live in subfolders sorted by concern (core/, appearance/, layout/, input/,
|
||||
-- presets/) — require() paths below use dotted module names, which Lua resolves to
|
||||
-- the matching subfolder (e.g. require("core.env") -> core/env.lua).
|
||||
|
||||
-- Initial boot script: applies initial wallpapers, theming, new settings etc.
|
||||
-- suggest not changing/deleting this, including the reference file at ~/.config/hypr/.initial_startup_done
|
||||
@@ -14,17 +18,17 @@ hl.on("hyprland.start", function()
|
||||
end)
|
||||
|
||||
-- ## This is where you want to start tinkering
|
||||
require("startup") -- put your start-up packages in startup.lua
|
||||
require("env") -- Environment variables to load
|
||||
require("windowrules") -- all about Hyprland Window Rules and Layer Rules
|
||||
require("decorations") -- Decorations config
|
||||
require("animations") -- Animation config
|
||||
require("keybinds") -- Put your own keybinds here
|
||||
require("settings") -- Main Hyprland Settings
|
||||
require("core.startup") -- put your start-up packages in core/startup.lua
|
||||
require("core.env") -- Environment variables to load
|
||||
require("layout.windowrules") -- all about Hyprland Window Rules and Layer Rules
|
||||
require("appearance.decorations") -- Decorations config
|
||||
require("appearance.animations") -- Animation config
|
||||
require("input.keybinds") -- Put your own keybinds here
|
||||
require("core.settings") -- Main Hyprland Settings
|
||||
|
||||
-- nwg-displays / hyprdynamicmonitors
|
||||
require("monitors")
|
||||
require("workspaces")
|
||||
require("layout.monitors")
|
||||
require("layout.workspaces")
|
||||
|
||||
-- NOTE: the original hyprland.conf used a plain `exec` (not `exec-once`) here, so it
|
||||
-- re-ran on every `hyprctl reload`, not just at startup. hl.on("hyprland.start", ...)
|
||||
@@ -35,4 +39,4 @@ hl.on("hyprland.start", function()
|
||||
end)
|
||||
|
||||
-- HyprMod managed settings
|
||||
require("hyprmod")
|
||||
require("core.hyprmod")
|
||||
|
||||
Reference in New Issue
Block a user