From 24363757b95930c015516111f8ce6fa85474f9fd Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 28 Dec 2024 17:46:08 +0100 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84?narHash=sha256-Gm%2B0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw%3D' (2024-12-24) → 'github:nix-community/home-manager/10e99c43cdf4a0713b4e81d90691d22c6a58bdf2?narHash=sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4%3D' (2024-12-28) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/def1d472c832d77885f174089b0d34854b007198?narHash=sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl%2Bfk%3D' (2024-12-23) → 'github:NixOS/nixos-hardware/7c674c6734f61157e321db595dbfcd8523e04e19?narHash=sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg%3D' (2024-12-28) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507?narHash=sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ%3D' (2024-12-19) → 'github:nixos/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) • Updated input 'nur': 'github:nix-community/NUR/c95e0418a3c44b3b29c23ae1e84207539b5ea3ac?narHash=sha256-KMZ4jBgf6qlMnpGGzRFh3ZyYgGp/aDYg4Z1qQKV2sAM%3D' (2024-12-26) → 'github:nix-community/NUR/1fba85eb2f9d7a57a09e5b88b8d1aad407b50998?narHash=sha256-CkytEulg/IsnW1iWmM4/hygqX2vKuF9eHAMRxCemtpk%3D' (2024-12-28) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507?narHash=sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ%3D' (2024-12-19) → 'github:nixos/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) • Updated input 'pinpox-neovim': 'github:pinpox/pinpox-neovim/5dcfb83bc3837530b000d74cec7f0346fe0fd6ed?narHash=sha256-8GJRCvGLL7%2BVKwH8AKm1pnoldEIZ7YQbjwzCXLosRl4%3D' (2024-12-18) → 'github:pinpox/pinpox-neovim/9c007eef02ba56e8f977f6e761e36eceba1aaeaa?narHash=sha256-iMgDsiqzubF1jT/qZ1iRvjTuLX96lLUTaIJabu7DShs%3D' (2024-12-28) --- flake.lock | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 694e78ca..ebe78c43 100644 --- a/flake.lock +++ b/flake.lock @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1735053786, - "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -462,11 +462,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735227073, - "narHash": "sha256-KMZ4jBgf6qlMnpGGzRFh3ZyYgGp/aDYg4Z1qQKV2sAM=", + "lastModified": 1735403874, + "narHash": "sha256-CkytEulg/IsnW1iWmM4/hygqX2vKuF9eHAMRxCemtpk=", "owner": "nix-community", "repo": "NUR", - "rev": "c95e0418a3c44b3b29c23ae1e84207539b5ea3ac", + "rev": "1fba85eb2f9d7a57a09e5b88b8d1aad407b50998", "type": "github" }, "original": { @@ -526,15 +526,16 @@ ] }, "locked": { - "lastModified": 1734512423, - "narHash": "sha256-8GJRCvGLL7+VKwH8AKm1pnoldEIZ7YQbjwzCXLosRl4=", + "lastModified": 1735404250, + "narHash": "sha256-iMgDsiqzubF1jT/qZ1iRvjTuLX96lLUTaIJabu7DShs=", "owner": "pinpox", "repo": "pinpox-neovim", - "rev": "5dcfb83bc3837530b000d74cec7f0346fe0fd6ed", + "rev": "9c007eef02ba56e8f977f6e761e36eceba1aaeaa", "type": "github" }, "original": { "owner": "pinpox", + "ref": "default-colors", "repo": "pinpox-neovim", "type": "github" } From f3af6ca3fb6edc4468a311cbad6bf28707ebadcb Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 28 Dec 2024 18:12:44 +0100 Subject: [PATCH 2/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/1fba85eb2f9d7a57a09e5b88b8d1aad407b50998?narHash=sha256-CkytEulg/IsnW1iWmM4/hygqX2vKuF9eHAMRxCemtpk%3D' (2024-12-28) → 'github:nix-community/NUR/d3be02f25bac28d9ba200f0461f2d19a0538d721?narHash=sha256-sNv6TAsXrBWQsb%2BGc3oGaR2eX4RMHysrNHRV6yQ3kDM%3D' (2024-12-28) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ebe78c43..cb40c8ee 100644 --- a/flake.lock +++ b/flake.lock @@ -462,11 +462,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735403874, - "narHash": "sha256-CkytEulg/IsnW1iWmM4/hygqX2vKuF9eHAMRxCemtpk=", + "lastModified": 1735405129, + "narHash": "sha256-sNv6TAsXrBWQsb+Gc3oGaR2eX4RMHysrNHRV6yQ3kDM=", "owner": "nix-community", "repo": "NUR", - "rev": "1fba85eb2f9d7a57a09e5b88b8d1aad407b50998", + "rev": "d3be02f25bac28d9ba200f0461f2d19a0538d721", "type": "github" }, "original": { From d66874853112c1517daf62ee04340ad513173ba1 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sat, 28 Dec 2024 18:21:17 +0100 Subject: [PATCH 3/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/d3be02f25bac28d9ba200f0461f2d19a0538d721?narHash=sha256-sNv6TAsXrBWQsb%2BGc3oGaR2eX4RMHysrNHRV6yQ3kDM%3D' (2024-12-28) → 'github:nix-community/NUR/89e6c687ba44d5e387b2ccbc0368607d628701dc?narHash=sha256-Naer9mc5ozxqyb3DHWPw5Wd5J2rLG4amEuzaCQoylpI%3D' (2024-12-28) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cb40c8ee..c4a38b2f 100644 --- a/flake.lock +++ b/flake.lock @@ -462,11 +462,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735405129, - "narHash": "sha256-sNv6TAsXrBWQsb+Gc3oGaR2eX4RMHysrNHRV6yQ3kDM=", + "lastModified": 1735406361, + "narHash": "sha256-Naer9mc5ozxqyb3DHWPw5Wd5J2rLG4amEuzaCQoylpI=", "owner": "nix-community", "repo": "NUR", - "rev": "d3be02f25bac28d9ba200f0461f2d19a0538d721", + "rev": "89e6c687ba44d5e387b2ccbc0368607d628701dc", "type": "github" }, "original": { From 456fb05327d18121ea9e796d6c434bd61cd208f1 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Tue, 7 Jan 2025 16:28:23 +0100 Subject: [PATCH 4/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/10e99c43cdf4a0713b4e81d90691d22c6a58bdf2?narHash=sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4%3D' (2024-12-28) → 'github:nix-community/home-manager/20665c6efa83d71020c8730f26706258ba5c6b2a?narHash=sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs%3D' (2025-01-06) • Updated input 'naersk': 'github:nix-community/naersk/378614f37a6bee5a3f2ef4f825a73d948d3ae921?narHash=sha256-a4WZp1xQkrnA4BbnKrzJNr%2BdYoQr5Xneh2syJoddFyE%3D' (2024-12-04) → 'github:nix-community/naersk/a0a912b304c0c4113c68064b731a86a040269ebd?narHash=sha256-ZFSCJ2Vs7TTkS8H5ky8E%2BAcskG61h5c2yBXWjFOX5zA%3D' (2025-01-07) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7c674c6734f61157e321db595dbfcd8523e04e19?narHash=sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg%3D' (2024-12-28) → 'github:NixOS/nixos-hardware/ca30f8501ab452ca687a7fdcb2d43e1fb1732317?narHash=sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs%3D' (2025-01-07) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) → 'github:nixos/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d?narHash=sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs%2BrI%3D' (2025-01-04) • Updated input 'nixpkgs-master': 'github:nixos/nixpkgs/e069bef58b26278bd029daf1b9510dd129a088cf?narHash=sha256-L6VIrJOnNLMYbypUcTAiVPy97LnLwiA8DlicwyDTyL4%3D' (2024-12-28) → 'github:nixos/nixpkgs/003867e810e810d0ea8f392767af6c0a5af50a4e?narHash=sha256-l%2Bo65bS22U0iyY9gs916bVWNtHjAaufJ6GChDmDGlTU%3D' (2025-01-07) • Updated input 'nur': 'github:nix-community/NUR/89e6c687ba44d5e387b2ccbc0368607d628701dc?narHash=sha256-Naer9mc5ozxqyb3DHWPw5Wd5J2rLG4amEuzaCQoylpI%3D' (2024-12-28) → 'github:nix-community/NUR/ca9c757ffce0193240967cf5d485758bea1b4f05?narHash=sha256-UGc/ikH9GUWfErzTXcyttdqC18ih/NCtL%2BvO6pOkiFk%3D' (2025-01-07) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) → 'github:nixos/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d?narHash=sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs%2BrI%3D' (2025-01-04) • Updated input 'pinpox-neovim': 'github:pinpox/pinpox-neovim/9c007eef02ba56e8f977f6e761e36eceba1aaeaa?narHash=sha256-iMgDsiqzubF1jT/qZ1iRvjTuLX96lLUTaIJabu7DShs%3D' (2024-12-28) → 'github:pinpox/pinpox-neovim/46f8f96de8b3211063fc9acb37384275e8f36316?narHash=sha256-T8BS6qwjhVFe6pCB8kxOMZyEAd5q2S1ag2E0l7cANSA%3D' (2025-01-07) --- flake.lock | 59 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c4a38b2f..2e2d44a6 100644 --- a/flake.lock +++ b/flake.lock @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1736204492, + "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1733346208, - "narHash": "sha256-a4WZp1xQkrnA4BbnKrzJNr+dYoQr5Xneh2syJoddFyE=", + "lastModified": 1736262680, + "narHash": "sha256-ZFSCJ2Vs7TTkS8H5ky8E+AcskG61h5c2yBXWjFOX5zA=", "owner": "nix-community", "repo": "naersk", - "rev": "378614f37a6bee5a3f2ef4f825a73d948d3ae921", + "rev": "a0a912b304c0c4113c68064b731a86a040269ebd", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736237814, + "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -439,13 +439,29 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1736263575, + "narHash": "sha256-l+o65bS22U0iyY9gs916bVWNtHjAaufJ6GChDmDGlTU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "003867e810e810d0ea8f392767af6c0a5af50a4e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -462,11 +478,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735406361, - "narHash": "sha256-Naer9mc5ozxqyb3DHWPw5Wd5J2rLG4amEuzaCQoylpI=", + "lastModified": 1736263064, + "narHash": "sha256-UGc/ikH9GUWfErzTXcyttdqC18ih/NCtL+vO6pOkiFk=", "owner": "nix-community", "repo": "NUR", - "rev": "89e6c687ba44d5e387b2ccbc0368607d628701dc", + "rev": "ca9c757ffce0193240967cf5d485758bea1b4f05", "type": "github" }, "original": { @@ -526,11 +542,11 @@ ] }, "locked": { - "lastModified": 1735404250, - "narHash": "sha256-iMgDsiqzubF1jT/qZ1iRvjTuLX96lLUTaIJabu7DShs=", + "lastModified": 1736263655, + "narHash": "sha256-T8BS6qwjhVFe6pCB8kxOMZyEAd5q2S1ag2E0l7cANSA=", "owner": "pinpox", "repo": "pinpox-neovim", - "rev": "9c007eef02ba56e8f977f6e761e36eceba1aaeaa", + "rev": "46f8f96de8b3211063fc9acb37384275e8f36316", "type": "github" }, "original": { @@ -639,6 +655,7 @@ "nix-apple-fonts": "nix-apple-fonts", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-master": "nixpkgs-master", "nur": "nur", "nvim-cokeline": "nvim-cokeline", "nvim-fzf": "nvim-fzf", From 923dd200f5f05fba609d2f4708f95d8794d0325d Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 8 Jan 2025 15:55:35 +0100 Subject: [PATCH 5/5] set colorschme --- flake.nix | 4 ++- home-manager/colorscheme.nix | 40 +++++++++++++---------- home-manager/modules/sway/default.nix | 15 +++++---- home-manager/modules/swaylock/default.nix | 29 ---------------- home-manager/modules/waybar/style.css | 4 +-- home-manager/profiles/common.nix | 2 +- 6 files changed, 36 insertions(+), 58 deletions(-) diff --git a/flake.nix b/flake.nix index ed7a6feb..dadc8eea 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; + aoe-taunt-discord-bot = { url = "github:pinpox/aoe-taunt-discord-bot"; inputs.nixpkgs.follows = "nixpkgs"; @@ -45,7 +47,7 @@ }; pinpox-neovim = { - url = "github:pinpox/pinpox-neovim"; + url = "github:pinpox/pinpox-neovim/default-colors"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/colorscheme.nix b/home-manager/colorscheme.nix index f7375e64..86897b59 100644 --- a/home-manager/colorscheme.nix +++ b/home-manager/colorscheme.nix @@ -43,7 +43,7 @@ in # magenta = "#4c0049" # red = "#5e0009" # yellow = "#6e5600" - # + # Light: # blue = "#9fd8ff" # cyan = "#83efef" @@ -55,23 +55,27 @@ in # magenta = "#ffc3fa" # red = "#ffbcb5" # yellow = "#f4d88c" - # - Black = "24273a"; # 24273a - BrightBlack = "5b6078"; # 5b6078 - White = "cad3f5"; # cad3f5 - BrightWhite = "747c9e"; # 747c9e - Red = "ed8796"; # ed8796 - BrightRed = "ff5370"; # FF5370 - Green = "a6da95"; # a6da95 - BrightGreen = "68f288"; # 68f288 - Yellow = "eed49f"; # eed49f - BrightYellow = "fab387"; # fab387 - Blue = "8aadf4"; # 8aadf4 - BrightBlue = "74c7ec"; # 74c7ec - Magenta = "cba6f7"; # cba6f7 - BrightMagenta = "f5bde6"; # f5bde6 - Cyan = "8bd5ca"; # 8bd5ca - BrightCyan = "aee2da"; # aee2da + # foreground = e0e2ea + # background = 14161b + + Black = "14161b"; + BrightBlack = "2c2e33"; + # BrightBlack = "4f5258"; + White = "e0e2ea"; + BrightWhite = "9b9ea4"; + + BrightRed = "5e0009"; + Red = "ffbcb5"; + BrightGreen = "015825"; + Green = "aaedb7"; + BrightYellow = "6e5600"; + Yellow = "f4d88c"; + BrightBlue = "005078"; + Blue = "9fd8ff"; + BrightMagenta = "4c0049"; + Magenta = "ffc3fa"; + BrightCyan = "007676"; + Cyan = "83efef"; }; } diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix index c54bd680..d043bcfa 100644 --- a/home-manager/modules/sway/default.nix +++ b/home-manager/modules/sway/default.nix @@ -53,7 +53,8 @@ in "${modifier}+n" = "exec swaync-client -t -sw"; # Scratchpad - "${modifier}+u" = ''[app_id="dropdown"] scratchpad show; [app_id="dropdown"] resize set 98ppt 98ppt; [app_id="dropdown"] move position center''; + "${modifier}+u" = + ''[app_id="dropdown"] scratchpad show; [app_id="dropdown"] resize set 98ppt 98ppt; [app_id="dropdown"] move position center''; }; modifier = "Mod4"; # Win key @@ -112,10 +113,10 @@ in { focused = { - background = "#${c.Blue}"; - border = "#${c.BrightBlue}"; - childBorder = "#${c.Blue}"; - indicator = "#${c.BrightBlue}"; + background = "#${c.BrightGreen}"; + border = "#${c.Green}"; + childBorder = "#${c.Green}"; + indicator = "#${c.BrightGreen}"; text = "#${c.Black}"; }; @@ -129,10 +130,10 @@ in unfocused = { background = "#${c.Black}"; - border = "#${c.BrightBlack}"; + border = "#${c.Green}"; childBorder = "#${c.Black}"; indicator = "#${c.BrightBlack}"; - text = "#${c.BrightBlack}"; + text = "#${c.Green}"; }; urgent = { diff --git a/home-manager/modules/swaylock/default.nix b/home-manager/modules/swaylock/default.nix index 99b9cfe6..85e7568c 100644 --- a/home-manager/modules/swaylock/default.nix +++ b/home-manager/modules/swaylock/default.nix @@ -42,32 +42,3 @@ in }; }; } -# -i, --image [[]:] Display the given image, optionally only on the given output. -# -k, --show-keyboard-layout Display the current xkb layout while typing. -# -K, --hide-keyboard-layout Hide the current xkb layout while typing. -# -L, --disable-caps-lock-text Disable the Caps Lock text. -# -l, --indicator-caps-lock Show the current Caps Lock state also on the indicator. -# -s, --scaling Image scaling mode: stretch, fill, fit, center, tile, solid_color. -# -t, --tiling Same as --scaling=tile. -# -u, --no-unlock-indicator Disable the unlock indicator. -# --indicator-thickness Sets the indicator thickness. -# --indicator-x-position Sets the horizontal position of the indicator. -# --indicator-y-position Sets the vertical position of the indicator. -# --caps-lock-bs-hl-color Sets the color of backspace highlight segments when Caps Lock is active. -# --caps-lock-key-hl-color Sets the color of the key press highlight segments when Caps Lock is active. -# --inside-color Sets the color of the inside of the indicator. -# --inside-clear-color Sets the color of the inside of the indicator when cleared. -# --inside-caps-lock-color Sets the color of the inside of the indicator when Caps Lock is active. -# --inside-ver-color Sets the color of the inside of the indicator when verifying. -# --key-hl-color Sets the color of the key press highlight segments. -# --layout-bg-color Sets the background color of the box containing the layout text. -# --layout-border-color Sets the color of the border of the box containing the layout text. -# --ring-clear-color Sets the color of the ring of the indicator when cleared. -# --ring-caps-lock-color Sets the color of the ring of the indicator when Caps Lock is active. -# --ring-ver-color Sets the color of the ring of the indicator when verifying. -# --ring-wrong-color Sets the color of the ring of the indicator when invalid. -# --separator-color Sets the color of the lines that separate highlight segments. -# --text-clear-color Sets the color of the text when cleared. -# --text-caps-lock-color Sets the color of the text when Caps Lock is active. -# --text-ver-color Sets the color of the text when verifying. -# --text-wrong-color Sets the color of the text when invalid. diff --git a/home-manager/modules/waybar/style.css b/home-manager/modules/waybar/style.css index a79911d8..2044b91d 100644 --- a/home-manager/modules/waybar/style.css +++ b/home-manager/modules/waybar/style.css @@ -58,13 +58,13 @@ window#waybar { #workspaces button, #tags button { background: @Black; - color: @White; + color: @Green; padding: 0px 0px; } #workspaces button.focused, #tags button.focused { - background: @Blue; + background: @Green; color: @Black; } diff --git a/home-manager/profiles/common.nix b/home-manager/profiles/common.nix index 0f5f2dfe..f78795fc 100644 --- a/home-manager/profiles/common.nix +++ b/home-manager/profiles/common.nix @@ -28,7 +28,7 @@ with lib; overlays = [ flake-self.overlays.default - nur.overlay + nur.overlays.default ]; };