muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2026-03-08 03:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: muon:83f52717dfe1f6c97ae7a4b6bc5c176e98342f37
Branches Tags
muon:main
muon:homelab
muon:vps
muon:container
muon:fresh
muon:i3
muon:hyprland
muon:refactor
muon:legacy
..
compare: muon:b5fe71789261fdf81941ee41e71f75a68772ff7d
Branches Tags
muon:main
muon:homelab
muon:vps
muon:container
muon:fresh
muon:i3
muon:hyprland
muon:refactor
muon:legacy

4 commits
83f52717df ... b5fe717892

Author SHA1 Message Date
muon
b5fe717892 Update nvf 2026-01-05 10:57:34 +00:00
muon
9124f817d5 Fix nvim 2026-01-05 10:53:12 +00:00
muon
8c9be91500 Update nix 2026-01-05 10:06:32 +00:00
muon
ad776465cd Add new options to murk 2026-01-05 10:04:41 +00:00
4 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

76
flake.lock generated
View file

@ -233,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766553851, "lastModified": 1767606757,
"narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=", "narHash": "sha256-lCl9QyHHHG/lKkpZu9nhJ5ri30FUD66VWNMJp167wPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7eca7f7081036a7b740090994c9ec543927f89a7", "rev": "c4eabb884b01366f25c3f80823b12dd595ed603a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765682243, "lastModified": 1767104570,
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,7 +299,10 @@
}, },
"ndg": { "ndg": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": [
"nvf",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1765720983, "lastModified": 1765720983,
@ -410,11 +413,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1766309749, "lastModified": 1767379071,
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,27 +429,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1766651565,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -493,15 +480,16 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1766596669, "lastModified": 1767502401,
"narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=", "narHash": "sha256-5XJhFSzF5KAfHN9roSR0B/mIhogkM0kehrdI/NNBGVQ=",
"owner": "NotAShelf", "owner": "thamenato",
"repo": "nvf", "repo": "nvf",
"rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd", "rev": "3e372f0c2a09673c686605b9f69e337b9ad7d6a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NotAShelf", "owner": "thamenato",
"ref": "fix-nvim-treesitter",
"repo": "nvf", "repo": "nvf",
"type": "github" "type": "github"
} }
@ -527,11 +515,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766289575, "lastModified": 1767499857,
"narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "9836912e37aef546029e48c8749834735a6b9dad", "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -570,7 +558,7 @@
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nur": "nur", "nur": "nur",
"systems": "systems_3", "systems": "systems_3",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
@ -580,11 +568,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1766603026, "lastModified": 1767559556,
"narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "narHash": "sha256-Pf1d9Hh9UUQ/oS+evq6dU0MiaDczXXNztTlQekaMbW0=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "rev": "b135edbdd403896d1ef507934c045f716deb5609",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,11 +736,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766614843, "lastModified": 1767568852,
"narHash": "sha256-upUQfQv7Xiy5IZzfsVOL0lH4A/wuUQjG2jlzmBmVuwU=", "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "b01d17acbec3d1b76fecf500289d8509da202585", "rev": "350c729b261e6f5529460140a5f0943dd4c5e156",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -14,7 +14,8 @@
nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.url = "github:thiagokokada/nix-alien";
nvf = { nvf = {
url = "github:NotAShelf/nvf"; # url = "github:NotAShelf/nvf";
url = "github:thamenato/nvf/fix-nvim-treesitter";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
hosts/murk/home.nix
View file

@ -21,6 +21,8 @@ in {
mods.terminal.tools.enable = true; mods.terminal.tools.enable = true;
mods.desktop.development.enable = true; mods.desktop.development.enable = true;
mods.desktop.productivity.enable = false; mods.desktop.productivity.enable = false;
mods.zen.enable = true;
mods.obsidian.enable = true;
home.packages = with pkgs; home.packages = with pkgs;
[ [

12
modules/home/terminal/nvim/default.nix
View file

@ -50,12 +50,10 @@
languages = { languages = {
enableFormat = true; enableFormat = true;
enableTreesitter = true; # enableTreesitter = true;
enableExtraDiagnostics = true; enableExtraDiagnostics = true;
nix.enable = true; nix.enable = true;
nix.lsp.servers = ["nixd"];
markdown.enable = true; markdown.enable = true;
bash.enable = true; bash.enable = true;
rust.enable = true; rust.enable = true;
@ -63,7 +61,6 @@
python = { python = {
enable = true; enable = true;
lsp.servers = ["pyright"];
format.type = ["ruff" "black"]; format.type = ["ruff" "black"];
}; };
@ -73,12 +70,17 @@
}; };
}; };
treesitter = {
enable = true;
context.enable = true;
};
statusline.lualine.enable = true; statusline.lualine.enable = true;
telescope.enable = true; telescope.enable = true;
autocomplete.nvim-cmp.enable = true; autocomplete.nvim-cmp.enable = true;
autopairs.nvim-autopairs.enable = true; autopairs.nvim-autopairs.enable = true;
tabline.nvimBufferline.enable = true; tabline.nvimBufferline.enable = true;
treesitter.context.enable = true; # treesitter.context.enable = true;
comments.comment-nvim.enable = true; comments.comment-nvim.enable = true;
notes.todo-comments.enable = true; notes.todo-comments.enable = true;