Theaninova/TheaninovOS
1
0
Fork 0
mirror of https://github.com/Theaninova/TheaninovOS.git synced 2025-12-12 11:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: stuff

Browse Source
This commit is contained in:
Thea Schöbl
2024-06-10 19:08:43 +02:00
parent b801064f84
commit d18b3d1683
11 changed files with 154 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
flake.lock generated
View File

@@ -5,14 +5,15 @@
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
],
"systems": "systems"
},
"locked": {
"lastModified": 1713259062,
"narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=",
"lastModified": 1717576207,
"narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=",
"owner": "Kirottu",
"repo": "anyrun",
"rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39",
"rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4",
"type": "github"
},
"original": {
@@ -30,11 +31,11 @@
]
},
"locked": {
"lastModified": 1713532798,
"narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"owner": "numtide",
"repo": "devshell",
"rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"type": "github"
},
"original": {
@@ -81,11 +82,11 @@
]
},
"locked": {
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@@ -102,11 +103,11 @@
]
},
"locked": {
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@@ -115,24 +116,9 @@
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
@@ -148,11 +134,38 @@
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717664902,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"pre-commit-hooks",
"git-hooks",
"nixpkgs"
]
},
@@ -177,11 +190,11 @@
]
},
"locked": {
"lastModified": 1716457508,
"narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"type": "github"
},
"original": {
@@ -198,11 +211,11 @@
]
},
"locked": {
"lastModified": 1716448020,
"narHash": "sha256-u1ddoBOILtLVX4NYzqSZ9Qaqusql1M4reLd1fs554hY=",
"lastModified": 1717525419,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "25dedb0d52c20448f6a63cc346df1adbd6ef417e",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
"type": "github"
},
"original": {
@@ -214,7 +227,7 @@
"matugen": {
"inputs": {
"nixpkgs": "nixpkgs",
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1716548249,
@@ -239,11 +252,11 @@
]
},
"locked": {
"lastModified": 1716329735,
"narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"type": "github"
},
"original": {
@@ -270,11 +283,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github"
},
"original": {
@@ -289,21 +302,20 @@
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"flake-root": "flake-root",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1716501867,
"narHash": "sha256-4ytMzHH3E3TTBnNv7w+v0JH+nln0kgAR8ODIC7oPuZk=",
"lastModified": 1718028681,
"narHash": "sha256-C27X1vnsxKaKd1dCUU/u3LU+3DiA3Jo/ApvDiDNPIrI=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "56aaef010ad9afae1730337e8ce71060fbcaa542",
"rev": "33a32c94176feebd3ff5259ce418b989b428d5ae",
"type": "github"
},
"original": {
@@ -314,11 +326,11 @@
},
"nur": {
"locked": {
"lastModified": 1716543979,
"narHash": "sha256-uGp1xBxjPL2ACagXOkazhYtE4WujXwXUI6nKiXrlEZ0=",
"lastModified": 1718034680,
"narHash": "sha256-i6+D11kYXTF6WbGdVCDzModgpIdQKJZiro7k+xhKIls=",
"owner": "nix-community",
"repo": "NUR",
"rev": "8d56a7c71dd362321002041a704978e3dc23e51f",
"rev": "e614348f2248692fad52c28dad7ee04fbc51df51",
"type": "github"
},
"original": {
@@ -327,33 +339,6 @@
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": {
"inputs": {
"anyrun": "anyrun",
@@ -380,6 +365,21 @@
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -402,11 +402,11 @@
]
},
"locked": {
"lastModified": 1715940852,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"lastModified": 1717850719,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
"type": "github"
},
"original": {

11
modules/home-manager/programs/neovide.nix
View File

@@ -1,6 +1,15 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.neovide ];
home.packages = [
(pkgs.neovide.overrideAttrs {
src = pkgs.fetchFromGitHub {
owner = "neovide";
repo = "neovide";
rev = "1db63d93b18cc1eb5ac5b3e67b3ca63505f10800";
hash = "sha256-iBGDxOro1yd98d5XPIw824dapuHDimuP27f/nKbh6qo=";
};
})
];
xdg.configFile."neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide" {
maximized = false;
fork = true;

6
modules/home-manager/programs/nixvim/presets/auto-format.nix
View File

@@ -16,9 +16,7 @@ in
};
config = lib.mkIf cfg.enable {
userCommands.${cfg.commandName} = {
command = {
__raw = # lua
userCommands.${cfg.commandName}.command.__raw = # lua
''
function(args)
if args.bang then
@@ -28,8 +26,6 @@ in
end
end
'';
};
};
keymaps = [
{

7
modules/home-manager/programs/nixvim/presets/auto-save.nix
View File

@@ -47,8 +47,7 @@ in
userCommands.${cfg.commandName} = {
bang = true;
command = {
__raw = # lua
command.__raw = # lua
''
function(args)
if args.bang then
@@ -59,7 +58,6 @@ in
end
'';
};
};
keymaps = [
{
@@ -85,7 +83,8 @@ in
};
};
neo-tree.eventHandlers.window_before_open = ''
neo-tree.eventHandlers.window_before_open = # lua
''
function()
AutoSave()
end

11
modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
View File

@@ -42,16 +42,15 @@ in
key = "<leader>sa";
mode = "n";
options.silent = true;
lua = true;
action = # lua
action.__raw = # lua
"require('actions-preview').code_actions";
}
{
key = "<leader>sx";
mode = "n";
options.silent = true;
lua = true;
action = "vim.lsp.buf.format";
action.__raw = # lua
"vim.lsp.buf.format";
}
{
key = "<leader>sR";
@@ -63,8 +62,8 @@ in
key = "<leader>sn";
mode = "n";
options.silent = true;
action = "vim.lsp.buf.hover";
lua = true;
action.__raw = # lua
"vim.lsp.buf.hover";
}
];
plugins = {

10
modules/home-manager/programs/nixvim/presets/languages/angular.nix
View File

@@ -21,8 +21,8 @@ in
"--ngProbeLocations"
""
];
on_new_config = {
__raw = ''
on_new_config.__raw = # lua
''
function(new_config, new_root_dir)
new_config.cmd = {
new_root_dir .. "/node_modules/@angular/language-server/bin/ngserver",
@@ -34,7 +34,6 @@ in
}
end
'';
};
filetypes = [
"typescript"
"html"
@@ -43,8 +42,8 @@ in
"angular"
"html.angular"
];
on_attach = {
__raw = ''
on_attach.__raw = # lua
''
function(client, bufnr)
if vim.bo[bufnr].filetype == "html" then
vim.bo[bufnr].filetype = "angular"
@@ -52,7 +51,6 @@ in
end
'';
};
};
}
];
};

