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

refactor: rfc formatting

Browse Source
This commit is contained in:
Thea Schöbl
2024-04-03 23:12:53 +02:00
parent f06b3b1436
commit 16d3816918
34 changed files with 477 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/home-manager/clean-home-dir.nix
View File

@@ -1,4 +1,5 @@
{ config, ... }: {
{ config, ... }:
{
xdg.enable = true;
xdg.userDirs.enable = true;
home.sessionVariables = {
@@ -7,8 +8,7 @@
NPM_CONFIG_CACHE = "${config.xdg.cacheHome}/npm";
NPM_CONFIG_TMP = "${config.xdg.stateHome}/npm";
WINEPREFIX = "${config.xdg.configHome}/wineprefixes/default";
_JAVA_OPTGRADLE_USER_HOMEIONS =
''-Djava.util.prefs.userRoot="${config.xdg.configHome}"/java'';
_JAVA_OPTGRADLE_USER_HOMEIONS = ''-Djava.util.prefs.userRoot="${config.xdg.configHome}"/java'';
GRADLE_USER_HOME = "${config.xdg.configHome}/gradle";
DVDCSS_CACHE = "${config.xdg.cacheHome}/dvdcss";
DOCKER_CONFIG = "${config.xdg.configHome}/docker";

10
modules/home-manager/default.nix
View File

@@ -1,4 +1,12 @@
{ username, desktop, stateVersion, osConfig, inputs, ... }: {
{
username,
desktop,
stateVersion,
osConfig,
inputs,
...
}:
{
home = {
stateVersion = osConfig.system.stateVersion;
inherit username;

6
modules/home-manager/packages/default.nix
View File

@@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
xdg.configFile."ranger/rc.conf".source = ./ranger.conf;
home.packages = with pkgs; [
# nix
@@ -15,7 +16,7 @@
# media
jellyfin-media-player
youtube-dl
tartube
# tartube
yt-dlp
f3d
mpv
@@ -41,7 +42,6 @@
audacity
pinta
kdePackages.kdenlive
# friture TODO: broken
blender-hip
openscad-unstable

7
modules/home-manager/packages/hid-fanatecff-tools.nix
View File

@@ -1,4 +1,9 @@
{ lib, stdenv, fetchFromGitHub, pkgs, }:
{
lib,
stdenv,
fetchFromGitHub,
pkgs,
}:
stdenv.mkDerivation rec {
pname = "hid-fanatecff-tools";
version = "0.1.0";

8
modules/home-manager/packages/threema-desktop.nix
View File

@@ -1,6 +1,8 @@
{ pkgs }:
pkgs.threema-desktop.overrideAttrs (prev: {
postFixup = prev.postFixup + ''
echo "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" >> $out/bin/threema
'';
postFixup =
prev.postFixup
+ ''
echo "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" >> $out/bin/threema
'';
})

7
modules/home-manager/programs/default.nix
View File

@@ -1,4 +1,5 @@
{ pkgs, config, ... }: {
{ pkgs, config, ... }:
{
programs = {
home-manager.enable = true;
rbw = {
@@ -16,7 +17,9 @@
gpg.enable = true;
btop = {
enable = true;
settings = { vim_keys = true; };
settings = {
vim_keys = true;
};
};
zsh = {
enable = true;

38
modules/home-manager/programs/firefox.nix
View File

@@ -1,4 +1,5 @@
{ pkgs }: {
{ pkgs }:
{
enable = true;
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
extraPolicies = {
@@ -43,27 +44,26 @@
default = "Google";
engines = {
"Nix Packages" = {
urls = [{
template = "https://search.nixos.org/packages";
params = [
{
name = "type";
value = "packages";
}
{
name = "query";
value = "{searchTerms}";
}
];
}];
icon =
"${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
urls = [
{
template = "https://search.nixos.org/packages";
params = [
{
name = "type";
value = "packages";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ];
};
"NixOS Wiki" = {
urls = [{
template = "https://nixos.wiki/index.php?search={searchTerms}";
}];
urls = [ { template = "https://nixos.wiki/index.php?search={searchTerms}"; } ];
iconUpdateURL = "https://nixos.wiki/favicon.png";
updateInterval = 24 * 60 * 60 * 1000;
definedAliases = [ "@nw" ];

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

@@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
home.packages = [ pkgs.neovide ];
xdg.configFile."neovide/config.toml".source = ./neovide.toml;
}

159
modules/home-manager/programs/nixvim/default.nix
View File

@@ -17,7 +17,8 @@ let
'';
};
};
in {
in
{
enable = true;
defaultEditor = true;
vimAlias = true;
@@ -33,7 +34,9 @@ in {
smartindent = true;
signcolumn = "yes";
undodir = { __raw = "os.getenv('HOME') .. '/.config/nvim/undodir'"; };
undodir = {
__raw = "os.getenv('HOME') .. '/.config/nvim/undodir'";
};
undofile = true;
scrolloff = 12;
@@ -116,30 +119,37 @@ in {
right = "┊";
};
sections = {
lualine_a = [{
name = "mode";
separator = {
right = "";
left = "";
};
icon = "";
}];
lualine_a = [
{
name = "mode";
separator = {
right = "";
left = "";
};
icon = "";
}
];
lualine_x = [
"(vim.g.disable_autoformat or vim.b.disable_autoformat) and '󱌓' or nil"
{ name = "filetype"; }
];
lualine_z = [{
name = "location";
separator = {
right = "";
left = "";
};
}];
lualine_z = [
{
name = "location";
separator = {
right = "";
left = "";
};
}
];
};
};
auto-save = {
enable = true;
triggerEvents = [ "FocusLost" "BufLeave" ];
triggerEvents = [
"FocusLost"
"BufLeave"
];
};
indent-blankline = {
enable = true;
@@ -259,51 +269,55 @@ in {
lsp = {
enable = true;
keymaps = { diagnostic = { }; };
enabledServers = [{
name = "angularls";
extraOptions = {
cmd = [
"ngserver"
"--stdio"
"--tsProbeLocations"
""
"--ngProbeLocations"
""
];
on_new_config = {
__raw = ''
function(new_config, new_root_dir)
new_config.cmd = {
new_root_dir .. "/node_modules/@angular/language-server/bin/ngserver",
"--stdio",
"--tsProbeLocations",
new_root_dir .. "/node_modules",
"--ngProbeLocations",
new_root_dir .. "/node_modules",
}
end
'';
};
filetypes = [
"typescript"
"html"
"typescriptreact"
"typescript.tsx"
"angular"
"html.angular"
];
on_attach = {
__raw = ''
function(client, bufnr)
if vim.bo[bufnr].filetype == "html" then
vim.bo[bufnr].filetype = "angular"
keymaps = {
diagnostic = { };
};
enabledServers = [
{
name = "angularls";
extraOptions = {
cmd = [
"ngserver"
"--stdio"
"--tsProbeLocations"
""
"--ngProbeLocations"
""
];
on_new_config = {
__raw = ''
function(new_config, new_root_dir)
new_config.cmd = {
new_root_dir .. "/node_modules/@angular/language-server/bin/ngserver",
"--stdio",
"--tsProbeLocations",
new_root_dir .. "/node_modules",
"--ngProbeLocations",
new_root_dir .. "/node_modules",
}
end
end
'';
'';
};
filetypes = [
"typescript"
"html"
"typescriptreact"
"typescript.tsx"
"angular"
"html.angular"
];
on_attach = {
__raw = ''
function(client, bufnr)
if vim.bo[bufnr].filetype == "html" then
vim.bo[bufnr].filetype = "angular"
end
end
'';
};
};
};
}];
}
];
servers = {
html.enable = true;
cssls.enable = true;
@@ -323,7 +337,10 @@ in {
clangd = {
enable = true;
cmd = [ "clangd" "--offset-encoding=utf-16" ];
cmd = [
"clangd"
"--offset-encoding=utf-16"
];
};
nixd.enable = true;
@@ -347,16 +364,16 @@ in {
end
'';
};
symbolMap = { Copilot = ""; };
symbolMap = {
Copilot = "";
};
};
cmp = {
enable = true;
settings = {
mapping = {
"<C-n>" =
"cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
"<C-p>" =
"cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
"<C-n>" = "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
"<C-p>" = "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
"<C-Space>" = "cmp.mapping.confirm({select = true})";
"<C-Enter>" = "cmp.mapping.complete()";
};
@@ -372,9 +389,11 @@ in {
{ name = "nvim_lsp_signature_help"; }
{ name = "nvim_lsp_document_symbol"; }
];
formatting.fields = [ "abbr" "kind" ];
snippet.expand =
"function(args) require('luasnip').lsp_expand(args.body) end";
formatting.fields = [
"abbr"
"kind"
];
snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
window = {
completion.border = "rounded";
documentation.border = "rounded";

3
modules/home-manager/programs/nixvim/keymaps.nix
View File

@@ -82,8 +82,7 @@
key = "<leader>xw";
mode = "n";
lua = true;
action =
"function() require('trouble').toggle('workspace_diagnostics') end";
action = "function() require('trouble').toggle('workspace_diagnostics') end";
}
{
key = "<leader>xd";

3
modules/home-manager/services/default.nix
View File

@@ -1,4 +1,5 @@
{ pkgs, homeDirectory, ... }: {
{ pkgs, homeDirectory, ... }:
{
services = {
gpg-agent = {
enable = true;