Compare commits

...

6 commits

9 changed files with 141 additions and 67 deletions

View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736102453, "lastModified": 1738183445,
"narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "4846091641f3be0ad7542086d52769bb7932bde6", "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737075266, "lastModified": 1738200030,
"narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", "narHash": "sha256-z2DVxun8fEH0yeVIyfL68hXht+k2h3vEwNVxJPOMCgU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "rev": "86a0d627cae02e8cc5d29eeb03de97f8c652a4bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906540, "lastModified": 1738178255,
"narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736115290, "lastModified": 1738018829,
"narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1737038559, "lastModified": 1738192585,
"narHash": "sha256-irqN8zKwpQ0NFxEvV/wQRdopClwkyZXCQoF7mgX/Uss=", "narHash": "sha256-bhlT5u8SHc10eFA695klLlKOm3Wb6um1bxuSgp3D5TU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", "rev": "d462cc7fa166e1e6a6f14b58a2dd1e8b92e15426",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,11 +246,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774328, "lastModified": 1737556638,
"narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,10 +259,49 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-qt-support": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"systems"
]
},
"locked": {
"lastModified": 1737634706,
"narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "8810df502cdee755993cb803eba7b23f189db795",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprland-qtutils": { "hyprland-qtutils": {
"inputs": { "inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [ "hyprutils": [
"hyprland", "hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils" "hyprutils"
], ],
"nixpkgs": [ "nixpkgs": [
@ -275,11 +314,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736114838, "lastModified": 1737981711,
"narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +343,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735393019, "lastModified": 1737634606,
"narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +368,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736164519, "lastModified": 1737978343,
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3c895da64b0eb19870142196fa48c07090b441c4", "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +455,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1737885589,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,11 +471,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1738142207,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +495,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735882644, "lastModified": 1737465171,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -484,14 +523,15 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1737087380, "lastModified": 1738099675,
"narHash": "sha256-T3WB7rwWDT8cWrwLR7fRRZ1gkgbk3A3dzefEfuGdMxk=", "narHash": "sha256-q1oixDeEvoKm8t7Fr6vEGnv4sb8vRXCa6rF6YWIbGmk=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "6510ffbf4e3f9116923632da1e63e9a959d8aa94", "rev": "2f0cc0c110c25804cd2f6c167ab66f567941452c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,6 +570,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -576,11 +631,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734907020, "lastModified": 1737634991,
"narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -387,9 +387,9 @@ in
windowrulev2 = noborder, tag:gw2 windowrulev2 = noborder, tag:gw2
# Rules for godot # Rules for godot
windowrulev2 = size 50%, 50%, class:^(Godot)$, title:^Create New Node$ windowrulev2 = tag +godot, class:^(Godot)$, title:^(.+)$
windowrulev2 = size 50%, 50%, class:^(Godot)$, title:^Open a File$ windowrulev2 = center, tag:godot
windowrulev2 = size 50%, 50%, class:^(Godot)$, title:^Project Settings windowrulev2 = size 50% 50%, tag:godot
''; '';
}; };
} }

View file

@ -95,8 +95,10 @@ in
marksman marksman
# Nix # Nix
deadnix
nixd nixd
nixfmt-rfc-style nixfmt-rfc-style
statix
# Python # Python
basedpyright basedpyright

View file