7
modules/home-manager/programs/nixvim/presets/languages/js.nix
View File

@@ -15,12 +15,15 @@ in
};
config = lib.mkIf cfg.enable {
extraConfigLua = lib.mkIf cfg.npm ''
extraConfigLua =
lib.mkIf cfg.npm # lua
''
require("cmp-npm").setup({})
'';
plugins = {
lspkind = lib.mkIf cfg.npm {
cmp.after = ''
cmp.after = # lua
''
function(entry, vim_item, kind)
if entry.source.name == "npm" then
kind.kind = ""

2
modules/home-manager/programs/nixvim/presets/languages/nix.nix
View File

@@ -15,7 +15,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.nix = [ "nixfmt" ];
lsp.servers.nil_ls.enable = true;
lsp.servers.nil-ls.enable = true;
nix.enable = true;
};
extraPackages = [ pkgs.nixfmt-rfc-style ];

6
modules/home-manager/programs/nixvim/presets/lazygit.nix
View File

@@ -42,16 +42,12 @@ in
end
'';
userCommands.${cfg.commandName} = {
command = {
__raw = # lua
userCommands.${cfg.commandName}.command.__raw = # lua
''
function()
LazygitTerminal:toggle()
end
'';
};
};
keymaps = [
{

15
modules/home-manager/programs/nixvim/presets/trouble.nix
View File

@@ -12,36 +12,31 @@ in
{
key = "<leader>xx";
mode = "n";
lua = true;
action = # lua
action.__raw = # lua
"require('trouble').toggle";
}
{
key = "<leader>xw";
mode = "n";
lua = true;
action = # lua
action.__raw = # lua
"function() require('trouble').toggle('workspace_diagnostics') end";
}
{
key = "<leader>xd";
mode = "n";
lua = true;
action = # lua
action.__raw = # lua
"function() require('trouble').toggle('document_diagnostics') end";
}
{
key = "<leader>xq";
mode = "n";
lua = true;
action = # lua
action.__raw = # lua
"function() require('trouble').toggle('quickfix') end";
}
{
key = "<leader>xl";
mode = "n";
lua = true;
action = # lua
action.__raw = # lua
"function() require('trouble').toggle('loclist') end";
}
];

4
modules/home-manager/programs/nixvim/presets/undotree.nix
View File

@@ -9,10 +9,8 @@ in
config = lib.mkIf cfg.enable {
opts = {
undodir = {
__raw = # lua
undodir.__raw = # lua
"os.getenv('HOME') .. '/.config/nvim/undodir'";
};
undofile = true;
};
plugins = {