From 6a8d644c94d00a026d5089c63c08b6565fb9516d Mon Sep 17 00:00:00 2001 From: tomoron Date: Fri, 27 Mar 2026 12:13:04 +0100 Subject: [PATCH] update flake --- flake.lock | 42 +++++++++++++++---------------- homeConfigs/global/appearance.nix | 3 ++- homeConfigs/modules/git.nix | 3 +++ homeConfigs/modules/vim.nix | 2 +- homeConfigs/packages.nix | 4 +-- osConfigs/hosts/laptop.nix | 4 +-- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 484ed8e..c75ee4a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771587924, - "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=", + "lastModified": 1774098279, + "narHash": "sha256-OoQRoQmwCuBBXObi82F6C+eYV1lYCt5Va5k/VckJ6vo=", "owner": "catppuccin", "repo": "nix", - "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3", + "rev": "cb374516af3ccc3aa0c6ef518292bf4ae417a60e", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1771669320, - "narHash": "sha256-LqmgIBpjpMQKkHKCSGJkluMVFFoBdkUhJnu+Cq+jgGc=", + "lastModified": 1774584175, + "narHash": "sha256-3g85c0I2xSgcAayR6tRYPovsF9eBosN6AwBcoFiL+GY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "496abb3aef244b896bf7cdd65e071cf624f16338", + "rev": "9e84571429d01fc3971f05ee3daa3316516b460f", "type": "gitlab" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1771647911, - "narHash": "sha256-18liNHHwOmcaKCpOptE3wLW97fm5v7RTLiZBecX7km0=", + "lastModified": 1774584114, + "narHash": "sha256-uWR9fC+4NykFJVn4GN4Ini9LX+w8Llj7BnWKKp0N6bw=", "owner": "nix-community", "repo": "home-manager", - "rev": "436b27742c996b75e2baf8e835e3b3eae0c9fbd4", + "rev": "4b1be5c38be350ee9452a4847945ce71d950dc31", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1774567711, + "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1771524872, - "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", + "lastModified": 1774303811, + "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", + "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", "type": "github" }, "original": { diff --git a/homeConfigs/global/appearance.nix b/homeConfigs/global/appearance.nix index 6827b3f..f73495f 100644 --- a/homeConfigs/global/appearance.nix +++ b/homeConfigs/global/appearance.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, pkgs, config, ... }: { catppuccin = { enable = true; @@ -12,6 +12,7 @@ }; gtk = { + gtk4.theme = config.gtk.theme; enable = true; theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; }; font = { name = "Sans"; size = 11; }; diff --git a/homeConfigs/modules/git.nix b/homeConfigs/modules/git.nix index 6f5ad1a..28e8922 100644 --- a/homeConfigs/modules/git.nix +++ b/homeConfigs/modules/git.nix @@ -11,6 +11,7 @@ programs.git = { enable = true; lfs.enable = true; + signing.format = "openpgp"; settings = { user.email = "tomoron@student.42angouleme.fr"; user.name = "tomoron"; @@ -19,8 +20,10 @@ push.autoSetupRemote = true; rerere.enabled = true; help.autocorrect = 1; + user.signingkey = "251B4BD73683A8DF13D760A868BFAFE31DF313AD"; commit.gpgsign = true; + alias = { fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f"; back = "reset HEAD~"; diff --git a/homeConfigs/modules/vim.nix b/homeConfigs/modules/vim.nix index bba97e7..fe632c3 100644 --- a/homeConfigs/modules/vim.nix +++ b/homeConfigs/modules/vim.nix @@ -32,7 +32,7 @@ # vim.lsp.config('pylsp', {}) # ''; - programs.neovim.extraLuaConfig = '' + programs.neovim.initLua= '' vim.lsp.enable('clangd') diff --git a/homeConfigs/packages.nix b/homeConfigs/packages.nix index 7cb8137..2a67192 100644 --- a/homeConfigs/packages.nix +++ b/homeConfigs/packages.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/02/09 22:01:56 by tomoron #+# #+# # -# Updated: 2026/02/06 23:43:40 by tomoron ### ########.fr # +# Updated: 2026/03/27 12:00:06 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -19,7 +19,7 @@ htop gnumake git - neofetch + fastfetch clang ninja gdb diff --git a/osConfigs/hosts/laptop.nix b/osConfigs/hosts/laptop.nix index e916ff0..f00d65a 100644 --- a/osConfigs/hosts/laptop.nix +++ b/osConfigs/hosts/laptop.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/06 00:56:57 by tomoron #+# #+# # -# Updated: 2026/03/13 15:09:11 by tomoron ### ########.fr # +# Updated: 2026/03/27 11:49:20 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -105,7 +105,7 @@ services.asusd = { enable = true; - enableUserService = true; +# enableUserService = true; }; services.supergfxd.enable = true;