@ -26,7 +26,6 @@ return {
{ import = "astrocommunity.pack.json" }, { import = "astrocommunity.pack.json" },
{ import = "astrocommunity.pack.lua" }, { import = "astrocommunity.pack.lua" },
{ import = "astrocommunity.pack.markdown" }, { import = "astrocommunity.pack.markdown" },
{ import = "astrocommunity.pack.nix" },
{ import = "astrocommunity.pack.rust" }, { import = "astrocommunity.pack.rust" },
{ import = "astrocommunity.pack.toml" }, { import = "astrocommunity.pack.toml" },
{ import = "astrocommunity.pack.typescript-all-in-one" }, { import = "astrocommunity.pack.typescript-all-in-one" },

View file

@ -11,11 +11,11 @@ return {
-- Configure core features of AstroNvim -- Configure core features of AstroNvim
features = { features = {
large_buf = { size = 1024 * 500, lines = 10000 }, -- set global limits for large files for disabling features like treesitter large_buf = { size = 1024 * 500, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
autopairs = true, -- enable autopairs at start autopairs = true, -- enable autopairs at start
cmp = true, -- enable completion at start cmp = true, -- enable completion at start
diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on) diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on)
highlighturl = true, -- highlight URLs at start highlighturl = true, -- highlight URLs at start
notifications = true, -- enable notifications at start notifications = true, -- enable notifications at start
}, },
-- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on
diagnostics = { diagnostics = {
@ -24,20 +24,20 @@ return {
}, },
-- vim options can be configured here -- vim options can be configured here
options = { options = {
opt = { -- vim.opt.<key> opt = { -- vim.opt.<key>
autoindent = true, -- indents automatically based on context autoindent = true, -- indents automatically based on context
expandtab = true, -- use spaces instead of tabs expandtab = true, -- use spaces instead of tabs
grepprg = "rg --vimgrep", -- use ripgrep on grep actions grepprg = "rg --vimgrep", -- use ripgrep on grep actions
number = true, -- sets vim.opt.number number = true, -- sets vim.opt.number
relativenumber = true, -- sets vim.opt.relativenumber relativenumber = true, -- sets vim.opt.relativenumber
shiftwidth = 2, -- how many spaces after indentation shiftwidth = 2, -- how many spaces after indentation
signcolumn = "auto", -- sets vim.opt.signcolumn to auto signcolumn = "auto", -- sets vim.opt.signcolumn to auto
smartindent = true, -- smartly indent smartindent = true, -- smartly indent
spell = false, -- sets vim.opt.spell spell = false, -- sets vim.opt.spell
tabstop = 2, -- how many spaces to indent when pressing tab tabstop = 2, -- how many spaces to indent when pressing tab
wrap = false, -- sets vim.opt.wrap wrap = false, -- sets vim.opt.wrap
}, },
g = { -- vim.g.<key> g = { -- vim.g.<key>
-- configure global vim variables (vim.g) -- configure global vim variables (vim.g)
-- NOTE: `mapleader` and `maplocalleader` must be set in the AstroNvim opts or before `lazy.setup` -- NOTE: `mapleader` and `maplocalleader` must be set in the AstroNvim opts or before `lazy.setup`
-- This can be found in the `lua/lazy_setup.lua` file -- This can be found in the `lua/lazy_setup.lua` file

View file

@ -42,7 +42,7 @@ return {
-- Check supported formatters and linters -- Check supported formatters and linters
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
-- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
config.sources = { config.sources = require("astrocore").list_insert_unique(config.sources, {
-- Set a formatter -- Set a formatter
require("none-ls.diagnostics.flake8"), require("none-ls.diagnostics.flake8"),
require("none-ls.formatting.ruff"), require("none-ls.formatting.ruff"),
@ -54,7 +54,11 @@ return {
null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.stylua,
--deno_fmt, --deno_fmt,
null_ls.builtins.formatting.prettierd, null_ls.builtins.formatting.prettierd,
}
null_ls.builtins.code_actions.statix,
null_ls.builtins.diagnostics.deadnix,
})
return config -- return final config table return config -- return final config table
end, end,
} }

View file

@ -0,0 +1,11 @@
return {
{
"mfussenegger/nvim-lint",
optional = true,
opts = {
linters_by_ft = {
nix = { "statix", "deadnix" },
},
},
},
}

View file

@ -3,7 +3,6 @@
{ {
# Enable sound with pipewire. # Enable sound with pipewire.
services.pulseaudio.enable = false; services.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
audio.enable = true; audio.enable = true;

View file

@ -80,8 +80,12 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
# Games
pcsx2 pcsx2
# Creative work
easyeffects
# Create an FHS environment using the command `fhs`, enabling the execution of non-NixOS packages in NixOS! # Create an FHS environment using the command `fhs`, enabling the execution of non-NixOS packages in NixOS!
( (
let let