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

update system

Browse Source
This commit is contained in:
Thea Schöbl
2024-08-28 00:05:51 +02:00
parent c6082902a4
commit 78a04e80b5
11 changed files with 119 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
flake.lock generated
View File

@@ -95,6 +95,28 @@
} }
}, },
"flake-parts_2": { "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": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@@ -150,11 +172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723202784, "lastModified": 1724440431,
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "c7012d0c18567c889b948781bc74a501e92275d1", "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -192,11 +214,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1724435763,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1724435763,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -254,11 +276,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722924007, "lastModified": 1724561770,
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -267,9 +289,33 @@
"type": "github" "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": { "nixos-cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nix-update": "nix-update",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@@ -277,11 +323,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723944896, "lastModified": 1724727194,
"narHash": "sha256-iy4T4GnZ0mTXyY6yICyqQdtfW7A40poDks95ioqaNxE=", "narHash": "sha256-1qfV4NTz3SnuVAat9SfXzu2Jdu5156ZwODOeSZpF6xk=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "399bab67e103d559f72e643e3867eb105b653c01", "rev": "1b1bdf467e6f638889ea6a5f30e8d6182a7a16e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -308,11 +354,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1723688146, "lastModified": 1724316499,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -324,11 +370,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1724479785,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -342,7 +388,7 @@
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
@@ -350,14 +396,14 @@
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1723923888, "lastModified": 1724780710,
"narHash": "sha256-w+/PG6KqB8en0x1JH5aMuf0QC78Nfei208EaaaRuYG4=", "narHash": "sha256-fa85gMW4aUFFL26dbhiIgA2a2CLi0B4/X766kkbTPEc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "78fc4be6a830e8dc01f3e66ddbe3243b4bfe8560", "rev": "1085bcd7ccf561577ff52dba76b1cb8d35f2c124",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -368,11 +414,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1723985933, "lastModified": 1724790598,
"narHash": "sha256-bybjUCI63982mhQqVYtlhOs+kwmDR4g+/QEvSK4pNvA=", "narHash": "sha256-H14riEUFLwhfFF7aV98H53ZCCNi0hOrtbC/Eb9dueWE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6cbb9fb9c5d55fa2af9a5b0d3185d56c90ad62aa", "rev": "c170519c42e19027cc0d14a6ac8d36ba19574764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -390,11 +436,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723367906, "lastModified": 1724584782,
"narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -422,11 +468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723861146, "lastModified": 1724638882,
"narHash": "sha256-tfPBU+fK6YYMZvNsOYHv6JzBa8XKuhtfu8Cb9lnri1w=", "narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "07105b5f550665ff417487febcd6bf5dd071b931", "rev": "19b70f147b9c67a759e35824b241f1ed92e46694",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -481,6 +527,28 @@
} }
}, },
"treefmt-nix": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@@ -488,11 +556,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723454642, "lastModified": 1724338379,
"narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "349de7bc435bdff37785c2466f054ed1766173be", "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
modules/home-manager/desktops/hyprland/default.nix
View File

@@ -144,15 +144,15 @@
gnome-keyring gnome-keyring
nautilus nautilus
gnome-calendar gnome-calendar
gnome.gnome-characters gnome-characters
gnome.gnome-contacts gnome-contacts
gnome.gnome-clocks gnome-clocks
gnome-calculator gnome-calculator
simple-scan simple-scan
eog eog
geary geary
ghex ghex
gnome.gnome-weather gnome-weather
gnome-keyring gnome-keyring
gnome-disk-utility gnome-disk-utility
# fixes # fixes

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

@@ -65,7 +65,7 @@ in
} }
]; ];
conform-nvim.formatAfterSave = # lua conform-nvim.settings.format_after_save = # lua
'' ''
function(bufnr) function(bufnr)
if vim.g.${cfg.varName} or vim.b[bufnr].${cfg.varName} then if vim.g.${cfg.varName} or vim.b[bufnr].${cfg.varName} then

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

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins.conform-nvim = { plugins.conform-nvim = {
enable = true; enable = true;
formattersByFt = lib.mkIf cfg.prettier { settings.formatters_by_ft = lib.mkIf cfg.prettier {
javascript = [ "prettierd" ]; javascript = [ "prettierd" ];
markdown = [ "prettierd" ]; markdown = [ "prettierd" ];
typescript = [ "prettierd" ]; typescript = [ "prettierd" ];

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

@@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt = { conform-nvim.settings.formatters_by_ft = {
c = [ "clang-format" ]; c = [ "clang-format" ];
cpp = [ "clang-format" ]; cpp = [ "clang-format" ];
}; };

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

@@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt.dart = [ "dart_format" ]; conform-nvim.settings.formatters_by_ft.dart = [ "dart_format" ];
lsp.servers.dartls.enable = true; lsp.servers.dartls.enable = true;
}; };
}; };

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

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt.lua = [ "stylua" ]; conform-nvim.settings.formatters_by_ft.lua = [ "stylua" ];
lsp.servers.lua-ls.enable = true; lsp.servers.lua-ls.enable = true;
}; };
extraPackages = [ pkgs.stylua ]; extraPackages = [ pkgs.stylua ];

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

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt.nix = [ "nixfmt" ]; conform-nvim.settings.formatters_by_ft.nix = [ "nixfmt" ];
lsp.servers.nil-ls.enable = true; lsp.servers.nil-ls.enable = true;
nix.enable = true; nix.enable = true;
}; };

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

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt.python = [ "black" ]; conform-nvim.settings.formatters_by_ft.python = [ "black" ];
lsp.servers.pylsp.enable = true; lsp.servers.pylsp.enable = true;
}; };
extraPackages = [ pkgs.black ]; extraPackages = [ pkgs.black ];

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

@@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt.rust = [ "rustfmt" ]; conform-nvim.settings.formattters_by_ft.rust = [ "rustfmt" ];
lsp.servers.rust-analyzer = { lsp.servers.rust-analyzer = {
enable = true; enable = true;
installCargo = false; installCargo = false;

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

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
plugins = { plugins = {
conform-nvim.formattersByFt.sh = [ "shfmt" ]; conform-nvim.settings.formatters_by_ft.sh = [ "shfmt" ];
lsp.servers.bashls.enable = true; lsp.servers.bashls.enable = true;
}; };
extraPackages = [ pkgs.shfmt ]; extraPackages = [ pkgs.shfmt ];