freya/dotfiles-guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: freya:01f9c0119a397d7d919f1b6c15cffa735c9dbd7a
Branches Tags
freya:main
...
compare: freya:054f6a8fe77be4dd6f2498d650a2d5f6d4ea0927
Branches Tags
freya:main

4 commits
01f9c0119a ... 054f6a8fe7

Author SHA1 Message Date
Freya Murphy
054f6a8fe7
fix systemd-stub 2024-10-18 00:09:10 -04:00
Freya Murphy
de5b374490
merge dots updates from arch laptop 2024-10-18 00:04:03 -04:00
Freya Murphy
6b4766c893
update channels 2024-10-18 00:03:51 -04:00
Freya Murphy
9ed77c16bb
update wm packages and bluez 2024-10-18 00:03:31 -04:00
22 changed files with 549 additions and 402 deletions
Show stats Expand all files Collapse all files

4
channels.scm
View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(branch "master") (branch "master")
(commit (commit
"de714bcb46d61922e0efc10783ea23fb0202f583") "91dd354a10edbb0d3d4bc3220b671504eda871a7")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(branch "master") (branch "master")
(commit (commit
"57d6d0cd4beb489e045231eb7066073ebe8a0dc5") "e355a2ff675abd48f671a867c211c98707ca1e82")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"

2
home/config/hypr/config.d/keybinds.conf
View file

@ -24,7 +24,7 @@ binde =, XF86AudioPrev, exec, playerctl previous
binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%- binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+ binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard" bind = $mod SHIFT, s, exec, grimblast copy area && 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 = , 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 bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy

1
home/config/hypr/config.d/plugins.conf
View file

@ -1,3 +1,2 @@
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so 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 exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so

12
home/config/hypr/config.d/theme.conf
View file

