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

update system

Browse Source
This commit is contained in:
Thea Schöbl
2024-10-06 19:12:45 +02:00
parent 78a04e80b5
commit 8efcf832a9
14 changed files with 121 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
flake.lock generated
View File

@@ -95,28 +95,6 @@
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixos-cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
@@ -124,11 +102,11 @@
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@@ -142,11 +120,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@@ -172,11 +150,11 @@
]
},
"locked": {
"lastModified": 1724440431,
"narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"type": "github"
},
"original": {
@@ -214,11 +192,11 @@
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"lastModified": 1728041527,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github"
},
"original": {
@@ -235,11 +213,11 @@
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"lastModified": 1728041527,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github"
},
"original": {
@@ -276,11 +254,11 @@
]
},
"locked": {
"lastModified": 1724561770,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
"lastModified": 1727999297,
"narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
"rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
"type": "github"
},
"original": {
@@ -289,33 +267,9 @@
"type": "github"
}
},
"nix-update": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724271552,
"narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=",
"owner": "Mic92",
"repo": "nix-update",
"rev": "737121eccb67542e8c004c64da833fede2e80c64",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-update",
"type": "github"
}
},
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat",
"nix-update": "nix-update",
"nixpkgs": [
"nixpkgs"
],
@@ -323,11 +277,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1724727194,
"narHash": "sha256-1qfV4NTz3SnuVAat9SfXzu2Jdu5156ZwODOeSZpF6xk=",
"lastModified": 1728184451,
"narHash": "sha256-XuvfrJ3TkHfGKRdiWPN/RD+veVtGl0Db+R44fb5gdT8=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "1b1bdf467e6f638889ea6a5f30e8d6182a7a16e3",
"rev": "631b0cbf1466553533a87e4b8e77c00731eba21f",
"type": "github"
},
"original": {
@@ -354,11 +308,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"lastModified": 1728067476,
"narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
"type": "github"
},
"original": {
@@ -370,11 +324,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github"
},
"original": {
@@ -388,7 +342,7 @@
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_3",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
@@ -396,14 +350,14 @@
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix_2"
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724780710,
"narHash": "sha256-fa85gMW4aUFFL26dbhiIgA2a2CLi0B4/X766kkbTPEc=",
"lastModified": 1728176751,
"narHash": "sha256-hVmdzrZMFC/5q3dSjbKX9qocWN9coPBhs8muLsL3738=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "1085bcd7ccf561577ff52dba76b1cb8d35f2c124",
"rev": "d42c804ad515f45f8addaf5a4bb0b8ce405ea140",
"type": "github"
},
"original": {
@@ -414,11 +368,11 @@
},
"nur": {
"locked": {
"lastModified": 1724790598,
"narHash": "sha256-H14riEUFLwhfFF7aV98H53ZCCNi0hOrtbC/Eb9dueWE=",
"lastModified": 1728226241,
"narHash": "sha256-TkY1yXx/gydHjjPbsSZ+xgQSbYASJ/RtcGKPBKuDOyk=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c170519c42e19027cc0d14a6ac8d36ba19574764",
"rev": "9cb9697940500fd10bc27bb68c7259b4cf0b32de",
"type": "github"
},
"original": {
@@ -436,11 +390,11 @@
]
},
"locked": {
"lastModified": 1724584782,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
"lastModified": 1728017046,
"narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=",
"owner": "NuschtOS",
"repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
"rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629",
"type": "github"
},
"original": {
@@ -468,11 +422,11 @@
]
},
"locked": {
"lastModified": 1724638882,
"narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=",
"lastModified": 1728095260,
"narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "19b70f147b9c67a759e35824b241f1ed92e46694",
"rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26",
"type": "github"
},
"original": {
@@ -527,28 +481,6 @@
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719887753,
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixvim",
@@ -556,11 +488,11 @@
]
},
"locked": {
"lastModified": 1724338379,
"narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=",
"lastModified": 1727984844,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "070f834771efa715f3e74cd8ab93ecc96fabc951",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"type": "github"
},
"original": {

1
flake.nix
View File

@@ -43,6 +43,7 @@
allowUnfree = true;
allowUnsupportedSystem = true;
experimental-features = "nix-command flakes";
permittedInsecurePackages = [ "nix-2.25.0pre20240807_cfe66dbe" ];
};
overlays = [
nur.overlay

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

@@ -24,6 +24,7 @@
vesktop
discord
element-desktop
thunderbird
# cinny-desktop
# office
@@ -44,8 +45,8 @@
# development
insomnia
avalonia-ilspy
ghidra
ida-free
# ghidra
# ida-free
# utils
libqalculate

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

@@ -78,7 +78,7 @@
plugins = {
leap.enable = true;
surround.enable = true;
vim-surround.enable = true;
which-key.enable = true;
schemastore.enable = true;
# TODO: looks weird with neovide

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

@@ -75,7 +75,7 @@ in
end
'';
lualine.sections.lualine_x = lib.mkOrder 600 [
lualine.settings.sections.lualine_x = lib.mkOrder 600 [
"(vim.g.${cfg.varName} or vim.b.${cfg.varName}) and '󱌓' or nil"
];
};

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

@@ -101,7 +101,7 @@ in
"function() PerformAutoSave() end";
*/
lualine.sections.lualine_x = lib.mkOrder 700 [
lualine.settings.sections.lualine_x = lib.mkOrder 700 [
# lua
"(vim.g.disable_autosave or vim.b.disable_autosave) and '󱙃' or nil"
];

1
modules/home-manager/programs/nixvim/presets/base/find.nix
View File

@@ -9,6 +9,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
web-devicons.enable = true;
telescope = {
enable = true;
keymaps = {

64
modules/home-manager/programs/nixvim/presets/base/status-line.nix
View File

@@ -28,36 +28,40 @@ in
];
lualine = {
enable = true;
globalstatus = true;
sectionSeparators = {
left = ""; # "";
right = ""; # "";
};
componentSeparators = {
left = "┊";
right = "┊";
};
sections = {
lualine_a = [
{
name = "mode";
separator = {
right = ""; # "";
left = ""; # "";
};
icon = "";
}
];
lualine_x = lib.mkAfter [ { name = "filetype"; } ];
lualine_z = [
{
name = "location";
separator = {
right = ""; # "";
left = ""; # "";
};
}
];
settings = {
options = {
globalstatus = true;
section_separators = {
left = ""; # "";
right = ""; # "";
};
component_separators = {
left = "┊";
right = "┊";
};
};
sections = {
lualine_a = [
{
__unkeyed-1 = "mode";
separator = {
right = ""; # "";
left = ""; # "";
};
icon = "";
}
];
lualine_x = lib.mkAfter [ { __unkeyed-1 = "filetype"; } ];
lualine_z = [
{
__unkeyed-1 = "location";
separator = {
right = ""; # "";
left = ""; # "";
};
}
];
};
};
};
};

1
modules/home-manager/programs/nixvim/presets/base/tree.nix
View File

@@ -19,6 +19,7 @@ in
}
];
plugins = {
web-devicons.enable = true;
neo-tree = {
enable = true;
filesystem = {

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

@@ -1,42 +1,39 @@
{ lib, ... }:
{
options.programs.nixvim = lib.mkOption {
type = lib.types.submodule (
{ config, ... }:
{
imports = [
./auto-save.nix
./auto-format.nix
./harpoon.nix
./mergetool.nix
./lazygit.nix
./trouble.nix
./undotree.nix
type = lib.types.submoduleWith {
modules = [
./auto-save.nix
./auto-format.nix
./harpoon.nix
./mergetool.nix
./lazygit.nix
./trouble.nix
./undotree.nix
./base/completion.nix
./base/diagnostics.nix
./base/find.nix
./base/formatting.nix
./base/status-line.nix
./base/syntax.nix
./base/tree.nix
./base/completion.nix
./base/diagnostics.nix
./base/find.nix
./base/formatting.nix
./base/status-line.nix
./base/syntax.nix
./base/tree.nix
./languages/angular.nix
./languages/c.nix
./languages/css.nix
./languages/dart.nix
./languages/js.nix
./languages/lua.nix
./languages/nix.nix
./languages/python.nix
./languages/rust.nix
./languages/shell.nix
./languages/angular.nix
./languages/c.nix
./languages/css.nix
./languages/dart.nix
./languages/js.nix
./languages/lua.nix
./languages/nix.nix
./languages/python.nix
./languages/rust.nix
./languages/shell.nix
./remaps/half-page-scroll.nix
./remaps/no-accidental-macro.nix
./remaps/paste-keep-buffer.nix
];
}
);
./remaps/half-page-scroll.nix
./remaps/no-accidental-macro.nix
./remaps/paste-keep-buffer.nix
];
};
};
}

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

@@ -42,7 +42,7 @@ in
}
];
lsp.servers = {
tsserver.enable = true;
ts-ls.enable = true;
eslint.enable = lib.mkIf cfg.eslint true;
};
};

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

@@ -41,6 +41,7 @@ in
}
];
plugins = {
web-devicons.enable = true;
trouble = {
enable = true;
settings.use_diagnostic_signs = true;

2
modules/home-manager/theme/md3-evo.nix
View File

@@ -262,7 +262,7 @@ in
nested = true;
}
];
plugins.lualine.theme.__raw = # lua
plugins.lualine.settings.options.theme.__raw = # lua
"function() return vim.g.lualine_theme end";
};

1
modules/nixos/usecases/3d-printing.nix
View File

@@ -21,7 +21,6 @@ in
dfu-util
cura
orca-slicer
openscad-unstable
freecad
];
};