From b9ba95948241b330d4d4f0030d096d5a5f20b9c1 Mon Sep 17 00:00:00 2001 From: tomoron Date: Sun, 31 May 2026 15:40:48 +0200 Subject: [PATCH] add hosts on laptop, catppuccin autoenable config --- flake.lock | 56 ++++++++++++++++++++----------- homeConfigs/global/appearance.nix | 1 + homeConfigs/global/catppuccin.nix | 13 ------- osConfigs/hosts/laptop.nix | 10 +++++- osConfigs/os.nix | 4 ++- 5 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 homeConfigs/global/catppuccin.nix diff --git a/flake.lock b/flake.lock index 8a159ba..dcefb5e 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1779910193, - "narHash": "sha256-CQD/mtBC1VYQgTpKR6LhD+gPJ9S3neN6rBo/RYFWDgM=", + "lastModified": 1780220641, + "narHash": "sha256-skJ/dYOLw3QzSjtA6HkIskI3DopI8yV5QMdz1hgrun4=", "owner": "catppuccin", "repo": "nix", - "rev": "c61cab9677ff7184891930a60bf8224aa81c3a31", + "rev": "249534863227f98ff93c991aa6f1f3d23f3bad5e", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1780027372, - "narHash": "sha256-LQ3CUdVZoKQqWzS2eEpY0rp9bJuzqydNFJUiJ6De9r8=", + "lastModified": 1780200155, + "narHash": "sha256-cKpqEvRqxnCbp/2ZVczMHws31Qh4D/HTEuanWuJmySk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ef18b76eabdf4f9b2ce8e99e78ce698923693300", + "rev": "d29c0c2692ced897777eca19c9bab1b34be0e0d6", "type": "gitlab" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1779969295, - "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=", + "lastModified": 1780099287, + "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6", + "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", "type": "github" }, "original": { @@ -62,12 +62,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1779826373, - "narHash": "sha256-3sRzgLX86qV5NlhWUAufLmHwkyP03tmL3VdZIM13dEo=", + "lastModified": 1780065812, + "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ef4efb84766a166c906bd55759574676bf91267c", + "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144", "type": "github" }, "original": { @@ -79,11 +82,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779786838, - "narHash": "sha256-QvQh/2CMKcrUTHd4jBHAwyRoEC4IXzs0SjMvx5xWY64=", - "rev": "f44f7788c891fbe5542177df78374f8cdab10e8f", + "lastModified": 1779877693, + "narHash": "sha256-24YGUZ9p3uLeDBGS5Nc8V7Rt5PaRg1vZ+rnfSuBW7hM=", + "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1005282.f44f7788c891/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1006043.4100e830e085/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -92,11 +95,24 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780048764, - "narHash": "sha256-KVfqVFKG3w6qnEELp9hc7W7xwA/LLFAJgXcisC4ome8=", + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1780222723, + "narHash": "sha256-slX6L7WT3xMfxcWkoBPG0heFoAKuLYgiPkfmX0AgHqQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4fca6fcd5eff299415dd8097e8032bb838306ba1", + "rev": "c16db5827622adb804336437d250df477a30994a", "type": "github" }, "original": { @@ -112,7 +128,7 @@ "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "sops-nix": "sops-nix" } }, diff --git a/homeConfigs/global/appearance.nix b/homeConfigs/global/appearance.nix index f73495f..9bcee08 100644 --- a/homeConfigs/global/appearance.nix +++ b/homeConfigs/global/appearance.nix @@ -2,6 +2,7 @@ { catppuccin = { enable = true; + autoEnable = true; flavor = "mocha"; dunst.enable = true; diff --git a/homeConfigs/global/catppuccin.nix b/homeConfigs/global/catppuccin.nix deleted file mode 100644 index 2ce89e3..0000000 --- a/homeConfigs/global/catppuccin.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - catppuccin = { - enable = true; - flavor = "mocha"; - - dunst.enable = true; - dunst.flavor="frappe"; - - kvantum.apply = true; - rofi.enable = false; - }; -} diff --git a/osConfigs/hosts/laptop.nix b/osConfigs/hosts/laptop.nix index 0f76ab9..d289713 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/04/27 12:53:46 by tomoron ### ########.fr # +# Updated: 2026/05/31 15:18:34 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -163,4 +163,12 @@ }; }; + programs.corectrl.enable = true; + + networking.extraHosts = '' + 127.0.0.1 mc.tmoron.fr + 127.0.0.1 hello.mc.tmoron.fr + 127.0.0.1 potato.mc.tmoron.fr + ''; + } diff --git a/osConfigs/os.nix b/osConfigs/os.nix index da3bba1..1eea66c 100644 --- a/osConfigs/os.nix +++ b/osConfigs/os.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/06 00:56:36 by tomoron #+# #+# # -# Updated: 2025/09/06 00:56:37 by tomoron ### ########.fr # +# Updated: 2026/05/31 15:39:42 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -21,4 +21,6 @@ system.stateVersion = "25.05"; environment.etc.nixosFlakeName.text = "${flakeName}"; + + catppuccin.autoEnable = false; }