@ -32,18 +32,6 @@ plugin {
enable = true 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 { decoration {

6
home/config/hypr/monitors.conf
View file

@ -1,4 +1,2 @@
# Generated by nwg-displays on 2024-06-18 at 20:22:23. Do not edit manually. monitor=HDMI-A-1,1920x1080@60.0,0x0,1.0
monitor=DP-2,2560x1440@59.95,1920x0,1.0
monitor=eDP-1,2560x1600@90.0,0x0,1.25
monitor=DP-2,2560x1440@59.95,2048x0,1.0

2
home/config/kitty/kitty.conf
View file

@ -14,7 +14,7 @@ show_hyperlink_targets yes
show_hyperlink_targets no show_hyperlink_targets no
background_opacity 0.85 background_opacity 0.75
window_padding_width 10 window_padding_width 10

44
home/config/nvim/lua/lsp.lua
View file

@ -3,7 +3,6 @@ local lsp = require('lsp-zero').preset('recommended')
require('mason').setup({}) require('mason').setup({})
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
ensure_installed = { ensure_installed = {
'tsserver',
'eslint', 'eslint',
'rust_analyzer', 'rust_analyzer',
'clangd', 'clangd',
@ -15,6 +14,7 @@ require('mason-lspconfig').setup({
'jdtls', 'jdtls',
'bashls', 'bashls',
'lua_ls', 'lua_ls',
'csharp_ls',
}, },
handlers = { handlers = {
lsp.default_setup, lsp.default_setup,
@ -25,10 +25,10 @@ local cmp = require('cmp')
local cmp_select = {behavior = cmp.SelectBehavior.Select} local cmp_select = {behavior = cmp.SelectBehavior.Select}
local cmp_mappings = cmp.mapping.preset.insert({ local cmp_mappings = cmp.mapping.preset.insert({
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-n>'] = cmp.mapping.select_next_item(cmp_select), ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
['<CR>'] = cmp.mapping.confirm({ select = true }), ['<CR>'] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
}) })
cmp_mappings['<Tab>'] = nil cmp_mappings['<Tab>'] = nil
@ -39,13 +39,13 @@ cmp.setup({
}) })
lsp.set_preferences({ lsp.set_preferences({
suggest_lsp_servers = false, suggest_lsp_servers = false,
sign_icons = { sign_icons = {
error = 'E', error = 'E',
warn = 'W', warn = 'W',
hint = 'H', hint = 'H',
info = 'I' info = 'I'
} }
}) })
lsp.on_attach(function(client, bufnr) lsp.on_attach(function(client, bufnr)
@ -53,15 +53,15 @@ lsp.on_attach(function(client, bufnr)
local keymap = vim.keymap.set local keymap = vim.keymap.set
keymap("n", "gd", function() vim.lsp.buf.definition() end, opts) keymap("n", "gd", function() vim.lsp.buf.definition() end, opts)
keymap("n", "K", function() vim.lsp.buf.hover() 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>ls", function() vim.lsp.buf.workspace_symbol() end, opts)
keymap("n", "<leader>lf", function() vim.diagnostic.open_float() 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_next() end, opts)
keymap("n", "]d", function() vim.diagnostic.goto_prev() 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>la", function() vim.lsp.buf.code_action() end, opts)
keymap("n", "<leader>lr", function() vim.lsp.buf.references() 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("n", "<leader>ln", function() vim.lsp.buf.rename() end, opts)
keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts) keymap("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
end) end)
require('lspconfig/prolog_lsp') require('lspconfig/prolog_lsp')
@ -87,7 +87,7 @@ require('phpactor').setup {
} }
vim.diagnostic.config({ vim.diagnostic.config({
virtual_text = true virtual_text = true
}) })
require("neodev").setup() require("neodev").setup()

338
home/config/nvim/lua/menu.lua
View file

@ -1,6 +1,6 @@
local path_ok, plenary_path = pcall(require, "plenary.path") local path_ok, plenary_path = pcall(require, "plenary.path")
if not path_ok then if not path_ok then
return return
end end
local dashboard = require("alpha.themes.dashboard") local dashboard = require("alpha.themes.dashboard")
@ -8,226 +8,226 @@ local cdir = vim.fn.getcwd()
local if_nil = vim.F.if_nil local if_nil = vim.F.if_nil
local nvim_web_devicons = { local nvim_web_devicons = {
enabled = true, enabled = true,
highlight = true, highlight = true,
} }
local function get_extension(fn) local function get_extension(fn)
local match = fn:match("^.+(%..+)$") local match = fn:match("^.+(%..+)$")
local ext = "" local ext = ""
if match ~= nil then if match ~= nil then
ext = match:sub(2) ext = match:sub(2)
end end
return ext return ext
end end
local function icon(fn) local function icon(fn)
local nwd = require("nvim-web-devicons") local nwd = require("nvim-web-devicons")
local ext = get_extension(fn) local ext = get_extension(fn)
return nwd.get_icon(fn, ext, { default = true }) return nwd.get_icon(fn, ext, { default = true })
end end
local function file_button(fn, sc, short_fn,autocd) local function file_button(fn, sc, short_fn,autocd)
short_fn = short_fn or fn short_fn = short_fn or fn
local ico_txt local ico_txt
local fb_hl = {} local fb_hl = {}
if nvim_web_devicons.enabled then if nvim_web_devicons.enabled then
local ico, hl = icon(fn) local ico, hl = icon(fn)
local hl_option_type = type(nvim_web_devicons.highlight) local hl_option_type = type(nvim_web_devicons.highlight)
if hl_option_type == "boolean" then if hl_option_type == "boolean" then
if hl and nvim_web_devicons.highlight then if hl and nvim_web_devicons.highlight then
table.insert(fb_hl, { hl, 0, #ico }) table.insert(fb_hl, { hl, 0, #ico })
end end
end end
if hl_option_type == "string" then if hl_option_type == "string" then
table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico }) table.insert(fb_hl, { nvim_web_devicons.highlight, 0, #ico })
end end
ico_txt = ico .. " " ico_txt = ico .. " "
else else
ico_txt = "" ico_txt = ""
end end
local cd_cmd = (autocd and " | cd %:p:h" or "") 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 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(".*[/\\]") local fn_start = short_fn:match(".*[/\\]")
if fn_start ~= nil then if fn_start ~= nil then
table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt }) table.insert(fb_hl, { "Comment", #ico_txt - 2, #fn_start + #ico_txt })
end end
file_button_el.opts.hl = fb_hl file_button_el.opts.hl = fb_hl
return file_button_el return file_button_el
end end
local default_mru_ignore = { "gitcommit" } local default_mru_ignore = { "gitcommit" }
local mru_opts = { local mru_opts = {
ignore = function(path, ext) ignore = function(path, ext)
return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext)) return (string.find(path, "COMMIT_EDITMSG")) or (vim.tbl_contains(default_mru_ignore, ext))
end, end,
autocd = false autocd = false
} }
--- @param start number --- @param start number
--- @param cwd string? optional --- @param cwd string? optional
--- @param items_number number? optional number of items to generate, default = 10 --- @param items_number number? optional number of items to generate, default = 10
local function mru(start, cwd, items_number, opts) local function mru(start, cwd, items_number, opts)
opts = opts or mru_opts opts = opts or mru_opts
items_number = if_nil(items_number, 10) items_number = if_nil(items_number, 10)
local oldfiles = {} local oldfiles = {}
for _, v in pairs(vim.v.oldfiles) do for _, v in pairs(vim.v.oldfiles) do
if #oldfiles == items_number then if #oldfiles == items_number then
break break
end end
local cwd_cond local cwd_cond
if not cwd then if not cwd then
cwd_cond = true cwd_cond = true
else else
cwd_cond = vim.startswith(v, cwd) cwd_cond = vim.startswith(v, cwd)
end end
local ignore = (opts.ignore and opts.ignore(v, get_extension(v))) or false 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 if (vim.fn.filereadable(v) == 1) and cwd_cond and not ignore then
oldfiles[#oldfiles + 1] = v oldfiles[#oldfiles + 1] = v
end end
end end
local target_width = 35 local target_width = 35
local tbl = {} local tbl = {}
for i, fn in ipairs(oldfiles) do for i, fn in ipairs(oldfiles) do
local short_fn local short_fn
if cwd then if cwd then
short_fn = vim.fn.fnamemodify(fn, ":.") short_fn = vim.fn.fnamemodify(fn, ":.")
else else
short_fn = vim.fn.fnamemodify(fn, ":~") short_fn = vim.fn.fnamemodify(fn, ":~")
end end
if #short_fn > target_width then if #short_fn > target_width then
short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 }) short_fn = plenary_path.new(short_fn):shorten(1, { -2, -1 })
if #short_fn > target_width then if #short_fn > target_width then
short_fn = plenary_path.new(short_fn):shorten(1, { -1 }) short_fn = plenary_path.new(short_fn):shorten(1, { -1 })
end end
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) local file_button_el = file_button(fn, shortcut, short_fn,opts.autocd)
tbl[i] = file_button_el tbl[i] = file_button_el
end end
return { return {
type = "group", type = "group",
val = tbl, val = tbl,
opts = {}, opts = {},
} }
end end
local cats = { local cats = {
{ {
[[ ,-. _,---._ __ / \]], [[ ,-. _,---._ __ / \]],
[[ / ) .-' `./ / \]], [[ / ) .-' `./ / \]],
[[( ( ,' `/ /|]], [[( ( ,' `/ /|]],
[[ \ `-" \'\ / |]], [[ \ `-" \'\ / |]],
[[ `. , \ \ / |]], [[ `. , \ \ / |]],
[[ /`. ,'-`----Y |]], [[ /`. ,'-`----Y |]],
[[ ( ; | ']], [[ ( ; | ']],
[[ | ,-. ,-' | /]], [[ | ,-. ,-' | /]],
[[ | | ( | hjw | /]], [[ | | ( | hjw | /]],
[[ ) | \ `.___________|/]], [[ ) | \ `.___________|/]],
[[ `--' `--']], [[ `--' `--']],
}, },
{ {
[[ _]], [[ _]],
[[ \`*-. ]], [[ \`*-. ]],
[[ ) _`-. ]], [[ ) _`-. ]],
[[ . : `. . ]], [[ . : `. . ]],
[[ : _ ' \ ]], [[ : _ ' \ ]],
[[ ; *` _. `*-._ ]], [[ ; *` _. `*-._ ]],
[[ `-.-' `-. ]], [[ `-.-' `-. ]],
[[ ; ` `. ]], [[ ; ` `. ]],
[[ :. . \ ]], [[ :. . \ ]],
[[ . \ . : .-' . ]], [[ . \ . : .-' . ]],
[[ ' `+.; ; ' : ]], [[ ' `+.; ; ' : ]],
[[ : ' | ; ;-. ]], [[ : ' | ; ;-. ]],
[[ ; ' : :`-: _.`* ;]], [[ ; ' : :`-: _.`* ;]],
[[[bug] .*' / .*' ; .*`- +' `*' ]], [[[bug] .*' / .*' ; .*`- +' `*' ]],
[[ `*-* `*-* `*-*']], [[ `*-* `*-* `*-*']],
}, },
} }
math.randomseed(os.time()) math.randomseed(os.time())
local header = { local header = {
type = "text", type = "text",
val = cats[math.random(1, #cats)], val = cats[math.random(1, #cats)],
opts = { opts = {
position = "center", position = "center",
hl = "Type", hl = "Type",
}, },
} }
local section_mru = { local section_mru = {
type = "group", type = "group",
val = { val = {
{ {
type = "text", type = "text",
val = "Recent files", val = "Recent files",
opts = { opts = {
hl = "SpecialComment", hl = "SpecialComment",
shrink_margin = false, shrink_margin = false,
position = "center", position = "center",
}, },
}, },
{ type = "padding", val = 1 }, { type = "padding", val = 1 },
{ {
type = "group", type = "group",
val = function() val = function()
return { mru(0, cdir) } return { mru(0, cdir) }
end, end,
opts = { shrink_margin = false }, opts = { shrink_margin = false },
}, },
}, },
} }
local buttons = { local buttons = {
type = "group", type = "group",
val = { val = {
{ type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } }, { type = "text", val = "Quick links", opts = { hl = "SpecialComment", position = "center" } },
{ type = "padding", val = 1 }, { type = "padding", val = 1 },
dashboard.button("e", " New file", "<cmd>ene<CR>"), dashboard.button("e", " New file", "<cmd>ene<CR>"),
dashboard.button("SPC f f", "󰈞 Find file"), dashboard.button("SPC f f", "󰈞 Find file"),
dashboard.button("SPC f g", "󰊄 Live grep"), dashboard.button("SPC f g", "󰊄 Live grep"),
dashboard.button("SPC p", " Update plugins", "<cmd>PlugUpdate<CR>"), dashboard.button("SPC p", " Update plugins", "<cmd>PlugUpdate<CR>"),
dashboard.button("c", " Configuration", "<cmd>cd ~/.config/nvim/ <CR>"), dashboard.button("c", " Configuration", "<cmd>cd ~/.config/nvim/ <CR>"),
dashboard.button("q", "󰅚 Quit", "<cmd>qa<CR>"), dashboard.button("q", "󰅚 Quit", "<cmd>qa<CR>"),
}, },
position = "center", position = "center",
} }
local config = { local config = {
layout = { layout = {
{ type = "padding", val = 2 }, { type = "padding", val = 2 },
header, header,
{ type = "padding", val = 2 }, { type = "padding", val = 2 },
section_mru, section_mru,
{ type = "padding", val = 2 }, { type = "padding", val = 2 },
buttons, buttons,
}, },
opts = { opts = {
margin = 5, margin = 5,
setup = function() setup = function()
vim.api.nvim_create_autocmd('DirChanged', { vim.api.nvim_create_autocmd('DirChanged', {
pattern = '*', pattern = '*',
group = "alpha_temp", group = "alpha_temp",
callback = function () require('alpha').redraw() end, callback = function () require('alpha').redraw() end,
}) })
end, end,
}, },
} }
return { return {
header = header, header = header,
buttons = buttons, buttons = buttons,
mru = mru, mru = mru,
config = config, config = config,
-- theme specific config -- theme specific config
mru_opts = mru_opts, mru_opts = mru_opts,
leader = dashboard.leader, leader = dashboard.leader,
nvim_web_devicons = nvim_web_devicons, nvim_web_devicons = nvim_web_devicons,
} }

2
home/config/nvim/lua/plugin.lua
View file

@ -9,7 +9,6 @@ Plug('ryanoasis/vim-devicons')
Plug('SirVer/ultisnips') Plug('SirVer/ultisnips')
Plug('honza/vim-snippets') Plug('honza/vim-snippets')
Plug('preservim/nerdcommenter') Plug('preservim/nerdcommenter')
Plug('neoclide/coc.nvim', { branch = 'release' })
Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' }) Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' })
Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
Plug('nvim-lua/plenary.nvim') Plug('nvim-lua/plenary.nvim')
@ -41,5 +40,6 @@ Plug('folke/todo-comments.nvim')
Plug('gbprod/phpactor.nvim') Plug('gbprod/phpactor.nvim')
Plug('gleam-lang/gleam.vim') Plug('gleam-lang/gleam.vim')
Plug('edluffy/hologram.nvim') Plug('edluffy/hologram.nvim')
Plug('lukas-reineke/virt-column.nvim')
vim.call('plug#end') vim.call('plug#end')

30
home/config/nvim/lua/theme.lua
View file

@ -11,12 +11,11 @@ catppuccin.setup({
lsp = false lsp = false
}, },
barbecue = { barbecue = {
dim_dirname = true, -- directory name is dimmed by default dim_dirname = true, -- directory name is dimmed by default
bold_basename = true, bold_basename = true,
dim_context = false, dim_context = false,
alt_background = false, alt_background = false,
}, },
coc_nvim = true,
fidget = true, fidget = true,
markdown = true, markdown = true,
notify = true, notify = true,
@ -28,8 +27,8 @@ local colorscheme = "catppuccin"
local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
vim.o.background = "dark" -- or "light" for light mode vim.o.background = "dark" -- or "light" for light mode
if not ok then if not ok then
vim.notify("colorscheme " .. colorscheme .. " not found!") vim.notify("colorscheme " .. colorscheme .. " not found!")
return return
end end
require('lualine').setup { require('lualine').setup {
@ -43,9 +42,9 @@ require('lualine').setup {
require('todo-comments').setup() require('todo-comments').setup()
require('indent-o-matic').setup { require('indent-o-matic').setup {
max_lines = 2048, max_lines = 2048,
standard_widths = { 2, 4, 8 }, standard_widths = { 2, 4, 8 },
skip_multiline = true, skip_multiline = true,
} }
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
@ -55,9 +54,9 @@ vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
vim.opt.termguicolors = true vim.opt.termguicolors = true
require("bufferline").setup {} require("bufferline").setup {}
require("fidget").setup { require("fidget").setup {
window = { window = {
blend = 0, blend = 0,
}, },
} }
local theme = require('menu') local theme = require('menu')
@ -66,3 +65,8 @@ require('alpha').setup(theme.config)
require('hologram').setup { require('hologram').setup {
auto_display = true auto_display = true
} }
require("virt-column").setup {
enabled = true,
virtcolumn = "80"
}

74
home/config/nvim/lua/tree.lua
View file

@ -27,17 +27,17 @@ local function on_attach(bufnr)
end end
require("nvim-tree").setup({ require("nvim-tree").setup({
sort_by = "case_sensitive", sort_by = "case_sensitive",
view = { view = {
adaptive_size = false, adaptive_size = false,
centralize_selection = true, centralize_selection = true,
width = 30, width = 30,
side = "left", side = "left",
preserve_window_proportions = false, preserve_window_proportions = false,
number = false, number = false,
relativenumber = false, relativenumber = false,
signcolumn = "yes", signcolumn = "yes",
float = { float = {
enable = false, enable = false,
quit_on_focus_loss = true, quit_on_focus_loss = true,
open_win_config = { open_win_config = {
@ -48,23 +48,23 @@ require("nvim-tree").setup({
row = 1, row = 1,
col = 1, col = 1,
}, },
}, },
}, },
renderer = { renderer = {
group_empty = true, group_empty = true,
}, },
actions = { actions = {
use_system_clipboard = true, use_system_clipboard = true,
change_dir = { change_dir = {
enable = true, enable = true,
global = false, global = false,
restrict_above_cwd = false, restrict_above_cwd = false,
}, },
expand_all = { expand_all = {
max_folder_discovery = 300, max_folder_discovery = 300,
exclude = {}, exclude = {},
}, },
file_popup = { file_popup = {
open_win_config = { open_win_config = {
col = 1, col = 1,
row = 1, row = 1,
@ -72,7 +72,7 @@ require("nvim-tree").setup({
border = "shadow", border = "shadow",
style = "minimal", style = "minimal",
}, },
}, },
open_file = { open_file = {
window_picker = { window_picker = {
enable = false, enable = false,
@ -86,30 +86,30 @@ require("nvim-tree").setup({
}, },
remove_file = { remove_file = {
close_window = true, close_window = true,
}, },
}, },
tab = { tab = {
sync = { sync = {
open = false, open = false,
close = false, close = false,
ignore = {}, ignore = {},
}, },
}, },
git = { git = {
enable = true, enable = true,
ignore = false, ignore = false,
show_on_dirs = true, show_on_dirs = true,
show_on_open_dirs = true, show_on_open_dirs = true,
timeout = 200, timeout = 200,
}, },
filters = { filters = {
dotfiles = false, dotfiles = false,
git_clean = false, git_clean = false,
no_buffer = false, no_buffer = false,
custom = { "node_modules", "\\.cache" }, custom = { "node_modules", "\\.cache" },
exclude = {}, exclude = {},
}, },
update_cwd = true, update_cwd = true,
respect_buf_cwd = true, respect_buf_cwd = true,
update_focused_file = { update_focused_file = {

36
home/config/nvim/lua/treesitter.lua
View file

@ -11,22 +11,22 @@ local lsps = {
}; };
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
ensure_installed = lsps, ensure_installed = lsps,
sync_install = false, sync_install = false,
auto_install = true, auto_install = true,
ignore_install = { "javascript" }, ignore_install = { "javascript" },
highlight = { highlight = {
enable = true, enable = true,
disable = function(lang, buf) disable = function(lang, buf)
local max_filesize = 1000 * 1024 -- 1 MiB local max_filesize = 1000 * 1024 -- 1 MiB
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) 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 if ok and stats and stats.size > max_filesize then
return true return true
end end
end, end,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
}, },
indent = { indent = {
enable = true enable = true
} }
} }

16
home/config/nvim/lua/vimopt.lua
View file

@ -1,8 +1,8 @@
local set = vim.opt local set = vim.opt
set.tabstop = 4 set.tabstop = 8
set.softtabstop = 4 set.softtabstop = 8
set.shiftwidth = 4 set.shiftwidth = 8
--set.noexpandtab = true set.expandtab = false
set.mouse = "a" set.mouse = "a"
set.clipboard = "unnamedplus" set.clipboard = "unnamedplus"
set.hlsearch = true set.hlsearch = true
@ -22,11 +22,11 @@ vim.filetype.add({
}) })
vim.api.nvim_create_autocmd({ "BufWritePre" }, { vim.api.nvim_create_autocmd({ "BufWritePre" }, {
pattern = { "*" }, pattern = { "*" },
command = [[%s/\s\+$//e]], command = [[%s/\s\+$//e]],
}) })
vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.api.nvim_create_autocmd({ "BufWritePost" }, {
pattern = { "*.md" }, pattern = { "*.md" },
command = 'silent !pandoc % --output=/home/freya/.temp.pdf' command = 'silent !pandoc % --output=/home/freya/.temp.pdf'
}) })

69
home/config/ssh/config
View file

@ -1,31 +1,64 @@
Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
Host icarus Host shun*
HostName icarus.freya.cat HostName shun.freya.cat
User freya user freya
Host tardis Host *.in.freya.cat
HostName tardis.freya.cat User root
User freya
Host lenga
HostName 10.2.0.8
User root
Port 1111 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 Host stationery
HostName stationery.faith HostName stationery.faith
User freya User freya
Host queeg Host redcom
Hostname queeg.cs.rit.edu HostName fmurphy-dev.redcom.com
User tam2214 User fmurphy
Host nitron Host *.cs.rit.edu
Hostname nitron.cs.rit.edu
User tam2214 User tam2214
Host github.com
Hostname github.com
User tam2214
IdentityFile /home/freya/.ssh/id_rit
Host * Host *
HostkeyAlgorithms +ssh-rsa
PubkeyAcceptedKeyTypes +ssh-rsa
KexAlgorithms -sntrup761x25519-sha512@openssh.com KexAlgorithms -sntrup761x25519-sha512@openssh.com

11
home/config/zsh/zprofile
View file

@ -27,7 +27,16 @@ export EDITOR=nvim
export CC=$(which gcc) export CC=$(which gcc)
export LD=$(which gcc) export LD=$(which gcc)
# theming # 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
# ricing # ricing
export QT_QPA_PLATFORM_THEME=gtk2 export QT_QPA_PLATFORM_THEME=gtk2

11
home/config/zsh/zshrc
View file

@ -101,6 +101,17 @@ _wine() {
alias wine32="_wine 32" alias wine32="_wine 32"
alias wine64="_wine 64" 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() { proton() {
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
return return

3
modules/freya/packages/bootloaders.scm
View file

@ -4,6 +4,7 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages crypto)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
@ -65,7 +66,7 @@
(install-file stub (string-append #$output "/libexec")))) (install-file stub (string-append #$output "/libexec"))))
(delete 'check))))) (delete 'check)))))
(inputs (list libcap python-pyelftools `(,util-linux "lib"))) (inputs (list libcap python-pyelftools `(,util-linux "lib")))
(native-inputs (list gperf pkg-config python-3 python-jinja2)) (native-inputs (list libxcrypt gperf pkg-config python-3 python-jinja2))
(home-page "https://systemd.io") (home-page "https://systemd.io")
(synopsis "Unified kernel image UEFI stub") (synopsis "Unified kernel image UEFI stub")
(description "Simple UEFi boot stub that loads a conjoined kernel image and (description "Simple UEFi boot stub that loads a conjoined kernel image and

6
modules/freya/packages/cmake.scm
View file

@ -8,11 +8,11 @@
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages python)) #:use-module (gnu packages python))
(define-public cmake-minimal-3.27.0 (define-public cmake-minimal-3.30.0
(package (package
(inherit cmake-minimal) (inherit cmake-minimal)
(name "cmake-minimal") (name "cmake-minimal")
(version "3.27.0") (version "3.30.0")
(source (origin (source (origin
(inherit (package-source cmake-minimal)) (inherit (package-source cmake-minimal))
(method url-fetch) (method url-fetch)
@ -21,7 +21,7 @@
"/cmake-" version ".tar.gz")) "/cmake-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1f1w9mb868q38nzy145b6q9mc5waf8yi521cwfkd14xr51mxpvda")))) "0ygmk5wfs00kjx59ackda13049ighgjmyyc0yls4q5aw0pk5nzhm"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments cmake-minimal) (substitute-keyword-arguments (package-arguments cmake-minimal)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())

16
modules/freya/packages/freedesktop.scm
View file

@ -1,5 +1,6 @@
(define-module (freya packages freedesktop) (define-module (freya packages freedesktop)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -22,3 +23,18 @@
(native-inputs (native-inputs
(modify-inputs (package-native-inputs libinput) (modify-inputs (package-native-inputs libinput)
(append python-minimal-wrapper python-pytest))))) (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"))))))

4
modules/freya/packages/linux.scm
View file

@ -12,7 +12,7 @@
(define-public bluez-new (define-public bluez-new
(package (package
(inherit bluez) (inherit bluez)
(version "5.77") (version "5.78")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -21,7 +21,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"04h82lfhxh4vd1pyavk1nfrcxc0z5qg5jmsgal9mh22a3pf2y0sx")))) "1qy5fc6z1l3fvcqkvyszzz2xr86yzi2nyphgvsw7bly52lcys3w3"))))
(arguments (list (arguments (list
#:configure-flags #:configure-flags
#~(list (string-append "--prefix=" #$output) #~(list (string-append "--prefix=" #$output)

8
modules/freya/packages/patches/hyprland-fix-cmake.patch
View file

@ -11,14 +11,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa58b63d..51ea6cfa 100644 index fa58b63d..51ea6cfa 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/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) @@ -85,7 +84,7 @@ if(LEGACY_RENDERER)
else() else()
set(GLES_VERSION "GLES3") set(GLES_VERSION "GLES3")

246
modules/freya/packages/wm.scm
View file

@ -25,6 +25,7 @@
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages man)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
@ -48,7 +49,8 @@
(define-public swaylock-effects-new (define-public swaylock-effects-new
(package (package
(inherit swaylock-effects) (inherit swaylock-effects)
(version "1.6.11") (name "swaylock-effects-new")
(version "1.7.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -56,15 +58,14 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) "0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj"))))))
(inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
(define-public waybar-new (define-public waybar-new
(package (package
(inherit waybar) (inherit waybar)
(name "waybar-new") (name "waybar-new")
(version "0.10.4") (version "0.11.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -73,7 +74,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0liiyz6212pmyhpsrb6773qf5b9b4kb76nggizygr9abfidbg5gw")))) (base32 "1bw6d3bf8rm4mgrbcprxxljfxbyabbj2lwabk2z19r8lhfz38myy"))))
(arguments (arguments
(list (list
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true"))))) #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))))
@ -93,7 +94,7 @@
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list gcc-13 (native-inputs (list gcc-13
pkg-config pkg-config
cmake-minimal-3.27.0 cmake-minimal-3.30.0
libdrm)) libdrm))
(home-page "https://github.com/emersion/libliftoff") (home-page "https://github.com/emersion/libliftoff")
(synopsis "Lightweight KMS plane library") (synopsis "Lightweight KMS plane library")
@ -120,7 +121,7 @@
(define-public hyprlang (define-public hyprlang
(package (package
(name "hyprlang") (name "hyprlang")
(version "0.5.2") (version "0.5.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -129,9 +130,11 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"17i0372yv0fcwnyki36crz7afw8c5f3j985m083p7rjbh4fn3br6")))) "0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (list gcc-13)) (native-inputs (list gcc-13
pkg-config))
(inputs (list hyprutils))
(home-page "https://hyprland.org/hyprlang/") (home-page "https://hyprland.org/hyprlang/")
(synopsis "Official implementation library for hypr config language") (synopsis "Official implementation library for hypr config language")
(description (description
@ -143,7 +146,7 @@ language used in @code{hyprland}.")
(define-public hyprcursor (define-public hyprcursor
(package (package
(name "hyprcursor") (name "hyprcursor")
(version "0.1.9") (version "0.1.10")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -152,7 +155,7 @@ language used in @code{hyprland}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0z3ar580n630145nq80qw0p8v0kai6knvhi6nr9z0y1jrb07b0ql")))) "1rdn03ln7pqcwp8h4nmi7nc489q8y25dd3v4paq8ykvwzhvs3a1n"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(inputs (list cairo hyprlang librsvg libzip tomlplusplus)) (inputs (list cairo hyprlang librsvg libzip tomlplusplus))
@ -167,7 +170,7 @@ language used in @code{hyprland}.")
(define-public hyprland-protocols (define-public hyprland-protocols
(package (package
(name "hyprland-protocols") (name "hyprland-protocols")
(version "0.3.0") (version "0.4.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -176,7 +179,7 @@ language used in @code{hyprland}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01j5hc8qnjzqiiwryfawx1wzrhkn0m794knphyc0vsxwkcmjaj8x")))) "0x86w7z3415qvixfhk9a8v5fnbnxdydzx366qz0mpmfg5h86qyha"))))
(build-system meson-build-system) (build-system meson-build-system)
(home-page "https://hyprland.org") (home-page "https://hyprland.org")
(synopsis "Wayland protocol extensions for Hyprland") (synopsis "Wayland protocol extensions for Hyprland")
@ -192,7 +195,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(define-public hyprwayland-scanner (define-public hyprwayland-scanner
(package (package
(name "hyprwayland-scanner") (name "hyprwayland-scanner")
(version "0.4.0") (version "0.4.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -201,7 +204,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1xc2xcxpq61lg964ihk0wbfzqqvibw20iz09g0p33ym51gwlpxr4")))) "0r7ay4zjkfyr0xd73wz99qhnqjq7nma98gm51wm9lmai4igw90qw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(inputs (list pugixml)) (inputs (list pugixml))
@ -217,7 +220,7 @@ for c++.")
(define-public hyprutils (define-public hyprutils
(package (package
(name "hyprutils") (name "hyprutils")
(version "0.2.1") (version "0.2.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -226,7 +229,7 @@ for c++.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0nxx5yb5k9726x95n8gi27xyxyzwb0ma0nj3czpb51sda1k0hz0g")))) "01dh24rf62gb6xm32f7mfv6wx0dxprr1q9y73hvv7xanrjyia2zn"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(native-inputs (list gcc-13 pkg-config)) (native-inputs (list gcc-13 pkg-config))
@ -250,7 +253,7 @@ for c++.")
(define-public aquamarine (define-public aquamarine
(package (package
(name "aquamarine") (name "aquamarine")
(version "0.3.0") (version "0.4.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -261,7 +264,7 @@ for c++.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"114fspibmrwvzdmzv4xdy000vg7mn9r5vas3pr1ndb9xyl15ja1s")))) "0x1zz1ywchs0awkjkvdgskgqnp6pz5lqwmgr8g0zc0i7inhyg1p3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f)) (list #:tests? #f))
@ -285,7 +288,7 @@ for c++.")
xcb-util-errors xcb-util-errors
xcb-util-keysyms xcb-util-keysyms
xcb-util-wm xcb-util-wm
wayland wayland-1.23.1
wayland-protocols-1.36)) wayland-protocols-1.36))
(inputs (inputs
(list hyprutils)) (list hyprutils))
@ -314,7 +317,7 @@ for c++.")
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.42.0") (version "0.44.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -331,12 +334,12 @@ for c++.")
"subprojects")))) "subprojects"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1hp2xafvlymikxsi6pr8iik35g46683bg376n9hkjxgh9y6njzqv")))) (base32 "11vw1h9al4jvqprwbrmxvcpxwhvsjj398wbz4flqbnmxa8idvdq1"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
#:build-type "release" #:build-type "release"
#:cmake cmake-minimal-3.27.0 #:cmake cmake-minimal-3.30.0
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-path (add-after 'unpack 'fix-path
@ -376,13 +379,13 @@ for c++.")
`("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))) `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d")))))))
))) )))
(native-inputs (native-inputs
(list gcc-13 (list gcc-14
jq jq
pkg-config pkg-config
hyprwayland-scanner hyprwayland-scanner
hwdata-for-hyprland)) hwdata-for-hyprland))
(inputs (inputs
(list gcc-13 (list gcc-14
cairo cairo
pango pango
@ -518,7 +521,7 @@ mo .")
(define-public xdg-desktop-portal-hyprland (define-public xdg-desktop-portal-hyprland
(package (package
(name "xdg-desktop-portal-hyprland") (name "xdg-desktop-portal-hyprland")
(version "1.3.3") (version "1.3.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -527,7 +530,7 @@ mo .")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14n4a8b91ili0kp2kjqlw3h57bsxkrjwg5bhlw2h3q93zaxv2b3k")))) "17ba9jkccyp8gv79ds70khgm5wm6x8zs5m9nkilq4n2j7fsa8cfl"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f ;No tests (list #:tests? #f ;No tests
@ -544,11 +547,13 @@ mo .")
(native-inputs (native-inputs
(list gcc-13 (list gcc-13
pkg-config pkg-config
wayland)) wayland
hyprwayland-scanner))
(inputs (inputs
(list bash-minimal (list bash-minimal
grim grim
hyprland hyprland
hyprutils
hyprland-protocols hyprland-protocols
wayland-protocols-1.36 wayland-protocols-1.36
hyprlang hyprlang
@ -569,42 +574,40 @@ extra portals specific to Hyprland, mostly for window sharing.")
(define-public hyprland-plugin-hy3 (define-public hyprland-plugin-hy3
(let ((commit "93759c8032995eb566008537389543b3e1b4a65c") (package
(revision "1")) (name "hyprland-plugin-hy3")
(package (version "0.44.0")
(name "hyprland-plugin-hy3") (source (origin
(version (git-version "0.42.0" revision commit)) (method git-fetch)
(source (origin (uri (git-reference
(method git-fetch) (url "https://github.com/outfoxxed/hy3.git")
(uri (git-reference (commit (string-append "hl" version))))
(url "https://github.com/outfoxxed/hy3.git") (sha256
(commit commit))) (base32
(sha256 "03gxjkn43j85ff8d0hx9nhv5bfwv7vw7m8kacpmajmfnx43mldg9"))))
(base32 (build-system cmake-build-system)
"0g59zd5724ply38h14r6hafklb8mh0xwb81i0jzzh3xz0r9pmv3s")))) (arguments
(build-system cmake-build-system) (list #:tests? #f
(arguments #:cmake cmake-minimal-3.30.0
(list #:tests? #f #:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release")))
#:cmake cmake-minimal-3.27.0 (native-inputs
#:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release"))) (list gcc-13
(native-inputs pkg-config
(list gcc-13 hyprwayland-scanner))
pkg-config (inputs
hyprwayland-scanner)) (list gcc-13
(inputs aquamarine
(list gcc-13 pango
aquamarine gcc-13
pango hyprland-protocols
gcc-13 hyprland
hyprland-protocols hyprlang
hyprland hyprutils
hyprlang libdrm))
hyprutils (license license:gpl3)
libdrm)) (home-page "https://github.com/outfoxxed/hy3")
(license license:gpl3) (synopsis "i3 / sway like layout for hyprland.")
(home-page "https://github.com/outfoxxed/hy3") (description "Hyprland plugin for an i3 / sway like manual tiling layout")))
(synopsis "i3 / sway like layout for hyprland.")
(description "Hyprland plugin for an i3 / sway like manual tiling layout"))))
(define-syntax hyprland-plugin-impl (define-syntax hyprland-plugin-impl
@ -612,7 +615,7 @@ extra portals specific to Hyprland, mostly for window sharing.")
((_ plugin) ((_ plugin)
(package (package
(name (string-append "hyprland-plugin-" plugin)) (name (string-append "hyprland-plugin-" plugin))
(version "0.42.0") (version "0.44.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -621,12 +624,12 @@ extra portals specific to Hyprland, mostly for window sharing.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1qzi8c29bam3cj1rngw3gidgphldw7q196iwa9ji5jq071nc1z38")) "0v2zwvrjgc7zg4l8c50934kyq3y5x9f0d34gh3kyh44grfn8w9zx"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
#:cmake cmake-minimal-3.27.0 #:cmake cmake-minimal-3.30.0
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
@ -650,10 +653,34 @@ extra portals specific to Hyprland, mostly for window sharing.")
(description (string-append "official " plugin " plugin for hyprland")))))) (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 (define-public hyprland-plugins
(package (package
(name "hyprland-plugins") (name "hyprland-plugins")
(version "0.42.0") (version "0.44.0")
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments '(#:builder (begin (mkdir %output) #t))) (arguments '(#:builder (begin (mkdir %output) #t)))
@ -661,12 +688,81 @@ extra portals specific to Hyprland, mostly for window sharing.")
(home-page "https://github.com/hyprwm/hyprland-plugins") (home-page "https://github.com/hyprwm/hyprland-plugins")
(synopsis "A collection of all the official hyprland plugins") (synopsis "A collection of all the official hyprland plugins")
(description "A metapackage containing inputs for each official plugin") (description "A metapackage containing inputs for each official plugin")
(propagated-inputs (propagated-inputs (list hyprland-plugin-borders-plus-plus
(list (hyprland-plugin-impl "borders-plus-plus") hyprland-plugin-csgo-vulkan-fix
(hyprland-plugin-impl "csgo-vulkan-fix") hyprland-plugin-hyprbars
(hyprland-plugin-impl "hyprbars") hyprland-plugin-hyprexpo
(hyprland-plugin-impl "hyprexpo") hyprland-plugin-hyprtrails
(hyprland-plugin-impl "hyprtrails") hyprland-plugin-hyprwinwrap))))
(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))))