Compare commits
No commits in common. "054f6a8fe77be4dd6f2498d650a2d5f6d4ea0927" and "01f9c0119a397d7d919f1b6c15cffa735c9dbd7a" have entirely different histories.
054f6a8fe7
...
01f9c0119a
22 changed files with 403 additions and 550 deletions
|
|
@ -3,7 +3,7 @@
|
|||
(url "https://git.savannah.gnu.org/git/guix.git")
|
||||
(branch "master")
|
||||
(commit
|
||||
"91dd354a10edbb0d3d4bc3220b671504eda871a7")
|
||||
"de714bcb46d61922e0efc10783ea23fb0202f583")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
"9edb3f66fd807b096b48283debdcddccfea34bad"
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
(url "https://gitlab.com/nonguix/nonguix")
|
||||
(branch "master")
|
||||
(commit
|
||||
"e355a2ff675abd48f671a867c211c98707ca1e82")
|
||||
"57d6d0cd4beb489e045231eb7066073ebe8a0dc5")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ binde =, XF86AudioPrev, exec, playerctl previous
|
|||
binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
|
||||
binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
|
||||
|
||||
bind = $mod SHIFT, s, exec, grimblast copy area && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
|
||||
bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
|
||||
bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard"
|
||||
bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so
|
||||
#exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprbars.so
|
||||
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so
|
||||
|
|
|
|||
|
|
@ -32,6 +32,18 @@ plugin {
|
|||
enable = true
|
||||
}
|
||||
}
|
||||
|
||||
#hyprbars {
|
||||
# bar_height = 24
|
||||
# bar_part_of_window = true
|
||||
# bar_color = $base_color
|
||||
# col.text = $text_color
|
||||
# bar_text_size = 9
|
||||
# bar_text_font = JetBrains Mono Nerd Font Mono Bold
|
||||
# bar_button_padding = 12
|
||||
# bar_padding = 10
|
||||
# bar_precedence_over_border = true
|
||||
#}
|
||||
}
|
||||
|
||||
decoration {
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
monitor=HDMI-A-1,1920x1080@60.0,0x0,1.0
|
||||
monitor=DP-2,2560x1440@59.95,1920x0,1.0
|
||||
# Generated by nwg-displays on 2024-06-18 at 20:22:23. Do not edit manually.
|
||||
|
||||
monitor=eDP-1,2560x1600@90.0,0x0,1.25
|
||||
monitor=DP-2,2560x1440@59.95,2048x0,1.0
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ show_hyperlink_targets yes
|
|||
|
||||
show_hyperlink_targets no
|
||||
|
||||
background_opacity 0.75
|
||||
background_opacity 0.85
|
||||
|
||||
window_padding_width 10
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ local lsp = require('lsp-zero').preset('recommended')
|
|||
require('mason').setup({})
|
||||
require('mason-lspconfig').setup({
|
||||
ensure_installed = {
|
||||
'tsserver',
|
||||
'eslint',
|
||||
'rust_analyzer',
|
||||
'clangd',
|
||||
|
|
@ -14,7 +15,6 @@ require('mason-lspconfig').setup({
|
|||
'jdtls',
|
||||
'bashls',
|
||||
'lua_ls',
|
||||
'csharp_ls',
|
||||
},
|
||||
handlers = {
|
||||
lsp.default_setup,
|
||||
|
|
@ -25,10 +25,10 @@ local cmp = require('cmp')
|
|||
|
||||
local cmp_select = {behavior = cmp.SelectBehavior.Select}
|
||||
local cmp_mappings = cmp.mapping.preset.insert({
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
})
|
||||
|
||||
cmp_mappings['<Tab>'] = nil
|
||||
|
|
@ -39,13 +39,13 @@ cmp.setup({
|
|||
})
|
||||
|
||||
lsp.set_preferences({
|
||||
suggest_lsp_servers = false,
|
||||
sign_icons = {
|
||||
error = 'E',
|
||||
warn = 'W',
|
||||
hint = 'H',
|
||||
info = 'I'
|
||||
}
|
||||
suggest_lsp_servers = false,
|
||||
sign_icons = {
|
||||
error = 'E',
|
||||
warn = 'W',
|
||||
hint = 'H',
|
||||
info = 'I'
|
||||
}
|
||||
})
|
||||
|
||||
lsp.on_attach(function(client, bufnr)
|
||||
|
|
@ -53,15 +53,15 @@ lsp.on_attach(function(client, bufnr)
|
|||
local keymap = vim.keymap.set
|
||||
|
||||
keymap("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
||||
keymap("n", "K", function() vim.lsp.buf.hover() end, opts)
|
||||
keymap("n", "<leader>ls", function() vim.lsp.buf.workspace_symbol() end, opts)
|
||||
keymap("n", "<leader>lf", function() vim.diagnostic.open_float() end, opts)
|
||||
keymap("n", "[d", function() vim.diagnostic.goto_next() end, opts)
|
||||
keymap("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
|
||||
keymap("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts)
|
||||
keymap("n", "<leader>lr", function() vim.lsp.buf.references() end, opts)
|
||||
keymap("n", "<leader>ln", function() vim.lsp.buf.rename() end, opts)
|
||||
keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
||||
keymap("n", "K", function() vim.lsp.buf.hover() end, opts)
|
||||
keymap("n", "<leader>ls", function() vim.lsp.buf.workspace_symbol() end, opts)
|
||||
keymap("n", "<leader>lf", function() vim.diagnostic.open_float() end, opts)
|
||||
keymap("n", "[d", function() vim.diagnostic.goto_next() end, opts)
|
||||
keymap("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
|
||||
keymap("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts)
|
||||
keymap("n", "<leader>lr", function() vim.lsp.buf.references() end, opts)
|
||||
keymap("n", "<leader>ln", function() vim.lsp.buf.rename() end, opts)
|
||||
keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
||||
end)
|
||||
|
||||
require('lspconfig/prolog_lsp')
|
||||
|
|
@ -87,7 +87,7 @@ require('phpactor').setup {
|
|||
}
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true
|
||||
virtual_text = true
|
||||
})
|
||||
|
||||
require("neodev").setup()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
local path_ok, plenary_path = pcall(require, "plenary.path")
|
||||
if not path_ok then
|
||||
return
|
||||
return
|
||||
end
|
||||
|
||||
local dashboard = require("alpha.themes.dashboard")
|
||||
|
|
@ -8,226 +8,226 @@ local cdir = vim.fn.getcwd()
|
|||
local if_nil = vim.F.if_nil
|
||||
|
||||
local nvim_web_devicons = {
|
||||
enabled = true,
|
||||
highlight = true,
|
||||
enabled = true,
|
||||
highlight = true,
|
||||
}
|
||||
|
||||
local function get_extension(fn)
|
||||
local match = fn:match("^.+(%..+)$")
|
||||
local ext = ""
|
||||
if match ~= nil then
|
||||
ext = match:sub(2)
|
||||
end
|
||||
return ext
|
||||
local match = fn:match("^.+(%..+)$")
|
||||
local ext = ""
|
||||
if match ~= nil then
|
||||
ext = match:sub(2)
|
||||
end
|
||||
return ext
|
||||
end
|
||||
|
||||
local function icon(fn)
|
||||
local nwd = require("nvim-web-devicons")
|
||||
local ext = get_extension(fn)
|
||||
return nwd.get_icon(fn, ext, { default = true })
|
||||
local nwd = require("nvim-web-devicons")
|
||||
local ext = get_extension(fn)
|
||||
return nwd.get_icon(fn, ext, { default = true })
|
||||
end
|
||||
|
||||
local function file_button(fn, sc, short_fn,autocd)
|
||||
short_fn = short_fn or fn
|
||||
local ico_txt
|
||||
local fb_hl = {}
|
||||
short_fn = short_fn or fn
|
||||
local ico_txt
|
||||
local fb_hl = {}
|
||||
|
||||
if nvim_web_devicons.enabled then
|
||||
local ico, hl = icon(fn)
|
||||
local hl_option_type = type(nvim_web_devicons.highlight)
|
||||
if hl_option_type == "boolean" then
|
||||
if hl and nvim_web_devicons.highlight then
|
||||
table.insert(fb_hl, { hl, 0, #ico })
|
||||
end
|
||||
end
|
||||
if hl_option_type == "string" then
|
||||
table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico })
|
||||
end
|
||||
ico_txt = ico .. " "
|
||||
else
|
||||
ico_txt = ""
|
||||
end
|
||||
local cd_cmd = (autocd and " | cd %:p:h" or "")
|
||||
local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "<cmd>e " .. vim.fn.fnameescape(fn) .. cd_cmd .." <CR>")
|
||||
local fn_start = short_fn:match(".*[/\\]")
|
||||
if fn_start ~= nil then
|
||||
table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt })
|
||||
end
|
||||
file_button_el.opts.hl = fb_hl
|
||||
return file_button_el
|
||||
if nvim_web_devicons.enabled then
|
||||
local ico, hl = icon(fn)
|
||||
local hl_option_type = type(nvim_web_devicons.highlight)
|
||||
if hl_option_type == "boolean" then
|
||||
if hl and nvim_web_devicons.highlight then
|
||||
table.insert(fb_hl, { hl, 0, #ico })
|
||||
end
|
||||
end
|
||||
if hl_option_type == "string" then
|
||||
table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico })
|
||||
end
|
||||
ico_txt = ico .. " "
|
||||
else
|
||||
ico_txt = ""
|
||||
end
|
||||
local cd_cmd = (autocd and " | cd %:p:h" or "")
|
||||
local file_button_el = dashboard.button(sc, ico_txt .. short_fn, "<cmd>e " .. vim.fn.fnameescape(fn) .. cd_cmd .." <CR>")
|
||||
local fn_start = short_fn:match(".*[/\\]")
|
||||
if fn_start ~= nil then
|
||||
table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt })
|
||||
end
|
||||
file_button_el.opts.hl = fb_hl
|
||||
return file_button_el
|
||||
end
|
||||
|
||||
local default_mru_ignore = { "gitcommit" }
|
||||
|
||||
local mru_opts = {
|
||||
ignore = function(path, ext)
|
||||
return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext))
|
||||
end,
|
||||
autocd = false
|
||||
ignore = function(path, ext)
|
||||
return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext))
|
||||
end,
|
||||
autocd = false
|
||||
}
|
||||
|
||||
--- @param start number
|
||||
--- @param cwd string? optional
|
||||
--- @param items_number number? optional number of items to generate, default = 10
|
||||
local function mru(start, cwd, items_number, opts)
|
||||
opts = opts or mru_opts
|
||||
items_number = if_nil(items_number, 10)
|
||||
opts = opts or mru_opts
|
||||
items_number = if_nil(items_number, 10)
|
||||
|
||||
local oldfiles = {}
|
||||
for _, v in pairs(vim.v.oldfiles) do
|
||||
if #oldfiles == items_number then
|
||||
break
|
||||
end
|
||||
local cwd_cond
|
||||
if not cwd then
|
||||
cwd_cond = true
|
||||
else
|
||||
cwd_cond = vim.startswith(v, cwd)
|
||||
end
|
||||
local ignore = (opts.ignore and opts.ignore(v, get_extension(v))) or false
|
||||
if (vim.fn.filereadable(v) == 1) and cwd_cond and not ignore then
|
||||
oldfiles[#oldfiles + 1] = v
|
||||
end
|
||||
end
|
||||
local target_width = 35
|
||||
local oldfiles = {}
|
||||
for _, v in pairs(vim.v.oldfiles) do
|
||||
if #oldfiles == items_number then
|
||||
break
|
||||
end
|
||||
local cwd_cond
|
||||
if not cwd then
|
||||
cwd_cond = true
|
||||
else
|
||||
cwd_cond = vim.startswith(v, cwd)
|
||||
end
|
||||
local ignore = (opts.ignore and opts.ignore(v, get_extension(v))) or false
|
||||
if (vim.fn.filereadable(v) == 1) and cwd_cond and not ignore then
|
||||
oldfiles[#oldfiles + 1] = v
|
||||
end
|
||||
end
|
||||
local target_width = 35
|
||||
|
||||
local tbl = {}
|
||||
for i, fn in ipairs(oldfiles) do
|
||||
local short_fn
|
||||
if cwd then
|
||||
short_fn = vim.fn.fnamemodify(fn, ":.")
|
||||
else
|
||||
short_fn = vim.fn.fnamemodify(fn, ":~")
|
||||
end
|
||||
local tbl = {}
|
||||
for i, fn in ipairs(oldfiles) do
|
||||
local short_fn
|
||||
if cwd then
|
||||
short_fn = vim.fn.fnamemodify(fn, ":.")
|
||||
else
|
||||
short_fn = vim.fn.fnamemodify(fn, ":~")
|
||||
end
|
||||
|
||||
if #short_fn > target_width then
|
||||
short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 })
|
||||
if #short_fn > target_width then
|
||||
short_fn = plenary_path.new(short_fn):shorten(1, { -1 })
|
||||
end
|
||||
end
|
||||
if #short_fn > target_width then
|
||||
short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 })
|
||||
if #short_fn > target_width then
|
||||
short_fn = plenary_path.new(short_fn):shorten(1, { -1 })
|
||||
end
|
||||
end
|
||||
|
||||
local shortcut = tostring(i + start - 1)
|
||||
local shortcut = tostring(i + start - 1)
|
||||
|
||||
local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd)
|
||||
tbl[i] = file_button_el
|
||||
end
|
||||
return {
|
||||
type = "group",
|
||||
val = tbl,
|
||||
opts = {},
|
||||
}
|
||||
local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd)
|
||||
tbl[i] = file_button_el
|
||||
end
|
||||
return {
|
||||
type = "group",
|
||||
val = tbl,
|
||||
opts = {},
|
||||
}
|
||||
end
|
||||
|
||||
local cats = {
|
||||
{
|
||||
[[ ,-. _,---._ __ / \]],
|
||||
[[ / ) .-' `./ / \]],
|
||||
[[( ( ,' `/ /|]],
|
||||
[[ \ `-" \'\ / |]],
|
||||
[[ `. , \ \ / |]],
|
||||
[[ /`. ,'-`----Y |]],
|
||||
[[ ( ; | ']],
|
||||
[[ | ,-. ,-' | /]],
|
||||
[[ | | ( | hjw | /]],
|
||||
[[ ,-. _,---._ __ / \]],
|
||||
[[ / ) .-' `./ / \]],
|
||||
[[( ( ,' `/ /|]],
|
||||
[[ \ `-" \'\ / |]],
|
||||
[[ `. , \ \ / |]],
|
||||
[[ /`. ,'-`----Y |]],
|
||||
[[ ( ; | ']],
|
||||
[[ | ,-. ,-' | /]],
|
||||
[[ | | ( | hjw | /]],
|
||||
[[ ) | \ `.___________|/]],
|
||||
[[ `--' `--']],
|
||||
},
|
||||
{
|
||||
[[ _]],
|
||||
[[ \`*-. ]],
|
||||
[[ ) _`-. ]],
|
||||
[[ . : `. . ]],
|
||||
[[ : _ ' \ ]],
|
||||
[[ ; *` _. `*-._ ]],
|
||||
[[ `-.-' `-. ]],
|
||||
[[ ; ` `. ]],
|
||||
[[ :. . \ ]],
|
||||
[[ . \ . : .-' . ]],
|
||||
[[ ' `+.; ; ' : ]],
|
||||
[[ : ' | ; ;-. ]],
|
||||
[[ ; ' : :`-: _.`* ;]],
|
||||
[[ \`*-. ]],
|
||||
[[ ) _`-. ]],
|
||||
[[ . : `. . ]],
|
||||
[[ : _ ' \ ]],
|
||||
[[ ; *` _. `*-._ ]],
|
||||
[[ `-.-' `-. ]],
|
||||
[[ ; ` `. ]],
|
||||
[[ :. . \ ]],
|
||||
[[ . \ . : .-' . ]],
|
||||
[[ ' `+.; ; ' : ]],
|
||||
[[ : ' | ; ;-. ]],
|
||||
[[ ; ' : :`-: _.`* ;]],
|
||||
[[[bug] .*' / .*' ; .*`- +' `*' ]],
|
||||
[[ `*-* `*-* `*-*']],
|
||||
[[ `*-* `*-* `*-*']],
|
||||
},
|
||||
}
|
||||
|
||||
math.randomseed(os.time())
|
||||
local header = {
|
||||
type = "text",
|
||||
type = "text",
|
||||
val = cats[math.random(1, #cats)],
|
||||
opts = {
|
||||
position = "center",
|
||||
hl = "Type",
|
||||
},
|
||||
opts = {
|
||||
position = "center",
|
||||
hl = "Type",
|
||||
},
|
||||
}
|
||||
|
||||
local section_mru = {
|
||||
type = "group",
|
||||
val = {
|
||||
{
|
||||
type = "text",
|
||||
val = "Recent files",
|
||||
opts = {
|
||||
hl = "SpecialComment",
|
||||
shrink_margin = false,
|
||||
position = "center",
|
||||
},
|
||||
},
|
||||
{ type = "padding", val = 1 },
|
||||
{
|
||||
type = "group",
|
||||
val = function()
|
||||
return { mru(0, cdir) }
|
||||
end,
|
||||
opts = { shrink_margin = false },
|
||||
},
|
||||
},
|
||||
type = "group",
|
||||
val = {
|
||||
{
|
||||
type = "text",
|
||||
val = "Recent files",
|
||||
opts = {
|
||||
hl = "SpecialComment",
|
||||
shrink_margin = false,
|
||||
position = "center",
|
||||
},
|
||||
},
|
||||
{ type = "padding", val = 1 },
|
||||
{
|
||||
type = "group",
|
||||
val = function()
|
||||
return { mru(0, cdir) }
|
||||
end,
|
||||
opts = { shrink_margin = false },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
local buttons = {
|
||||
type = "group",
|
||||
val = {
|
||||
{ type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } },
|
||||
{ type = "padding", val = 1 },
|
||||
dashboard.button("e", " New file", "<cmd>ene<CR>"),
|
||||
dashboard.button("SPC f f", " Find file"),
|
||||
dashboard.button("SPC f g", " Live grep"),
|
||||
dashboard.button("SPC p", " Update plugins", "<cmd>PlugUpdate<CR>"),
|
||||
dashboard.button("c", " Configuration", "<cmd>cd ~/.config/nvim/ <CR>"),
|
||||
dashboard.button("q", " Quit", "<cmd>qa<CR>"),
|
||||
},
|
||||
position = "center",
|
||||
type = "group",
|
||||
val = {
|
||||
{ type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } },
|
||||
{ type = "padding", val = 1 },
|
||||
dashboard.button("e", " New file", "<cmd>ene<CR>"),
|
||||
dashboard.button("SPC f f", " Find file"),
|
||||
dashboard.button("SPC f g", " Live grep"),
|
||||
dashboard.button("SPC p", " Update plugins", "<cmd>PlugUpdate<CR>"),
|
||||
dashboard.button("c", " Configuration", "<cmd>cd ~/.config/nvim/ <CR>"),
|
||||
dashboard.button("q", " Quit", "<cmd>qa<CR>"),
|
||||
},
|
||||
position = "center",
|
||||
}
|
||||
|
||||
local config = {
|
||||
layout = {
|
||||
{ type = "padding", val = 2 },
|
||||
header,
|
||||
{ type = "padding", val = 2 },
|
||||
section_mru,
|
||||
{ type = "padding", val = 2 },
|
||||
buttons,
|
||||
},
|
||||
opts = {
|
||||
margin = 5,
|
||||
setup = function()
|
||||
vim.api.nvim_create_autocmd('DirChanged', {
|
||||
pattern = '*',
|
||||
group = "alpha_temp",
|
||||
callback = function () require('alpha').redraw() end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
layout = {
|
||||
{ type = "padding", val = 2 },
|
||||
header,
|
||||
{ type = "padding", val = 2 },
|
||||
section_mru,
|
||||
{ type = "padding", val = 2 },
|
||||
buttons,
|
||||
},
|
||||
opts = {
|
||||
margin = 5,
|
||||
setup = function()
|
||||
vim.api.nvim_create_autocmd('DirChanged', {
|
||||
pattern = '*',
|
||||
group = "alpha_temp",
|
||||
callback = function () require('alpha').redraw() end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
return {
|
||||
header = header,
|
||||
buttons = buttons,
|
||||
mru = mru,
|
||||
config = config,
|
||||
-- theme specific config
|
||||
mru_opts = mru_opts,
|
||||
leader = dashboard.leader,
|
||||
nvim_web_devicons = nvim_web_devicons,
|
||||
header = header,
|
||||
buttons = buttons,
|
||||
mru = mru,
|
||||
config = config,
|
||||
-- theme specific config
|
||||
mru_opts = mru_opts,
|
||||
leader = dashboard.leader,
|
||||
nvim_web_devicons = nvim_web_devicons,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ Plug('ryanoasis/vim-devicons')
|
|||
Plug('SirVer/ultisnips')
|
||||
Plug('honza/vim-snippets')
|
||||
Plug('preservim/nerdcommenter')
|
||||
Plug('neoclide/coc.nvim', { branch = 'release' })
|
||||
Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' })
|
||||
Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
|
||||
Plug('nvim-lua/plenary.nvim')
|
||||
|
|
@ -40,6 +41,5 @@ Plug('folke/todo-comments.nvim')
|
|||
Plug('gbprod/phpactor.nvim')
|
||||
Plug('gleam-lang/gleam.vim')
|
||||
Plug('edluffy/hologram.nvim')
|
||||
Plug('lukas-reineke/virt-column.nvim')
|
||||
|
||||
vim.call('plug#end')
|
||||
|
|
|
|||
|
|
@ -11,11 +11,12 @@ catppuccin.setup({
|
|||
lsp = false
|
||||
},
|
||||
barbecue = {
|
||||
dim_dirname = true, -- directory name is dimmed by default
|
||||
bold_basename = true,
|
||||
dim_context = false,
|
||||
alt_background = false,
|
||||
dim_dirname = true, -- directory name is dimmed by default
|
||||
bold_basename = true,
|
||||
dim_context = false,
|
||||
alt_background = false,
|
||||
},
|
||||
coc_nvim = true,
|
||||
fidget = true,
|
||||
markdown = true,
|
||||
notify = true,
|
||||
|
|
@ -27,12 +28,12 @@ local colorscheme = "catppuccin"
|
|||
local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
|
||||
vim.o.background = "dark" -- or "light" for light mode
|
||||
if not ok then
|
||||
vim.notify("colorscheme " .. colorscheme .. " not found!")
|
||||
return
|
||||
vim.notify("colorscheme " .. colorscheme .. " not found!")
|
||||
return
|
||||
end
|
||||
|
||||
require('lualine').setup {
|
||||
options = {
|
||||
options = {
|
||||
theme = colorscheme,
|
||||
icons_enabled = true,
|
||||
globalstatus = true,
|
||||
|
|
@ -42,9 +43,9 @@ require('lualine').setup {
|
|||
require('todo-comments').setup()
|
||||
|
||||
require('indent-o-matic').setup {
|
||||
max_lines = 2048,
|
||||
standard_widths = { 2, 4, 8 },
|
||||
skip_multiline = true,
|
||||
max_lines = 2048,
|
||||
standard_widths = { 2, 4, 8 },
|
||||
skip_multiline = true,
|
||||
}
|
||||
|
||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
||||
|
|
@ -54,9 +55,9 @@ vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
|
|||
vim.opt.termguicolors = true
|
||||
require("bufferline").setup {}
|
||||
require("fidget").setup {
|
||||
window = {
|
||||
blend = 0,
|
||||
},
|
||||
window = {
|
||||
blend = 0,
|
||||
},
|
||||
}
|
||||
|
||||
local theme = require('menu')
|
||||
|
|
@ -65,8 +66,3 @@ require('alpha').setup(theme.config)
|
|||
require('hologram').setup {
|
||||
auto_display = true
|
||||
}
|
||||
|
||||
require("virt-column").setup {
|
||||
enabled = true,
|
||||
virtcolumn = "80"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,17 +27,17 @@ local function on_attach(bufnr)
|
|||
end
|
||||
|
||||
require("nvim-tree").setup({
|
||||
sort_by = "case_sensitive",
|
||||
view = {
|
||||
sort_by = "case_sensitive",
|
||||
view = {
|
||||
adaptive_size = false,
|
||||
centralize_selection = true,
|
||||
width = 30,
|
||||
side = "left",
|
||||
preserve_window_proportions = false,
|
||||
number = false,
|
||||
relativenumber = false,
|
||||
signcolumn = "yes",
|
||||
float = {
|
||||
centralize_selection = true,
|
||||
width = 30,
|
||||
side = "left",
|
||||
preserve_window_proportions = false,
|
||||
number = false,
|
||||
relativenumber = false,
|
||||
signcolumn = "yes",
|
||||
float = {
|
||||
enable = false,
|
||||
quit_on_focus_loss = true,
|
||||
open_win_config = {
|
||||
|
|
@ -48,23 +48,23 @@ require("nvim-tree").setup({
|
|||
row = 1,
|
||||
col = 1,
|
||||
},
|
||||
},
|
||||
},
|
||||
renderer = {
|
||||
group_empty = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
renderer = {
|
||||
group_empty = true,
|
||||
},
|
||||
actions = {
|
||||
use_system_clipboard = true,
|
||||
change_dir = {
|
||||
enable = true,
|
||||
global = false,
|
||||
global = false,
|
||||
restrict_above_cwd = false,
|
||||
},
|
||||
expand_all = {
|
||||
},
|
||||
expand_all = {
|
||||
max_folder_discovery = 300,
|
||||
exclude = {},
|
||||
},
|
||||
file_popup = {
|
||||
},
|
||||
file_popup = {
|
||||
open_win_config = {
|
||||
col = 1,
|
||||
row = 1,
|
||||
|
|
@ -72,7 +72,7 @@ require("nvim-tree").setup({
|
|||
border = "shadow",
|
||||
style = "minimal",
|
||||
},
|
||||
},
|
||||
},
|
||||
open_file = {
|
||||
window_picker = {
|
||||
enable = false,
|
||||
|
|
@ -86,30 +86,30 @@ require("nvim-tree").setup({
|
|||
},
|
||||
remove_file = {
|
||||
close_window = true,
|
||||
},
|
||||
},
|
||||
|
||||
},
|
||||
tab = {
|
||||
sync = {
|
||||
sync = {
|
||||
open = false,
|
||||
close = false,
|
||||
ignore = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
git = {
|
||||
enable = true,
|
||||
ignore = false,
|
||||
show_on_dirs = true,
|
||||
show_on_open_dirs = true,
|
||||
timeout = 200,
|
||||
},
|
||||
enable = true,
|
||||
ignore = false,
|
||||
show_on_dirs = true,
|
||||
show_on_open_dirs = true,
|
||||
timeout = 200,
|
||||
},
|
||||
filters = {
|
||||
dotfiles = false,
|
||||
git_clean = false,
|
||||
no_buffer = false,
|
||||
custom = { "node_modules", "\\.cache" },
|
||||
exclude = {},
|
||||
},
|
||||
dotfiles = false,
|
||||
git_clean = false,
|
||||
no_buffer = false,
|
||||
custom = { "node_modules", "\\.cache" },
|
||||
exclude = {},
|
||||
},
|
||||
update_cwd = true,
|
||||
respect_buf_cwd = true,
|
||||
update_focused_file = {
|
||||
|
|
|
|||
|
|
@ -11,22 +11,22 @@ local lsps = {
|
|||
};
|
||||
|
||||
require('nvim-treesitter.configs').setup {
|
||||
ensure_installed = lsps,
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
ignore_install = { "javascript" },
|
||||
highlight = {
|
||||
enable = true,
|
||||
disable = function(lang, buf)
|
||||
local max_filesize = 1000 * 1024 -- 1 MiB
|
||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
if ok and stats and stats.size > max_filesize then
|
||||
return true
|
||||
end
|
||||
end,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
}
|
||||
ensure_installed = lsps,
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
ignore_install = { "javascript" },
|
||||
highlight = {
|
||||
enable = true,
|
||||
disable = function(lang, buf)
|
||||
local max_filesize = 1000 * 1024 -- 1 MiB
|
||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
if ok and stats and stats.size > max_filesize then
|
||||
return true
|
||||
end
|
||||
end,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
local set = vim.opt
|
||||
set.tabstop = 8
|
||||
set.softtabstop = 8
|
||||
set.shiftwidth = 8
|
||||
set.expandtab = false
|
||||
set.tabstop = 4
|
||||
set.softtabstop = 4
|
||||
set.shiftwidth = 4
|
||||
--set.noexpandtab = true
|
||||
set.mouse = "a"
|
||||
set.clipboard = "unnamedplus"
|
||||
set.hlsearch = true
|
||||
|
|
@ -22,11 +22,11 @@ vim.filetype.add({
|
|||
})
|
||||
|
||||
vim.api.nvim_create_autocmd({ "BufWritePre" }, {
|
||||
pattern = { "*" },
|
||||
command = [[%s/\s\+$//e]],
|
||||
pattern = { "*" },
|
||||
command = [[%s/\s\+$//e]],
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
|
||||
pattern = { "*.md" },
|
||||
command = 'silent !pandoc % --output=/home/freya/.temp.pdf'
|
||||
pattern = { "*.md" },
|
||||
command = 'silent !pandoc % --output=/home/freya/.temp.pdf'
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,64 +1,31 @@
|
|||
Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
|
||||
Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
|
||||
|
||||
Host shun*
|
||||
HostName shun.freya.cat
|
||||
user freya
|
||||
Host icarus
|
||||
HostName icarus.freya.cat
|
||||
User freya
|
||||
|
||||
Host *.in.freya.cat
|
||||
User root
|
||||
|
||||
Host lenga
|
||||
HostName 10.2.0.8
|
||||
User root
|
||||
Host tardis
|
||||
HostName tardis.freya.cat
|
||||
User freya
|
||||
Port 1111
|
||||
|
||||
Host ospf.lenga*
|
||||
HostName ospf.lenga.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host router.lenga*
|
||||
HostName router.lenga.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host services.lenga*
|
||||
HostName services.lenga.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host plex.lenga*
|
||||
HostName plex.lenga.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host minecraft.lenga*
|
||||
HostName minecraft.lenga.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host tangela*
|
||||
HostName tangela.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host router.tangela*
|
||||
HostName router.tangela.in.freya.cat
|
||||
User root
|
||||
Port 22
|
||||
|
||||
Host stationery
|
||||
HostName stationery.faith
|
||||
User freya
|
||||
|
||||
Host redcom
|
||||
HostName fmurphy-dev.redcom.com
|
||||
User fmurphy
|
||||
|
||||
Host *.cs.rit.edu
|
||||
Host queeg
|
||||
Hostname queeg.cs.rit.edu
|
||||
User tam2214
|
||||
|
||||
Host nitron
|
||||
Hostname nitron.cs.rit.edu
|
||||
User tam2214
|
||||
|
||||
Host github.com
|
||||
Hostname github.com
|
||||
User tam2214
|
||||
IdentityFile /home/freya/.ssh/id_rit
|
||||
|
||||
Host *
|
||||
HostkeyAlgorithms +ssh-rsa
|
||||
PubkeyAcceptedKeyTypes +ssh-rsa
|
||||
KexAlgorithms -sntrup761x25519-sha512@openssh.com
|
||||
|
||||
|
|
|
|||
|
|
@ -27,16 +27,7 @@ export EDITOR=nvim
|
|||
export CC=$(which gcc)
|
||||
export LD=$(which gcc)
|
||||
|
||||
# nvidia
|
||||
#export LIBVA_DRIVER_NAME=nvidia
|
||||
#export GBM_BACKEND=nvidia-drm
|
||||
#export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
#export __NV_PRIME_RENDER_OFFLOAD=1
|
||||
#export __VK_LAYER_NV_optimus=NVIDIA_only
|
||||
|
||||
# nvk
|
||||
#export MESA_LOADER_DRIVER_OVERRIDE=zink
|
||||
#export NOUVEAU_USE_ZINK=1
|
||||
# theming
|
||||
|
||||
# ricing
|
||||
export QT_QPA_PLATFORM_THEME=gtk2
|
||||
|
|
|
|||
|
|
@ -101,17 +101,6 @@ _wine() {
|
|||
alias wine32="_wine 32"
|
||||
alias wine64="_wine 64"
|
||||
|
||||
_winetricks() {
|
||||
export WINEPREFIX="$HOME/.wine$1"
|
||||
export WINEARCH="win$1"
|
||||
/usr/bin/winetricks "${@:2}"
|
||||
unset WINEARCH
|
||||
unset WINEPREFIX
|
||||
}
|
||||
|
||||
alias winetricks32="_winetricks 32"
|
||||
alias winetricks64="_winetricks 64"
|
||||
|
||||
proton() {
|
||||
if [ $# -lt 1 ]; then
|
||||
return
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
|
|
@ -66,7 +65,7 @@
|
|||
(install-file stub (string-append #$output "/libexec"))))
|
||||
(delete 'check)))))
|
||||
(inputs (list libcap python-pyelftools `(,util-linux "lib")))
|
||||
(native-inputs (list libxcrypt gperf pkg-config python-3 python-jinja2))
|
||||
(native-inputs (list gperf pkg-config python-3 python-jinja2))
|
||||
(home-page "https://systemd.io")
|
||||
(synopsis "Unified kernel image UEFI stub")
|
||||
(description "Simple UEFi boot stub that loads a conjoined kernel image and
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages python))
|
||||
|
||||
(define-public cmake-minimal-3.30.0
|
||||
(define-public cmake-minimal-3.27.0
|
||||
(package
|
||||
(inherit cmake-minimal)
|
||||
(name "cmake-minimal")
|
||||
(version "3.30.0")
|
||||
(version "3.27.0")
|
||||
(source (origin
|
||||
(inherit (package-source cmake-minimal))
|
||||
(method url-fetch)
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
"/cmake-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ygmk5wfs00kjx59ackda13049ighgjmyyc0yls4q5aw0pk5nzhm"))))
|
||||
"1f1w9mb868q38nzy145b6q9mc5waf8yi521cwfkd14xr51mxpvda"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments cmake-minimal)
|
||||
((#:configure-flags flags ''())
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
(define-module (freya packages freedesktop)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
|
|
@ -23,18 +22,3 @@
|
|||
(native-inputs
|
||||
(modify-inputs (package-native-inputs libinput)
|
||||
(append python-minimal-wrapper python-pytest)))))
|
||||
|
||||
|
||||
(define-public wayland-1.23.1
|
||||
(package
|
||||
(inherit wayland)
|
||||
(name "wayland")
|
||||
(version "1.23.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gitlab.freedesktop.org/" name
|
||||
"/" name "/-/releases/" version "/downloads/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6"))))))
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
(define-public bluez-new
|
||||
(package
|
||||
(inherit bluez)
|
||||
(version "5.78")
|
||||
(version "5.77")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qy5fc6z1l3fvcqkvyszzz2xr86yzi2nyphgvsw7bly52lcys3w3"))))
|
||||
"04h82lfhxh4vd1pyavk1nfrcxc0z5qg5jmsgal9mh22a3pf2y0sx"))))
|
||||
(arguments (list
|
||||
#:configure-flags
|
||||
#~(list (string-append "--prefix=" #$output)
|
||||
|
|
|
|||
|
|
@ -11,23 +11,31 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|||
index fa58b63d..51ea6cfa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -26,7 +26,6 @@ execute_process(COMMAND ./scripts/generateVersion.sh
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
||||
|
||||
# udis
|
||||
-add_subdirectory("subprojects/udis86")
|
||||
|
||||
if(CMAKE_BUILD_TYPE)
|
||||
string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
|
||||
@@ -85,7 +84,7 @@ if(LEGACY_RENDERER)
|
||||
else()
|
||||
set(GLES_VERSION "GLES3")
|
||||
endif()
|
||||
-find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION})
|
||||
+find_package(OpenGL REQUIRED)
|
||||
|
||||
|
||||
pkg_check_modules(
|
||||
deps
|
||||
@@ -314,7 +313,6 @@ protocolwayland()
|
||||
|
||||
|
||||
# tools
|
||||
add_subdirectory(hyprctl)
|
||||
-add_subdirectory(hyprpm)
|
||||
|
||||
|
||||
# binary and symlink
|
||||
install(TARGETS Hyprland)
|
||||
--
|
||||
--
|
||||
2.45.1
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix packages)
|
||||
|
|
@ -49,8 +48,7 @@
|
|||
(define-public swaylock-effects-new
|
||||
(package
|
||||
(inherit swaylock-effects)
|
||||
(name "swaylock-effects-new")
|
||||
(version "1.7.0.0")
|
||||
(version "1.6.11")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -58,14 +56,15 @@
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj"))))))
|
||||
"0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
|
||||
(inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
|
||||
|
||||
|
||||
(define-public waybar-new
|
||||
(package
|
||||
(inherit waybar)
|
||||
(name "waybar-new")
|
||||
(version "0.11.0")
|
||||
(version "0.10.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -74,7 +73,7 @@
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bw6d3bf8rm4mgrbcprxxljfxbyabbj2lwabk2z19r8lhfz38myy"))))
|
||||
(base32 "0liiyz6212pmyhpsrb6773qf5b9b4kb76nggizygr9abfidbg5gw"))))
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))))
|
||||
|
|
@ -94,7 +93,7 @@
|
|||
(build-system meson-build-system)
|
||||
(native-inputs (list gcc-13
|
||||
pkg-config
|
||||
cmake-minimal-3.30.0
|
||||
cmake-minimal-3.27.0
|
||||
libdrm))
|
||||
(home-page "https://github.com/emersion/libliftoff")
|
||||
(synopsis "Lightweight KMS plane library")
|
||||
|
|
@ -121,7 +120,7 @@
|
|||
(define-public hyprlang
|
||||
(package
|
||||
(name "hyprlang")
|
||||
(version "0.5.3")
|
||||
(version "0.5.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -130,11 +129,9 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02"))))
|
||||
"17i0372yv0fcwnyki36crz7afw8c5f3j985m083p7rjbh4fn3br6"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs (list gcc-13
|
||||
pkg-config))
|
||||
(inputs (list hyprutils))
|
||||
(native-inputs (list gcc-13))
|
||||
(home-page "https://hyprland.org/hyprlang/")
|
||||
(synopsis "Official implementation library for hypr config language")
|
||||
(description
|
||||
|
|
@ -146,7 +143,7 @@ language used in @code{hyprland}.")
|
|||
(define-public hyprcursor
|
||||
(package
|
||||
(name "hyprcursor")
|
||||
(version "0.1.10")
|
||||
(version "0.1.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -155,7 +152,7 @@ language used in @code{hyprland}.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rdn03ln7pqcwp8h4nmi7nc489q8y25dd3v4paq8ykvwzhvs3a1n"))))
|
||||
"0z3ar580n630145nq80qw0p8v0kai6knvhi6nr9z0y1jrb07b0ql"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments (list #:tests? #f))
|
||||
(inputs (list cairo hyprlang librsvg libzip tomlplusplus))
|
||||
|
|
@ -170,7 +167,7 @@ language used in @code{hyprland}.")
|
|||
(define-public hyprland-protocols
|
||||
(package
|
||||
(name "hyprland-protocols")
|
||||
(version "0.4.0")
|
||||
(version "0.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -179,7 +176,7 @@ language used in @code{hyprland}.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0x86w7z3415qvixfhk9a8v5fnbnxdydzx366qz0mpmfg5h86qyha"))))
|
||||
"01j5hc8qnjzqiiwryfawx1wzrhkn0m794knphyc0vsxwkcmjaj8x"))))
|
||||
(build-system meson-build-system)
|
||||
(home-page "https://hyprland.org")
|
||||
(synopsis "Wayland protocol extensions for Hyprland")
|
||||
|
|
@ -195,7 +192,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
|
|||
(define-public hyprwayland-scanner
|
||||
(package
|
||||
(name "hyprwayland-scanner")
|
||||
(version "0.4.2")
|
||||
(version "0.4.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -204,7 +201,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0r7ay4zjkfyr0xd73wz99qhnqjq7nma98gm51wm9lmai4igw90qw"))))
|
||||
"1xc2xcxpq61lg964ihk0wbfzqqvibw20iz09g0p33ym51gwlpxr4"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments (list #:tests? #f))
|
||||
(inputs (list pugixml))
|
||||
|
|
@ -220,7 +217,7 @@ for c++.")
|
|||
(define-public hyprutils
|
||||
(package
|
||||
(name "hyprutils")
|
||||
(version "0.2.3")
|
||||
(version "0.2.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -229,7 +226,7 @@ for c++.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01dh24rf62gb6xm32f7mfv6wx0dxprr1q9y73hvv7xanrjyia2zn"))))
|
||||
"0nxx5yb5k9726x95n8gi27xyxyzwb0ma0nj3czpb51sda1k0hz0g"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments (list #:tests? #f))
|
||||
(native-inputs (list gcc-13 pkg-config))
|
||||
|
|
@ -253,7 +250,7 @@ for c++.")
|
|||
(define-public aquamarine
|
||||
(package
|
||||
(name "aquamarine")
|
||||
(version "0.4.3")
|
||||
(version "0.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -264,7 +261,7 @@ for c++.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0x1zz1ywchs0awkjkvdgskgqnp6pz5lqwmgr8g0zc0i7inhyg1p3"))))
|
||||
"114fspibmrwvzdmzv4xdy000vg7mn9r5vas3pr1ndb9xyl15ja1s"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f))
|
||||
|
|
@ -288,7 +285,7 @@ for c++.")
|
|||
xcb-util-errors
|
||||
xcb-util-keysyms
|
||||
xcb-util-wm
|
||||
wayland-1.23.1
|
||||
wayland
|
||||
wayland-protocols-1.36))
|
||||
(inputs
|
||||
(list hyprutils))
|
||||
|
|
@ -317,7 +314,7 @@ for c++.")
|
|||
(define-public hyprland
|
||||
(package
|
||||
(name "hyprland")
|
||||
(version "0.44.1")
|
||||
(version "0.42.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -334,12 +331,12 @@ for c++.")
|
|||
"subprojects"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "11vw1h9al4jvqprwbrmxvcpxwhvsjj398wbz4flqbnmxa8idvdq1"))))
|
||||
(base32 "1hp2xafvlymikxsi6pr8iik35g46683bg376n9hkjxgh9y6njzqv"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
#:build-type "release"
|
||||
#:cmake cmake-minimal-3.30.0
|
||||
#:cmake cmake-minimal-3.27.0
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-path
|
||||
|
|
@ -379,13 +376,13 @@ for c++.")
|
|||
`("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d")))))))
|
||||
)))
|
||||
(native-inputs
|
||||
(list gcc-14
|
||||
(list gcc-13
|
||||
jq
|
||||
pkg-config
|
||||
hyprwayland-scanner
|
||||
hwdata-for-hyprland))
|
||||
(inputs
|
||||
(list gcc-14
|
||||
(list gcc-13
|
||||
|
||||
cairo
|
||||
pango
|
||||
|
|
@ -521,7 +518,7 @@ mo .")
|
|||
(define-public xdg-desktop-portal-hyprland
|
||||
(package
|
||||
(name "xdg-desktop-portal-hyprland")
|
||||
(version "1.3.6")
|
||||
(version "1.3.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -530,7 +527,7 @@ mo .")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"17ba9jkccyp8gv79ds70khgm5wm6x8zs5m9nkilq4n2j7fsa8cfl"))))
|
||||
"14n4a8b91ili0kp2kjqlw3h57bsxkrjwg5bhlw2h3q93zaxv2b3k"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;No tests
|
||||
|
|
@ -547,13 +544,11 @@ mo .")
|
|||
(native-inputs
|
||||
(list gcc-13
|
||||
pkg-config
|
||||
wayland
|
||||
hyprwayland-scanner))
|
||||
wayland))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
grim
|
||||
hyprland
|
||||
hyprutils
|
||||
hyprland-protocols
|
||||
wayland-protocols-1.36
|
||||
hyprlang
|
||||
|
|
@ -574,40 +569,42 @@ extra portals specific to Hyprland, mostly for window sharing.")
|
|||
|
||||
|
||||
(define-public hyprland-plugin-hy3
|
||||
(package
|
||||
(name "hyprland-plugin-hy3")
|
||||
(version "0.44.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/outfoxxed/hy3.git")
|
||||
(commit (string-append "hl" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"03gxjkn43j85ff8d0hx9nhv5bfwv7vw7m8kacpmajmfnx43mldg9"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
#:cmake cmake-minimal-3.30.0
|
||||
#:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release")))
|
||||
(native-inputs
|
||||
(list gcc-13
|
||||
pkg-config
|
||||
hyprwayland-scanner))
|
||||
(inputs
|
||||
(list gcc-13
|
||||
aquamarine
|
||||
pango
|
||||
gcc-13
|
||||
hyprland-protocols
|
||||
hyprland
|
||||
hyprlang
|
||||
hyprutils
|
||||
libdrm))
|
||||
(license license:gpl3)
|
||||
(home-page "https://github.com/outfoxxed/hy3")
|
||||
(synopsis "i3 / sway like layout for hyprland.")
|
||||
(description "Hyprland plugin for an i3 / sway like manual tiling layout")))
|
||||
(let ((commit "93759c8032995eb566008537389543b3e1b4a65c")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "hyprland-plugin-hy3")
|
||||
(version (git-version "0.42.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/outfoxxed/hy3.git")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0g59zd5724ply38h14r6hafklb8mh0xwb81i0jzzh3xz0r9pmv3s"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
#:cmake cmake-minimal-3.27.0
|
||||
#:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release")))
|
||||
(native-inputs
|
||||
(list gcc-13
|
||||
pkg-config
|
||||
hyprwayland-scanner))
|
||||
(inputs
|
||||
(list gcc-13
|
||||
aquamarine
|
||||
pango
|
||||
gcc-13
|
||||
hyprland-protocols
|
||||
hyprland
|
||||
hyprlang
|
||||
hyprutils
|
||||
libdrm))
|
||||
(license license:gpl3)
|
||||
(home-page "https://github.com/outfoxxed/hy3")
|
||||
(synopsis "i3 / sway like layout for hyprland.")
|
||||
(description "Hyprland plugin for an i3 / sway like manual tiling layout"))))
|
||||
|
||||
|
||||
(define-syntax hyprland-plugin-impl
|
||||
|
|
@ -615,7 +612,7 @@ extra portals specific to Hyprland, mostly for window sharing.")
|
|||
((_ plugin)
|
||||
(package
|
||||
(name (string-append "hyprland-plugin-" plugin))
|
||||
(version "0.44.0")
|
||||
(version "0.42.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -624,12 +621,12 @@ extra portals specific to Hyprland, mostly for window sharing.")
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"0v2zwvrjgc7zg4l8c50934kyq3y5x9f0d34gh3kyh44grfn8w9zx"))
|
||||
"1qzi8c29bam3cj1rngw3gidgphldw7q196iwa9ji5jq071nc1z38"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
#:cmake cmake-minimal-3.30.0
|
||||
#:cmake cmake-minimal-3.27.0
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
|
|
@ -653,34 +650,10 @@ extra portals specific to Hyprland, mostly for window sharing.")
|
|||
(description (string-append "official " plugin " plugin for hyprland"))))))
|
||||
|
||||
|
||||
(define-public hyprland-plugin-borders-plus-plus
|
||||
(hyprland-plugin-impl "borders-plus-plus"))
|
||||
|
||||
|
||||
(define-public hyprland-plugin-csgo-vulkan-fix
|
||||
(hyprland-plugin-impl "csgo-vulkan-fix"))
|
||||
|
||||
|
||||
(define-public hyprland-plugin-hyprbars
|
||||
(hyprland-plugin-impl "hyprbars"))
|
||||
|
||||
|
||||
(define-public hyprland-plugin-hyprexpo
|
||||
(hyprland-plugin-impl "hyprexpo"))
|
||||
|
||||
|
||||
(define-public hyprland-plugin-hyprtrails
|
||||
(hyprland-plugin-impl "hyprtrails"))
|
||||
|
||||
|
||||
(define-public hyprland-plugin-hyprwinwrap
|
||||
(hyprland-plugin-impl "hyprwinwrap"))
|
||||
|
||||
|
||||
(define-public hyprland-plugins
|
||||
(package
|
||||
(name "hyprland-plugins")
|
||||
(version "0.44.0")
|
||||
(version "0.42.0")
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments '(#:builder (begin (mkdir %output) #t)))
|
||||
|
|
@ -688,81 +661,12 @@ extra portals specific to Hyprland, mostly for window sharing.")
|
|||
(home-page "https://github.com/hyprwm/hyprland-plugins")
|
||||
(synopsis "A collection of all the official hyprland plugins")
|
||||
(description "A metapackage containing inputs for each official plugin")
|
||||
(propagated-inputs (list hyprland-plugin-borders-plus-plus
|
||||
hyprland-plugin-csgo-vulkan-fix
|
||||
hyprland-plugin-hyprbars
|
||||
hyprland-plugin-hyprexpo
|
||||
hyprland-plugin-hyprtrails
|
||||
hyprland-plugin-hyprwinwrap))))
|
||||
(propagated-inputs
|
||||
(list (hyprland-plugin-impl "borders-plus-plus")
|
||||
(hyprland-plugin-impl "csgo-vulkan-fix")
|
||||
(hyprland-plugin-impl "hyprbars")
|
||||
(hyprland-plugin-impl "hyprexpo")
|
||||
(hyprland-plugin-impl "hyprtrails")
|
||||
(hyprland-plugin-impl "hyprwinwrap")))))
|
||||
|
||||
|
||||
(define-syntax hyprland-contrib-impl
|
||||
(syntax-rules ()
|
||||
((_ contrib)
|
||||
(package
|
||||
(name (string-append "hyprland-conrib-" contrib))
|
||||
(version "0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hyprwm/contrib.git")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"0ld0sj7ahf9jf8cqzbqkhj3m2w60027ixic24ih26nwy90b5qjwx"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(delete 'check)
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _ (chdir (string-append "../source/" contrib "/"))))
|
||||
(add-after 'chdir 'patch-make
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "Makefile"
|
||||
(("scdoc") (string-append (assoc-ref inputs "scdoc") "/bin/scdoc")))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(invoke "make" "install" (string-append "PREFIX=" (assoc-ref outputs "out")))))
|
||||
)))
|
||||
(native-inputs (list scdoc))
|
||||
(license license:expat)
|
||||
(home-page "https://github.com/hyprwm/contrib")
|
||||
(synopsis (string-append "official " contrib " script for hyprland"))
|
||||
(description (string-append "official " contrib " script for hyprland"))))))
|
||||
|
||||
|
||||
(define-public hyprland-contrib-grimblast
|
||||
(hyprland-contrib-impl "grimblast"))
|
||||
|
||||
|
||||
(define-public hyprland-contrib-hyprprop
|
||||
(hyprland-contrib-impl "hyprprop"))
|
||||
|
||||
|
||||
(define-public hyprland-contrib-scratchpad
|
||||
(hyprland-contrib-impl "scratchpad"))
|
||||
|
||||
|
||||
(define-public hyprland-contrib-shellevents
|
||||
(hyprland-contrib-impl "shellevents"))
|
||||
|
||||
|
||||
(define-public hyprland-contrib
|
||||
(package
|
||||
(name "hyprland-contrib")
|
||||
(version "0.1")
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments '(#:builder (begin (mkdir %output) #t)))
|
||||
(license license:bsd-3)
|
||||
(home-page "https://github.com/hyprwm/contrib")
|
||||
(synopsis "A collection of all the official hyprland contrib scripts")
|
||||
(description "A metapackage containing inputs for each official contrib script")
|
||||
(propagated-inputs (list hyprland-contrib-grimblast
|
||||
hyprland-contrib-hyprprop
|
||||
hyprland-contrib-scratchpad
|
||||
hyprland-contrib-shellevents))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue