From 8432d7af6d5e6eeda793ef77fcf95159d2b61ce8 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 4 Jun 2024 22:28:54 +0900 Subject: [PATCH 01/14] Testing 24.05 --- flake.lock | 457 +++++++++++++++++++++++++++-------------------------- flake.nix | 8 +- 2 files changed, 237 insertions(+), 228 deletions(-) diff --git a/flake.lock b/flake.lock index 85b8c17d..e643c67c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1689633990, - "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", + "rev": "665b3c6748534eb766c777298721cece9453fdae", "type": "github" }, "original": { @@ -18,39 +18,6 @@ "type": "github" } }, - "base16-alacritty": { - "flake": false, - "locked": { - "lastModified": 1703982197, - "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "type": "github" - } - }, - "base16-alacritty-yaml": { - "flake": false, - "locked": { - "lastModified": 1674275109, - "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - } - }, "base16-fish": { "flake": false, "locked": { @@ -147,29 +114,6 @@ "type": "github" } }, - "beautysh": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1680308980, - "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "compose2nix": { "inputs": { "nixpkgs": [ @@ -233,6 +177,28 @@ "type": "github" } }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "owner": "numtide", + "repo": "devshell", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -240,11 +206,11 @@ ] }, "locked": { - "lastModified": 1717415925, - "narHash": "sha256-KhclrqEQFrDr6Z8WqtvCdqtR7Fg35aMyfk7ANtx34Ys=", + "lastModified": 1717490821, + "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=", "owner": "nix-community", "repo": "disko", - "rev": "b106b5df3654d83197aff4826e3e34a5a5335b1c", + "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1", "type": "github" }, "original": { @@ -521,13 +487,27 @@ } }, "flake-compat_5": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -536,7 +516,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -595,6 +575,42 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-root": { + "locked": { + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "owner": "srid", + "repo": "flake-root", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -667,24 +683,6 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "format-all": { "flake": false, "locked": { @@ -718,6 +716,33 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -744,16 +769,16 @@ "inputs": { "nixpkgs": [ "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -762,6 +787,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -769,21 +811,42 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "plasma-manager", @@ -804,7 +867,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_4": { "inputs": { "nixpkgs": [ "stylix", @@ -812,11 +875,11 @@ ] }, "locked": { - "lastModified": 1700847865, - "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -1018,6 +1081,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts_2", @@ -1198,22 +1282,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1717265169, "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", @@ -1252,11 +1320,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1717396833, - "narHash": "sha256-vklpbXC62iKmpx63PRjQE+wqmencWZ7SICAuE6hy92M=", + "lastModified": 1717485423, + "narHash": "sha256-QmPiUJMZNHNI29nY7AULm5DyyAjJk6V5T4P4sPIS/5c=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "5862330fad43d7d2b973394d519b8d9263f2bb0b", + "rev": "43acde1186982d78810d97762a75a9b9f8ec59e8", "type": "github" }, "original": { @@ -1299,16 +1367,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -1362,11 +1430,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "type": "github" }, "original": { @@ -1378,24 +1446,28 @@ }, "nixvim": { "inputs": { - "beautysh": "beautysh", - "flake-utils": "flake-utils_4", + "devshell": "devshell", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_3", + "flake-root": "flake-root", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1713951100, - "narHash": "sha256-ObeER1qB/i06lk7jQqVp9DdTKnykNaojOVoX9GcCoRc=", + "lastModified": 1717444597, + "narHash": "sha256-8enVHsN7hLn1hPkY1U5Cfr3rzij4FsWRUx4jjHUHZQE=", "owner": "nix-community", "repo": "nixvim", - "rev": "7c59615585f691b560d9522c94d8f3195853ca8e", + "rev": "b7a8b0319098fdbaa719ef4dc375337ec4543c6e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-23.11", "repo": "nixvim", "type": "github" } @@ -1418,11 +1490,11 @@ }, "nur": { "locked": { - "lastModified": 1717452470, - "narHash": "sha256-8sbx/PhdKokC7FzogVk/fDVaKlJp9RNhE53tmSpZJyg=", + "lastModified": 1717504708, + "narHash": "sha256-Gys2zgCYe2XGkb25hM46Oa3TAUPkay+XWUph28ciYVM=", "owner": "nix-community", "repo": "NUR", - "rev": "c4f24fd0d45f73f969e58dfccfea5e5fa068d872", + "rev": "4e7a2f26c246f795ee386acbdd45353c22417e89", "type": "github" }, "original": { @@ -1513,7 +1585,7 @@ }, "plasma-manager": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs-unstable" ] @@ -1532,58 +1604,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "nixvim", - "beautysh", - "utils" - ], - "nixpkgs": [ - "nixvim", - "beautysh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658665240, - "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1714,7 +1734,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1717455931, @@ -1733,29 +1753,27 @@ "stylix": { "inputs": { "base16": "base16", - "base16-alacritty": "base16-alacritty", - "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", - "home-manager": "home-manager_3", + "flake-compat": "flake-compat_7", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716327543, - "narHash": "sha256-hQoxnofg9YqQBs/TUOX6oJAm7EEghFgaDdqK7DD+0T4=", + "lastModified": 1717419189, + "narHash": "sha256-3J6GHIbA0f/bkHc7qxe1JlpgHJFawuC2ZNepYAjToQM=", "owner": "danth", "repo": "stylix", - "rev": "3c8f033fd585835387a754160f47dab0c37ad5ae", + "rev": "c760f63a44a98b2324fdebaee32831b1297172a1", "type": "github" }, "original": { "owner": "danth", - "ref": "release-23.11", "repo": "stylix", "type": "github" } @@ -1850,21 +1868,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1887,6 +1890,27 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "ts-fold": { "flake": false, "locked": { @@ -1921,21 +1945,6 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f76c2f26..b476570e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,18 +2,18 @@ description = "NixOS System Config"; inputs = { # Stable Packages - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-24.05"; # Unstable Packages nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; # home-manager - Dotfile mnagement - add /master at the end to pull from master - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Nix colorizer / themer # TODO: https://github.com/danth/stylix/issues/405 - stylix.url = "github:danth/stylix/release-23.11"; + stylix.url = "github:danth/stylix"; # nixvim - neovim configuration management in nix # TODO: https://github.com/nix-community/nixvim/issues/1551 - nixvim.url = "github:nix-community/nixvim/nixos-23.11"; + nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; # lanzaboote - Secureboot Configuration lanzaboote.url = "github:nix-community/lanzaboote"; From de3631bdd1c044716e3ee58e86d38d8a7356a15e Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 5 Jun 2024 09:55:57 +0900 Subject: [PATCH 02/14] Move laptop to Plasm --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b476570e..17392f79 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ framework-server = libx.mkHost { hostname = "framework-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "hyprland"; theme = "green"; }; - nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "green"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; }; backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; @@ -77,7 +77,7 @@ "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "hyprland"; theme = "green"; }; - "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; }; + "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; }; "albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; From 3b61fb0a95e232809f6b40b75b69c1323e4b1098 Mon Sep 17 00:00:00 2001 From: albert Date: Thu, 6 Jun 2024 21:43:14 +0900 Subject: [PATCH 03/14] Update Plasma --- .../common/desktops/plasma6/default.nix | 1 - .../desktops/plasma6/default.nix | 6 +- .../desktops/plasma6/plasma-manager.nix | 0 .../desktops/plasma6/default.nix | 6 +- .../desktops/plasma6/plasma-manager.nix | 320 ++++++++++++++++++ 5 files changed, 328 insertions(+), 5 deletions(-) rename home-manager/{common => hosts/nixos-desktop}/desktops/plasma6/plasma-manager.nix (100%) create mode 100644 home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix diff --git a/home-manager/common/desktops/plasma6/default.nix b/home-manager/common/desktops/plasma6/default.nix index da2bdc60..e704d598 100644 --- a/home-manager/common/desktops/plasma6/default.nix +++ b/home-manager/common/desktops/plasma6/default.nix @@ -1,7 +1,6 @@ { inputs, pkgs, ... }: { imports = [ inputs.plasma-manager.homeManagerModules.plasma-manager - ./plasma-manager.nix ]; # Add the Firefox integrations diff --git a/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix b/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix index 0db3279e..5a90ae95 100644 --- a/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix +++ b/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix @@ -1,3 +1,5 @@ -{ - +{ ... }: { + imports = [ + ./plasma-manager.nix + ]; } diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/hosts/nixos-desktop/desktops/plasma6/plasma-manager.nix similarity index 100% rename from home-manager/common/desktops/plasma6/plasma-manager.nix rename to home-manager/hosts/nixos-desktop/desktops/plasma6/plasma-manager.nix diff --git a/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix b/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix index 0db3279e..5a90ae95 100644 --- a/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/default.nix @@ -1,3 +1,5 @@ -{ - +{ ... }: { + imports = [ + ./plasma-manager.nix + ]; } diff --git a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix new file mode 100644 index 00000000..49a8b183 --- /dev/null +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix @@ -0,0 +1,320 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-0bf1ae9c-755f-46e4-9598-f826be1dc9aa" = [ ]; + "ActivityManager"."switch-to-activity-58ba9d93-72ae-4de8-8ee6-92ce0e189538" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = "Touchpad Toggle"; + "kded6"."display" = ["Display" "Meta+P"]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."decrease_volume_small" = "Shift+Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."increase_volume_small" = "Shift+Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot" = [ ]; + "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Shut Down" = [ ]; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cycle Overview" = "Meta+Tab"; + "kwin"."Cycle Overview Opposite" = "Meta+Shift+Tab"; + "kwin"."Decrease Opacity" = [ ]; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Grid View" = "Meta+G"; + "kwin"."Increase Opacity" = [ ]; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = [ ]; + "kwin"."Switch to Desktop 11" = [ ]; + "kwin"."Switch to Desktop 12" = [ ]; + "kwin"."Switch to Desktop 13" = [ ]; + "kwin"."Switch to Desktop 14" = [ ]; + "kwin"."Switch to Desktop 15" = [ ]; + "kwin"."Switch to Desktop 16" = [ ]; + "kwin"."Switch to Desktop 17" = [ ]; + "kwin"."Switch to Desktop 18" = [ ]; + "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = [ ]; + "kwin"."Switch to Desktop 6" = [ ]; + "kwin"."Switch to Desktop 7" = [ ]; + "kwin"."Switch to Desktop 8" = [ ]; + "kwin"."Switch to Desktop 9" = [ ]; + "kwin"."Switch to Next Desktop" = [ ]; + "kwin"."Switch to Next Screen" = [ ]; + "kwin"."Switch to Previous Desktop" = [ ]; + "kwin"."Switch to Previous Screen" = [ ]; + "kwin"."Switch to Screen 0" = [ ]; + "kwin"."Switch to Screen 1" = [ ]; + "kwin"."Switch to Screen 2" = [ ]; + "kwin"."Switch to Screen 3" = [ ]; + "kwin"."Switch to Screen 4" = [ ]; + "kwin"."Switch to Screen 5" = [ ]; + "kwin"."Switch to Screen 6" = [ ]; + "kwin"."Switch to Screen 7" = [ ]; + "kwin"."Switch to Screen Above" = [ ]; + "kwin"."Switch to Screen Below" = [ ]; + "kwin"."Switch to Screen to the Left" = [ ]; + "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = [ ]; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; + "kwin"."Walk Through Windows Alternative" = [ ]; + "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "kwin"."Window Above Other Windows" = [ ]; + "kwin"."Window Below Other Windows" = [ ]; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = [ ]; + "kwin"."Window Grow Horizontal" = [ ]; + "kwin"."Window Grow Vertical" = [ ]; + "kwin"."Window Lower" = [ ]; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = [ ]; + "kwin"."Window Maximize Vertical" = [ ]; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = [ ]; + "kwin"."Window Move Center" = [ ]; + "kwin"."Window No Border" = [ ]; + "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = [ ]; + "kwin"."Window One Screen Up" = [ ]; + "kwin"."Window One Screen to the Left" = [ ]; + "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = [ ]; + "kwin"."Window Pack Left" = [ ]; + "kwin"."Window Pack Right" = [ ]; + "kwin"."Window Pack Up" = [ ]; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = [ ]; + "kwin"."Window Quick Tile Bottom Right" = [ ]; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = [ ]; + "kwin"."Window Quick Tile Top Right" = [ ]; + "kwin"."Window Raise" = [ ]; + "kwin"."Window Resize" = [ ]; + "kwin"."Window Shade" = [ ]; + "kwin"."Window Shrink Horizontal" = [ ]; + "kwin"."Window Shrink Vertical" = [ ]; + "kwin"."Window to Desktop 1" = [ ]; + "kwin"."Window to Desktop 10" = [ ]; + "kwin"."Window to Desktop 11" = [ ]; + "kwin"."Window to Desktop 12" = [ ]; + "kwin"."Window to Desktop 13" = [ ]; + "kwin"."Window to Desktop 14" = [ ]; + "kwin"."Window to Desktop 15" = [ ]; + "kwin"."Window to Desktop 16" = [ ]; + "kwin"."Window to Desktop 17" = [ ]; + "kwin"."Window to Desktop 18" = [ ]; + "kwin"."Window to Desktop 19" = [ ]; + "kwin"."Window to Desktop 2" = [ ]; + "kwin"."Window to Desktop 20" = [ ]; + "kwin"."Window to Desktop 3" = [ ]; + "kwin"."Window to Desktop 4" = [ ]; + "kwin"."Window to Desktop 5" = [ ]; + "kwin"."Window to Desktop 6" = [ ]; + "kwin"."Window to Desktop 7" = [ ]; + "kwin"."Window to Desktop 8" = [ ]; + "kwin"."Window to Desktop 9" = [ ]; + "kwin"."Window to Next Desktop" = [ ]; + "kwin"."Window to Next Screen" = "Meta+Shift+Right"; + "kwin"."Window to Previous Desktop" = [ ]; + "kwin"."Window to Previous Screen" = "Meta+Shift+Left"; + "kwin"."Window to Screen 0" = [ ]; + "kwin"."Window to Screen 1" = [ ]; + "kwin"."Window to Screen 2" = [ ]; + "kwin"."Window to Screen 3" = [ ]; + "kwin"."Window to Screen 4" = [ ]; + "kwin"."Window to Screen 5" = [ ]; + "kwin"."Window to Screen 6" = [ ]; + "kwin"."Window to Screen 7" = [ ]; + "kwin"."view_actual_size" = [ ]; + "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = "Meta+0"; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = [ ]; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = [ ]; + "plasmashell"."cyclePrevAction" = [ ]; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+A"; + "plasmashell"."previous activity" = "Meta+Shift+A"; + "plasmashell"."repeat_action" = [ ]; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = [ ]; + "plasmashell"."switch to previous activity" = [ ]; + "plasmashell"."toggle do not disturb" = [ ]; + "services/org.kde.kscreen.desktop"."ShowOSD" = [ ]; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.tfstate*,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.terraform,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 9; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "kactivitymanagerdrc"."activities"."0bf1ae9c-755f-46e4-9598-f826be1dc9aa" = "Default"; + "kactivitymanagerdrc"."activities"."58ba9d93-72ae-4de8-8ee6-92ce0e189538" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "0bf1ae9c-755f-46e4-9598-f826be1dc9aa"; + "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."ClickMethod" = 2; + "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."TapDragLock" = true; + "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; + "kcminputrc"."Mouse"."XLbInptAccelProfileFlat" = false; + "kcminputrc"."Mouse"."XLbInptPointerAcceleration" = "-0.6"; + "kcminputrc"."Mouse"."cursorTheme" = "ePapirus"; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kdeglobals"."General"."AccentColor" = "153,119,68"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; + "kdeglobals"."General"."accentColorFromWallpaper" = true; + "kdeglobals"."KDE"."SingleClick" = true; + "kdeglobals"."KDE"."widgetStyle" = "Breeze"; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 140; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KScreen"."ScreenScaleFactors" = "eDP-1=1;"; + "kdeglobals"."KScreen"."XwaylandClientsScale" = false; + "kdeglobals"."WM"."activeBackground" = "39,46,51"; + "kdeglobals"."WM"."activeBlend" = "219,188,127"; + "kdeglobals"."WM"."activeForeground" = "211,198,170"; + "kdeglobals"."WM"."inactiveBackground" = "39,46,51"; + "kdeglobals"."WM"."inactiveBlend" = "133,146,137"; + "kdeglobals"."WM"."inactiveForeground" = "211,198,170"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."kded6"."_k_friendly_name" = "kded6"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "System Settings"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; + "kscreenlockerrc"."Greeter/LnF/General"."showMediaControls" = false; + "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."Image" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; + "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."PreviewImage" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; + "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."SlidePaths" = "/run/current-system/sw/share/wallpapers/"; + "kscreenlockerrc"."Greeter/Wallpaper/org/kde/potd/General"."Provider" = "simonstalenhag"; + "ksplashrc"."KSplash"."Engine" = "none"; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "6397510c-04f5-4aaf-bff9-66cea108b111"; + "kwinrc"."Desktops"."Id_2" = "99b48444-5d80-4ea3-9602-35235349b6f9"; + "kwinrc"."Desktops"."Number" = 2; + "kwinrc"."Desktops"."Rows" = 1; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeAuto" = 35.01; + "kwinrc"."NightColor"."LongitudeAuto" = 135.75; + "kwinrc"."Plugins"."desktopchangeosdEnabled" = true; + "kwinrc"."Script-desktopchangeosd"."PopupHideDelay" = 250; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling/4fd0826e-0002-536e-8946-e04871dbcd09"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.6890625000000009},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.3109374999999991}]}"; + "kwinrc"."Tiling/8fb41a9a-cf1b-523a-8368-54507f6885e6"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.6910156249999999},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.3089843750000001}]}"; + "kwinrc"."Tiling/91ea1083-8eb3-59af-b2ce-03778d8cef2a"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.36484375},{\"width\":0.635156249999999}]}"; + "kwinrc"."Tiling/d67b1509-69a3-585f-adcc-1048a4265c4f"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/e5159c0a-c653-5a64-a969-4b3420493375"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.3679687499999998},{\"width\":0.6320312499999998}]}"; + "kwinrc"."org/kde/kdecoration2"."BorderSize" = "None"; + "kwinrc"."org/kde/kdecoration2"."BorderSizeAuto" = false; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasmarc"."Theme"."name" = "Arc-Color"; + "plasmarc"."Wallpapers"."usersWallpapers" = "/etc/nixos/git/wallpapers/default/wallpaper1.png,/nix/store/ix6w9j5y3pzmf8fqw75cbhbz8mrlkfkx-stylix-kde-theme/share/wallpapers/stylix/"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + }; +} From ade5e47e943b1b2b726b65f8b966f1a51e9d217b Mon Sep 17 00:00:00 2001 From: albert Date: Thu, 6 Jun 2024 21:46:38 +0900 Subject: [PATCH 04/14] Update --- home-manager/common/software/cli/nixvim.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix index c17f468a..85dc9c98 100644 --- a/home-manager/common/software/cli/nixvim.nix +++ b/home-manager/common/software/cli/nixvim.nix @@ -50,7 +50,6 @@ pylsp = { enable = true; autostart = true; - installLanguageServer = true; settings = { plugins = { black = { From 30a00890faf944607d98d998ac4a94d16a443e60 Mon Sep 17 00:00:00 2001 From: albert Date: Thu, 6 Jun 2024 22:01:33 +0900 Subject: [PATCH 05/14] Update home-manager items --- home-manager/common/software/cli/btop.nix | 3 - .../common/software/cli/nixvim/base.nix | 18 ++--- .../common/software/cli/nixvim/cmp.nix | 77 ++++++++----------- 3 files changed, 43 insertions(+), 55 deletions(-) diff --git a/home-manager/common/software/cli/btop.nix b/home-manager/common/software/cli/btop.nix index 1cab803e..843e51e4 100644 --- a/home-manager/common/software/cli/btop.nix +++ b/home-manager/common/software/cli/btop.nix @@ -1,8 +1,5 @@ { ... }: { programs.btop = { enable = true; - settings = { - color_theme = "TTY"; - }; }; } diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix index be094e23..8051550d 100644 --- a/home-manager/common/software/cli/nixvim/base.nix +++ b/home-manager/common/software/cli/nixvim/base.nix @@ -196,39 +196,39 @@ keymaps = { "" = { action = "find_files"; - desc = "Search files by name"; + options.desc = "Search files by name"; }; "s" = { action = "live_grep"; - desc = "Search by live grep"; + options.desc = "Search by live grep"; }; "bl" = { action = "buffers"; - desc = "[L]list open [B]uffers"; + options.desc = "[L]list open [B]uffers"; }; "h" = { action = "help_tags"; - desc = "Search [H]elp"; + options.desc = "Search [H]elp"; }; "W" = { action = "grep_string"; - desc = "Search for [W]ord under cursor"; + options.desc = "Search for [W]ord under cursor"; }; "gs" = { action = "git_status"; - desc = "Search [G]it [S]tatus"; + options.desc = "Search [G]it [S]tatus"; }; "gl" = { action = "git_commits"; - desc = "View [G]it [L]ogs"; + options.desc = "View [G]it [L]ogs"; }; "r" = { action = "oldfiles"; - desc = "Search [R]ecently opened files by name"; + options.desc = "Search [R]ecently opened files by name"; }; "cs" = { action = "colorscheme"; - desc = "Change [C]olor[s]cheme"; + options.desc = "Change [C]olor[s]cheme"; }; }; }; diff --git a/home-manager/common/software/cli/nixvim/cmp.nix b/home-manager/common/software/cli/nixvim/cmp.nix index b1cfc3a2..fd9f9f47 100644 --- a/home-manager/common/software/cli/nixvim/cmp.nix +++ b/home-manager/common/software/cli/nixvim/cmp.nix @@ -10,6 +10,19 @@ cmp-nvim-lsp-document-symbol.enable = true; cmp-nvim-lsp-signature-help.enable = true; + cmp.settings = { + sources = [ + { name = "nvim_lua"; } + { name = "nvim_lsp"; } + { name = "calc"; } + { name = "path"; } + { name = "buffer"; } + { name = "luasnip"; } + ]; + snippet.expand = "luasnip"; + + }; + nvim-cmp = { enable = true; autoEnableSources = true; @@ -19,50 +32,28 @@ "" = "cmp.mapping.close()"; "" = "cmp.mapping.scroll_docs(4)"; "" = "cmp.mapping.confirm({ select = true })"; - "" = { - action = "cmp.mapping.select_prev_item()"; - modes = [ - "i" - "s" - ]; - }; - "" = { - action = "cmp.mapping.select_next_item()"; - modes = [ - "i" - "s" - ]; - }; + "" = "cmp.mapping.select_prev_item()"; + "" = "cmp.mapping.select_next_item()"; }; - sources = [ - { name = "nvim_lua"; } - { name = "nvim_lsp"; } -# { name = "nvim_lsp_signature_help"; } - { name = "calc"; } - { name = "path"; } - { name = "buffer"; } - { name = "luasnip"; } - ]; - snippet.expand = "luasnip"; - window = { - completion.border = "rounded"; - documentation.border = "rounded"; - }; - formatting = { - fields = [ "menu" "abbr" "kind" ]; - # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/ - format = '' - function(entry, item) - local menu_icon = { - nvim_lsp = 'λ', - luasnip = '⋗', - buffer = 'Ω', - path = '🖫', - } - item.menu = menu_icon[entry.source.name] - return item - end, - ''; + window = { + completion.border = "rounded"; + documentation.border = "rounded"; + }; + formatting = { + fields = [ "menu" "abbr" "kind" ]; + # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/ + format = '' + function(entry, item) + local menu_icon = { + nvim_lsp = 'λ', + luasnip = '⋗', + buffer = 'Ω', + path = '🖫', + } + item.menu = menu_icon[entry.source.name] + return item + end, + ''; }; }; }; From e943ee9688e839c50e1c0858e37547eed29263f7 Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 10:31:53 +0900 Subject: [PATCH 06/14] Update stylix theme --- flake.nix | 4 ++-- .../common/software/cli/nixvim/base.nix | 3 +-- stylix/themes/stylix-day/default.nix | 10 ++++++++++ .../themes/stylix-day/home-manager/nixvim.nix | 4 ++++ stylix/themes/stylix-day/sakura-night.yaml | 18 ++++++++++++++++++ stylix/themes/stylix/default.nix | 2 +- 6 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 stylix/themes/stylix-day/default.nix create mode 100644 stylix/themes/stylix-day/home-manager/nixvim.nix create mode 100644 stylix/themes/stylix-day/sakura-night.yaml diff --git a/flake.nix b/flake.nix index 17392f79..e098e7f4 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ framework-server = libx.mkHost { hostname = "framework-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "hyprland"; theme = "green"; }; - nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; theme = "stylix-day"; }; backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; @@ -77,7 +77,7 @@ "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "hyprland"; theme = "green"; }; - "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; }; + "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; theme = "stylix-day";}; "albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix index 8051550d..e4ac8eac 100644 --- a/home-manager/common/software/cli/nixvim/base.nix +++ b/home-manager/common/software/cli/nixvim/base.nix @@ -43,8 +43,7 @@ # pretty stuff # Fancify markdown et al - # TODO Re-enable this after 24.05 - # headlines.enable = true; + headlines.enable = true; # Rainbow matching {} [] () 's rainbow-delimiters.enable = true; # Colorize hex colors inline diff --git a/stylix/themes/stylix-day/default.nix b/stylix/themes/stylix-day/default.nix new file mode 100644 index 00000000..17bf61ba --- /dev/null +++ b/stylix/themes/stylix-day/default.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: { + # Themes https://github.com/tinted-theming/base16-schemes + stylix = { + image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; + polarity = "light"; + # base16Scheme = ./sakura-night.yaml; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; + autoEnable = true; + }; +} diff --git a/stylix/themes/stylix-day/home-manager/nixvim.nix b/stylix/themes/stylix-day/home-manager/nixvim.nix new file mode 100644 index 00000000..b51eda1b --- /dev/null +++ b/stylix/themes/stylix-day/home-manager/nixvim.nix @@ -0,0 +1,4 @@ +{ lib, ... }: { + programs.nixvim.colorscheme = lib.mkForce "ayu-mirage"; + stylix.targets.nixvim.enable = false; +} diff --git a/stylix/themes/stylix-day/sakura-night.yaml b/stylix/themes/stylix-day/sakura-night.yaml new file mode 100644 index 00000000..a4ff1ca5 --- /dev/null +++ b/stylix/themes/stylix-day/sakura-night.yaml @@ -0,0 +1,18 @@ +scheme: "Rosé Pine Moon" +variant: "dark" +base00: "232136" +base01: "2a273f" +base02: "393552" +base03: "6e6a86" +base04: "908caa" +base05: "e0def4" +base06: "e0def4" +base07: "56526e" +base08: "eb6f92" +base09: "f6c177" +base0A: "ea9a97" +base0B: "3e8fb0" +base0C: "9ccfd8" +base0D: "c4a7e7" +base0E: "f6c177" +base0F: "56526e" diff --git a/stylix/themes/stylix/default.nix b/stylix/themes/stylix/default.nix index de977e00..55f087a7 100644 --- a/stylix/themes/stylix/default.nix +++ b/stylix/themes/stylix/default.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; polarity = "dark"; # base16Scheme = ./sakura-night.yaml; base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; From 85fe08ea94362b62ddc4988427685dcb0c41c5bf Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 10:35:13 +0900 Subject: [PATCH 07/14] Nix FLake Update --- flake.lock | 170 +++++++++++++++++++++++------------------------------ 1 file changed, 75 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index e643c67c..80772350 100644 --- a/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1711299236, - "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=", + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", "owner": "ipetkov", "repo": "crane", - "rev": "880573f80d09e18a11713f402b9e6172a085449f", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1717490821, - "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=", + "lastModified": 1717770040, + "narHash": "sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds=", "owner": "nix-community", "repo": "disko", - "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1", + "rev": "398acc470f7c2d68621db01900f053e6000129c4", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1716813977, - "narHash": "sha256-8fabA8OY1n2OcJFbbE03+bMydVANSBrNGo8hkzhXxxU=", + "lastModified": 1717591035, + "narHash": "sha256-xtrHrY2H23jlqOPY/fp0n13vaQkJl4bBAZHQ6T7lVMU=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "8171c0578feb835ce66d49edba7429f46b7ac3f6", + "rev": "bec5a54900e92fb8d4ce6064eab6a1dce517a06b", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -583,11 +583,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -596,21 +596,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -730,11 +715,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -811,11 +796,11 @@ ] }, "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { @@ -833,11 +818,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -927,11 +912,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1717447622, - "narHash": "sha256-OB+toSK7AvQQOpBGllMG8OQ/ieR8PaYST8/ZUNHYK4A=", + "lastModified": 1717784649, + "narHash": "sha256-Yqdk5sUODNh8QxOVVb5UVvv4a0Yl/uU6p98y7OeK4R8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d0a224a4915b5a90555818ed3f9e49e1a61b7cdb", + "rev": "c31d9ef4172452f6f219f91d9b87a24d91f0cf3a", "type": "github" }, "original": { @@ -1023,11 +1008,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1717439743, - "narHash": "sha256-XRO2Arpv3Nz/Fq+ANARSEH5TFm3P3QXkO047pM2XoVU=", + "lastModified": 1717685136, + "narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b25da5844380b871611dd608a12b9f5c0126d833", + "rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52", "type": "github" }, "original": { @@ -1049,11 +1034,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716805126, - "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=", + "lastModified": 1717801791, + "narHash": "sha256-CEotbHLdhkltv8OsHojqN1cJynVMNOX+0lJgqIoD6Gk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2", + "rev": "e8850266af6aedfd73c46c7518fd54c1f6c89e7b", "type": "github" }, "original": { @@ -1110,11 +1095,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715804156, - "narHash": "sha256-GtIHP86Cz1kD9xZO/cKbNQACHKdoT9WFbLJAq6W2EDY=", + "lastModified": 1717698186, + "narHash": "sha256-e3/cvm7bAn0RsTBcPfHwuYOi2lwoO4jpTn4nmMSvHfU=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "bb95091f6c6f38f6cfc215a1797a2dd466312c8b", + "rev": "b6169e08e76e10b673d1b54f944cddb1e7cbea97", "type": "github" }, "original": { @@ -1221,11 +1206,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717248095, - "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", "type": "github" }, "original": { @@ -1299,11 +1284,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1320,11 +1305,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1717485423, - "narHash": "sha256-QmPiUJMZNHNI29nY7AULm5DyyAjJk6V5T4P4sPIS/5c=", + "lastModified": 1717784639, + "narHash": "sha256-AfyQclkLlsyGIzP0gLzvFtBDxdO3a/QtJxzRr5WB5m0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "43acde1186982d78810d97762a75a9b9f8ec59e8", + "rev": "3dac7060bfd7896e31d623a7bc88bd89d380c007", "type": "github" }, "original": { @@ -1367,11 +1352,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717281328, - "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { @@ -1398,11 +1383,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1449,7 +1434,6 @@ "devshell": "devshell", "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_3", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -1459,11 +1443,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1717444597, - "narHash": "sha256-8enVHsN7hLn1hPkY1U5Cfr3rzij4FsWRUx4jjHUHZQE=", + "lastModified": 1717799968, + "narHash": "sha256-NvmBPOpaf2z8aId+stIJK3/URuc4EaL3KeurKkHTxRA=", "owner": "nix-community", "repo": "nixvim", - "rev": "b7a8b0319098fdbaa719ef4dc375337ec4543c6e", + "rev": "552e8b0a8551acc43292d06258829fe0621980e2", "type": "github" }, "original": { @@ -1490,11 +1474,11 @@ }, "nur": { "locked": { - "lastModified": 1717504708, - "narHash": "sha256-Gys2zgCYe2XGkb25hM46Oa3TAUPkay+XWUph28ciYVM=", + "lastModified": 1717805329, + "narHash": "sha256-/QfJN9PkD0HAXCbn46uI0hcbzwNvC3U95V7NJ0RuZSs=", "owner": "nix-community", "repo": "NUR", - "rev": "4e7a2f26c246f795ee386acbdd45353c22417e89", + "rev": "c170f285f35b652f95606e62350dd8ae2829b39e", "type": "github" }, "original": { @@ -1591,11 +1575,11 @@ ] }, "locked": { - "lastModified": 1717443725, - "narHash": "sha256-bvhTezHwQlC80TnfphJL0Fsjnz6u69bkCkqhgMHK5vY=", + "lastModified": 1717666468, + "narHash": "sha256-SKPMh/Apjk3DhY0B/SqTvmt1/UFf2AHwoVPTGA6Md9c=", "owner": "pjones", "repo": "plasma-manager", - "rev": "82da66c417fc9775675fd6ffd6fffa7dce2e3f28", + "rev": "d982fe0063be13bbe57a0c4ace8b406236812b94", "type": "github" }, "original": { @@ -1610,10 +1594,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1622,11 +1602,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1702,11 +1682,11 @@ ] }, "locked": { - "lastModified": 1711246447, - "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=", + "lastModified": 1717726729, + "narHash": "sha256-2WDKLjVRKWXbadnJHSOUb46PTq3D5nS89vhHTphRw1M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4", + "rev": "7f52ac9ae95bd60c0780d6e32baea22e542e11e1", "type": "github" }, "original": { @@ -1765,11 +1745,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1717419189, - "narHash": "sha256-3J6GHIbA0f/bkHc7qxe1JlpgHJFawuC2ZNepYAjToQM=", + "lastModified": 1717593209, + "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", "owner": "danth", "repo": "stylix", - "rev": "c760f63a44a98b2324fdebaee32831b1297172a1", + "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", "type": "github" }, "original": { @@ -1898,11 +1878,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717278143, + "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", "type": "github" }, "original": { From 3971a495f5be69cf9ef082ef6dad091409c1cc8d Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 11:58:08 +0900 Subject: [PATCH 08/14] update --- .../desktops/plasma6/plasma-manager.nix | 32 ++++++++++++------- stylix/themes/stylix-day/default.nix | 5 ++- stylix/themes/stylix-day/sakura-night.yaml | 18 ----------- stylix/themes/stylix/default.nix | 1 - stylix/themes/stylix/sakura-night.yaml | 18 ----------- 5 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 stylix/themes/stylix-day/sakura-night.yaml delete mode 100644 stylix/themes/stylix/sakura-night.yaml diff --git a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix index 49a8b183..f9cb9e71 100644 --- a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix @@ -240,12 +240,15 @@ "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."ClickMethod" = 2; "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."NaturalScroll" = true; "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."TapDragLock" = true; + "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAcceleration" = 0.000; + "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAccelerationProfile" = 1; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; "kcminputrc"."Mouse"."XLbInptAccelProfileFlat" = false; "kcminputrc"."Mouse"."XLbInptPointerAcceleration" = "-0.6"; "kcminputrc"."Mouse"."cursorTheme" = "ePapirus"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; - "kdeglobals"."General"."AccentColor" = "153,119,68"; + "kdeglobals"."General"."AccentColor" = "168,58,175"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."accentColorFromWallpaper" = true; "kdeglobals"."KDE"."SingleClick" = true; @@ -270,12 +273,12 @@ "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; "kdeglobals"."KScreen"."ScreenScaleFactors" = "eDP-1=1;"; "kdeglobals"."KScreen"."XwaylandClientsScale" = false; - "kdeglobals"."WM"."activeBackground" = "39,46,51"; - "kdeglobals"."WM"."activeBlend" = "219,188,127"; - "kdeglobals"."WM"."activeForeground" = "211,198,170"; - "kdeglobals"."WM"."inactiveBackground" = "39,46,51"; - "kdeglobals"."WM"."inactiveBlend" = "133,146,137"; - "kdeglobals"."WM"."inactiveForeground" = "211,198,170"; + "kdeglobals"."WM"."activeBackground" = "231,232,235"; + "kdeglobals"."WM"."activeBlend" = "231,232,235"; + "kdeglobals"."WM"."activeForeground" = "92,97,108"; + "kdeglobals"."WM"."inactiveBackground" = "231,232,235"; + "kdeglobals"."WM"."inactiveBlend" = "231,232,235"; + "kdeglobals"."WM"."inactiveForeground" = "163,165,172"; "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; @@ -283,20 +286,23 @@ "kglobalshortcutsrc"."kded6"."_k_friendly_name" = "kded6"; "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "System Settings"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; + "krunnerrc"."General"."FreeFloating" = true; "kscreenlockerrc"."Greeter/LnF/General"."showMediaControls" = false; + "kscreenlockerrc"."Greeter/Wallpaper/org.kde.potd/General"."Provider" = "noaa"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."Image" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."PreviewImage" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."SlidePaths" = "/run/current-system/sw/share/wallpapers/"; "kscreenlockerrc"."Greeter/Wallpaper/org/kde/potd/General"."Provider" = "simonstalenhag"; - "ksplashrc"."KSplash"."Engine" = "none"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "6397510c-04f5-4aaf-bff9-66cea108b111"; "kwinrc"."Desktops"."Id_2" = "99b48444-5d80-4ea3-9602-35235349b6f9"; - "kwinrc"."Desktops"."Number" = 2; + "kwinrc"."Desktops"."Id_3" = "4a2ae169-0b7e-43ed-97c6-8a2d55b0a379"; + "kwinrc"."Desktops"."Id_4" = "2bca1e94-a84d-4514-a2c8-a7acfaf10371"; + "kwinrc"."Desktops"."Number" = 4; "kwinrc"."Desktops"."Rows" = 1; "kwinrc"."NightColor"."Active" = true; "kwinrc"."NightColor"."LatitudeAuto" = 35.01; @@ -309,10 +315,14 @@ "kwinrc"."Tiling/91ea1083-8eb3-59af-b2ce-03778d8cef2a"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.36484375},{\"width\":0.635156249999999}]}"; "kwinrc"."Tiling/d67b1509-69a3-585f-adcc-1048a4265c4f"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling/e5159c0a-c653-5a64-a969-4b3420493375"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.3679687499999998},{\"width\":0.6320312499999998}]}"; + "kwinrc"."Windows"."ElectricBorders" = 1; + "kwinrc"."org.kde.kdecoration2"."BorderSize" = "None"; + "kwinrc"."org.kde.kdecoration2"."BorderSizeAuto" = false; + "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft" = "M"; "kwinrc"."org/kde/kdecoration2"."BorderSize" = "None"; "kwinrc"."org/kde/kdecoration2"."BorderSizeAuto" = false; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasmarc"."Theme"."name" = "Arc-Color"; + "plasmarc"."Theme"."name" = "Arc-Dark"; "plasmarc"."Wallpapers"."usersWallpapers" = "/etc/nixos/git/wallpapers/default/wallpaper1.png,/nix/store/ix6w9j5y3pzmf8fqw75cbhbz8mrlkfkx-stylix-kde-theme/share/wallpapers/stylix/"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; diff --git a/stylix/themes/stylix-day/default.nix b/stylix/themes/stylix-day/default.nix index 17bf61ba..d19b6efd 100644 --- a/stylix/themes/stylix-day/default.nix +++ b/stylix/themes/stylix-day/default.nix @@ -2,9 +2,8 @@ # Themes https://github.com/tinted-theming/base16-schemes stylix = { image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; - polarity = "light"; - # base16Scheme = ./sakura-night.yaml; - base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave-light.yaml"; + polarity = "light"; autoEnable = true; }; } diff --git a/stylix/themes/stylix-day/sakura-night.yaml b/stylix/themes/stylix-day/sakura-night.yaml deleted file mode 100644 index a4ff1ca5..00000000 --- a/stylix/themes/stylix-day/sakura-night.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Rosé Pine Moon" -variant: "dark" -base00: "232136" -base01: "2a273f" -base02: "393552" -base03: "6e6a86" -base04: "908caa" -base05: "e0def4" -base06: "e0def4" -base07: "56526e" -base08: "eb6f92" -base09: "f6c177" -base0A: "ea9a97" -base0B: "3e8fb0" -base0C: "9ccfd8" -base0D: "c4a7e7" -base0E: "f6c177" -base0F: "56526e" diff --git a/stylix/themes/stylix/default.nix b/stylix/themes/stylix/default.nix index 55f087a7..c424b75e 100644 --- a/stylix/themes/stylix/default.nix +++ b/stylix/themes/stylix/default.nix @@ -3,7 +3,6 @@ stylix = { image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; polarity = "dark"; - # base16Scheme = ./sakura-night.yaml; base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; autoEnable = true; }; diff --git a/stylix/themes/stylix/sakura-night.yaml b/stylix/themes/stylix/sakura-night.yaml deleted file mode 100644 index a4ff1ca5..00000000 --- a/stylix/themes/stylix/sakura-night.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Rosé Pine Moon" -variant: "dark" -base00: "232136" -base01: "2a273f" -base02: "393552" -base03: "6e6a86" -base04: "908caa" -base05: "e0def4" -base06: "e0def4" -base07: "56526e" -base08: "eb6f92" -base09: "f6c177" -base0A: "ea9a97" -base0B: "3e8fb0" -base0C: "9ccfd8" -base0D: "c4a7e7" -base0E: "f6c177" -base0F: "56526e" From da03f1120ab9ec05f673a60db9ebce23722b043e Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 16:13:44 +0900 Subject: [PATCH 09/14] update --- home-manager/common/software/gui/firefox.nix | 2 +- .../desktops/plasma6/plasma-manager.nix | 30 +++++++++---------- stylix/themes/green/default.nix | 2 +- stylix/themes/gruvbox/default.nix | 4 +-- stylix/themes/sakura-day/default.nix | 3 +- stylix/themes/sakura-night/default.nix | 3 +- stylix/themes/tokyo-day/default.nix | 4 +-- stylix/themes/tokyo-night/default.nix | 4 +-- 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix index 526dd577..783f0c25 100644 --- a/home-manager/common/software/gui/firefox.nix +++ b/home-manager/common/software/gui/firefox.nix @@ -526,7 +526,7 @@ * could have been revoked) and/or you could be under attack (e.g. malicious blocking of OCSP servers) * [1] https://blog.mozilla.org/security/2013/07/29/ocsp-stapling-in-firefox/ * [2] https://www.imperialviolet.org/2014/04/19/revchecking.html ***/ - user_pref("security.OCSP.require", true); + user_pref("security.OCSP.require", false); /** CERTS / HPKP (HTTP Public Key Pinning) ***/ /* 1223: enable strict PKP (Public Key Pinning) diff --git a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix index f9cb9e71..5b800972 100644 --- a/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix @@ -10,17 +10,17 @@ "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = "Touchpad Toggle"; - "kded6"."display" = ["Display" "Meta+P"]; + "kded6"."display" = ["" "Display" "Meta+P"]; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["" "Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; "ksmserver"."Halt Without Confirmation" = [ ]; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Lock Session" = ["" "Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; "ksmserver"."Log Out Without Confirmation" = [ ]; "ksmserver"."Reboot" = [ ]; @@ -32,7 +32,7 @@ "kwin"."Decrease Opacity" = [ ]; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["" "Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid View" = "Meta+G"; @@ -177,7 +177,7 @@ "kwin"."Window to Screen 6" = [ ]; "kwin"."Window to Screen 7" = [ ]; "kwin"."view_actual_size" = [ ]; - "kwin"."view_zoom_in" = ["Meta++" "Meta+="]; + "kwin"."view_zoom_in" = ["" "Meta++" "Meta+\x3d"]; "kwin"."view_zoom_out" = "Meta+-"; "mediacontrol"."mediavolumedown" = [ ]; "mediacontrol"."mediavolumeup" = [ ]; @@ -199,7 +199,7 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = [ ]; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; + "org_kde_powerdevil"."powerProfile" = ["" "Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; "plasmashell"."activate task manager entry 10" = "Meta+0"; "plasmashell"."activate task manager entry 2" = "Meta+2"; @@ -240,7 +240,7 @@ "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."ClickMethod" = 2; "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."NaturalScroll" = true; "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad"."TapDragLock" = true; - "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAcceleration" = 0.000; + "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAcceleration" = 0.0; "kcminputrc"."Libinput/273/6202/SteelSeries Aerox 3 Wireless Mouse"."PointerAccelerationProfile" = 1; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; "kcminputrc"."Mouse"."XLbInptAccelProfileFlat" = false; @@ -248,11 +248,10 @@ "kcminputrc"."Mouse"."cursorTheme" = "ePapirus"; "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; - "kdeglobals"."General"."AccentColor" = "168,58,175"; + "kdeglobals"."General"."AccentColor" = "168,57,175"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."accentColorFromWallpaper" = true; "kdeglobals"."KDE"."SingleClick" = true; - "kdeglobals"."KDE"."widgetStyle" = "Breeze"; "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; @@ -273,12 +272,12 @@ "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; "kdeglobals"."KScreen"."ScreenScaleFactors" = "eDP-1=1;"; "kdeglobals"."KScreen"."XwaylandClientsScale" = false; - "kdeglobals"."WM"."activeBackground" = "231,232,235"; - "kdeglobals"."WM"."activeBlend" = "231,232,235"; - "kdeglobals"."WM"."activeForeground" = "92,97,108"; - "kdeglobals"."WM"."inactiveBackground" = "231,232,235"; - "kdeglobals"."WM"."inactiveBlend" = "231,232,235"; - "kdeglobals"."WM"."inactiveForeground" = "163,165,172"; + "kdeglobals"."WM"."activeBackground" = "239,236,244"; + "kdeglobals"."WM"."activeBlend" = "160,110,59"; + "kdeglobals"."WM"."activeForeground" = "88,82,96"; + "kdeglobals"."WM"."inactiveBackground" = "239,236,244"; + "kdeglobals"."WM"."inactiveBlend" = "126,120,135"; + "kdeglobals"."WM"."inactiveForeground" = "88,82,96"; "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; @@ -322,7 +321,6 @@ "kwinrc"."org/kde/kdecoration2"."BorderSize" = "None"; "kwinrc"."org/kde/kdecoration2"."BorderSizeAuto" = false; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasmarc"."Theme"."name" = "Arc-Dark"; "plasmarc"."Wallpapers"."usersWallpapers" = "/etc/nixos/git/wallpapers/default/wallpaper1.png,/nix/store/ix6w9j5y3pzmf8fqw75cbhbz8mrlkfkx-stylix-kde-theme/share/wallpapers/stylix/"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; diff --git a/stylix/themes/green/default.nix b/stylix/themes/green/default.nix index 4db3b6a8..579850d6 100644 --- a/stylix/themes/green/default.nix +++ b/stylix/themes/green/default.nix @@ -1,7 +1,7 @@ { ... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/green/wallpaper2.png; polarity = "dark"; base16Scheme = ./everforest-dark-hard.yaml; autoEnable = true; diff --git a/stylix/themes/gruvbox/default.nix b/stylix/themes/gruvbox/default.nix index c6818fa4..09fc15d1 100644 --- a/stylix/themes/gruvbox/default.nix +++ b/stylix/themes/gruvbox/default.nix @@ -1,9 +1,9 @@ {lib, inputs, pkgs, gpu, system, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/gruvbox/wallpaper1.png; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; autoEnable = true; }; -} \ No newline at end of file +} diff --git a/stylix/themes/sakura-day/default.nix b/stylix/themes/sakura-day/default.nix index d992927a..b16bc598 100644 --- a/stylix/themes/sakura-day/default.nix +++ b/stylix/themes/sakura-day/default.nix @@ -1,8 +1,7 @@ { ... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - # Placeholder as it's required for some reason - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/sakura-day/wallpaper1.png; base16Scheme = ./sakura.yaml; autoEnable = true; }; diff --git a/stylix/themes/sakura-night/default.nix b/stylix/themes/sakura-night/default.nix index e68044ea..53382df0 100644 --- a/stylix/themes/sakura-night/default.nix +++ b/stylix/themes/sakura-night/default.nix @@ -1,8 +1,7 @@ {... }: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - # Placeholder as it's required for some reason - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/sakura-night/wallpaper1.png; base16Scheme = ./sakura-night.yaml; polarity = "dark"; autoEnable = true; diff --git a/stylix/themes/tokyo-day/default.nix b/stylix/themes/tokyo-day/default.nix index 0d2d4982..ed3b9ae9 100644 --- a/stylix/themes/tokyo-day/default.nix +++ b/stylix/themes/tokyo-day/default.nix @@ -1,8 +1,8 @@ {lib, inputs, pkgs, gpu, system, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/tokyo-day/wallpaper1.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-light.yaml"; autoEnable = true; }; -} \ No newline at end of file +} diff --git a/stylix/themes/tokyo-night/default.nix b/stylix/themes/tokyo-night/default.nix index b79d8d3b..a2c279b2 100644 --- a/stylix/themes/tokyo-night/default.nix +++ b/stylix/themes/tokyo-night/default.nix @@ -1,9 +1,9 @@ {lib, inputs, pkgs, gpu, system, theme, ...}: { # Themes https://github.com/tinted-theming/base16-schemes stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; + image = /etc/nixos/git/wallpapers/tokyo-night/wallpaper1.png; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml"; autoEnable = true; }; -} \ No newline at end of file +} From a4c6d821c91181c142493de63c48d4d7b6ba112e Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 8 Jun 2024 16:48:59 +0900 Subject: [PATCH 10/14] Fixes for 24.05 --- flake.nix | 4 +- home-manager/common/software/cli/nixvim.nix | 2 +- .../common/software/cli/nixvim/base.nix | 2 +- .../common/software/cli/nixvim/cmp.nix | 82 +++++++++---------- nixos/common/packages/default.nix | 1 - nixos/common/services/openssh.nix | 2 +- nixos/hosts/nixos-framework/default.nix | 2 +- 7 files changed, 46 insertions(+), 49 deletions(-) diff --git a/flake.nix b/flake.nix index e098e7f4..dc9f45bb 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ framework-server = libx.mkHost { hostname = "framework-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "hyprland"; theme = "green"; }; - nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; theme = "stylix-day"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; theme = "tokyo-day"; }; backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; @@ -77,7 +77,7 @@ "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "hyprland"; theme = "green"; }; - "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; theme = "stylix-day";}; + "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; theme = "tokyo-day";}; "albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix index 85dc9c98..486b38d1 100644 --- a/home-manager/common/software/cli/nixvim.nix +++ b/home-manager/common/software/cli/nixvim.nix @@ -66,7 +66,7 @@ }; }; rnix-lsp.enable = lib.mkForce false; - nil_ls.enable = false; + nil-ls.enable = false; html.enable = true; cssls.enable = true; bashls.enable = true; diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix index e4ac8eac..69a4f132 100644 --- a/home-manager/common/software/cli/nixvim/base.nix +++ b/home-manager/common/software/cli/nixvim/base.nix @@ -18,7 +18,7 @@ globals.mapleader = " "; globals.maplocalleader = " "; - options = { + opts = { number = true; wrap = false; cursorline = true; diff --git a/home-manager/common/software/cli/nixvim/cmp.nix b/home-manager/common/software/cli/nixvim/cmp.nix index fd9f9f47..af3a4e33 100644 --- a/home-manager/common/software/cli/nixvim/cmp.nix +++ b/home-manager/common/software/cli/nixvim/cmp.nix @@ -10,50 +10,48 @@ cmp-nvim-lsp-document-symbol.enable = true; cmp-nvim-lsp-signature-help.enable = true; - cmp.settings = { - sources = [ - { name = "nvim_lua"; } - { name = "nvim_lsp"; } - { name = "calc"; } - { name = "path"; } - { name = "buffer"; } - { name = "luasnip"; } - ]; - snippet.expand = "luasnip"; - - }; - - nvim-cmp = { + cmp = { enable = true; autoEnableSources = true; - mapping = { - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.close()"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping.select_prev_item()"; - "" = "cmp.mapping.select_next_item()"; - }; - window = { - completion.border = "rounded"; - documentation.border = "rounded"; - }; - formatting = { - fields = [ "menu" "abbr" "kind" ]; - # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/ - format = '' - function(entry, item) - local menu_icon = { - nvim_lsp = 'λ', - luasnip = '⋗', - buffer = 'Ω', - path = '🖫', - } - item.menu = menu_icon[entry.source.name] - return item - end, - ''; + settings = { + mapping = { + "" = "cmp.mapping.complete()"; + "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.close()"; + "" = "cmp.mapping.scroll_docs(4)"; + "" = "cmp.mapping.confirm({ select = true })"; + "" = "cmp.mapping.select_prev_item()"; + "" = "cmp.mapping.select_next_item()"; + }; + window = { + completion.border = "rounded"; + documentation.border = "rounded"; + }; + sources = [ + { name = "nvim_lua"; } + { name = "nvim_lsp"; } + { name = "calc"; } + { name = "path"; } + { name = "buffer"; } + { name = "luasnip"; } + ]; + snippet.expand = "luasnip"; + formatting = { + fields = [ "menu" "abbr" "kind" ]; + # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/ + format = '' + function(entry, item) + local menu_icon = { + nvim_lsp = 'λ', + luasnip = '⋗', + buffer = 'Ω', + path = '🖫', + } + item.menu = menu_icon[entry.source.name] + return item + end, + ''; + }; }; }; }; diff --git a/nixos/common/packages/default.nix b/nixos/common/packages/default.nix index 9ebd4d26..82fcbb5f 100644 --- a/nixos/common/packages/default.nix +++ b/nixos/common/packages/default.nix @@ -4,7 +4,6 @@ # List packages installed in system profile environment.systemPackages = with pkgs; [ nfs-utils # nfs network share tools - nixfmt # Formatting nix output sbctl # Secureboot Control wget # WebGet killall # Killall diff --git a/nixos/common/services/openssh.nix b/nixos/common/services/openssh.nix index f446ded4..5a879879 100644 --- a/nixos/common/services/openssh.nix +++ b/nixos/common/services/openssh.nix @@ -1,7 +1,7 @@ { hostname, ... }: { # enable passwordless elevation # Useful for deploy-rs - security.pam.enableSSHAgentAuth = true; + security.pam.sshAgentAuth.enable = true; programs.ssh.startAgent = true; # By default no ports are open. diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index b1b807ef..e61b2567 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -76,7 +76,7 @@ wineWowPackages.stable winetricks wineWowPackages.waylandFull - nvtop-amd + nvtopPackages.amd distrobox # RGB stuff openrgb-with-all-plugins From 3df8a2af3e6a118192299d398b1903c671df581b Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 12 Jun 2024 16:57:41 +0900 Subject: [PATCH 11/14] Update --- stylix/themes/default/default.nix | 9 +++++++++ stylix/themes/default/home-manager/nixvim.nix | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 stylix/themes/default/default.nix create mode 100644 stylix/themes/default/home-manager/nixvim.nix diff --git a/stylix/themes/default/default.nix b/stylix/themes/default/default.nix new file mode 100644 index 00000000..b72d243a --- /dev/null +++ b/stylix/themes/default/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + # Themes https://github.com/tinted-theming/base16-schemes + stylix = { + image = /etc/nixos/git/docs/icons/nixos/white.png; + polarity = "dark"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; + autoEnable = true; + }; +} diff --git a/stylix/themes/default/home-manager/nixvim.nix b/stylix/themes/default/home-manager/nixvim.nix new file mode 100644 index 00000000..b51eda1b --- /dev/null +++ b/stylix/themes/default/home-manager/nixvim.nix @@ -0,0 +1,4 @@ +{ lib, ... }: { + programs.nixvim.colorscheme = lib.mkForce "ayu-mirage"; + stylix.targets.nixvim.enable = false; +} From c711d8a4cbf0c4f25dba8d5010d8a353085adcc8 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 12 Jun 2024 17:01:28 +0900 Subject: [PATCH 12/14] Testing --- flake.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index dc9f45bb..f082bbd8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,15 @@ description = "NixOS System Config"; inputs = { # Stable Packages - nixpkgs.url = "nixpkgs/nixos-24.05"; + nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable Packages nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; # home-manager - Dotfile mnagement - add /master at the end to pull from master - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Nix colorizer / themer - # TODO: https://github.com/danth/stylix/issues/405 stylix.url = "github:danth/stylix"; # nixvim - neovim configuration management in nix - # TODO: https://github.com/nix-community/nixvim/issues/1551 nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; # lanzaboote - Secureboot Configuration @@ -93,8 +91,7 @@ # nuc-server = libx.deploy { hostname = "nuc-server"; }; backups-rpi4 = libx.deploy { hostname = "backups-rpi4"; system = "aarch64-linux"; }; piaware-rpi4 = libx.deploy { hostname = "piaware-rpi4"; system = "aarch64-linux"; }; - # TODO: RE-enable when delivered - # bakersfield-rpi4 = libx.deploy { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; }; + bakersfield-rpi4 = libx.deploy { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; }; # quitman-rpi4 = libx.deploy { hostname = "quitman-rpi4"; system = "aarch64-linux"; }; }; imageConfigurations = { From e534a22e70e6cd14749a23df4ecde6bff112bac5 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 12 Jun 2024 17:02:47 +0900 Subject: [PATCH 13/14] Update default stylix theme --- lib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 6bdd2a61..c1600b45 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -22,7 +22,7 @@ username ? "albert", desktop ? null, system ? "x86_64-linux", - theme ? "stylix", + theme ? "default", type ? "default" }: inputs.home-manager.lib.homeManagerConfiguration { pkgs = inputs.nixpkgs.legacyPackages.${system}; @@ -35,7 +35,7 @@ username ? "albert", desktop ? null, system ? "x86_64-linux", - theme ? "stylix", + theme ? "default", type ? "default", repo ? "nixpkgs", unfree ? false, @@ -83,7 +83,7 @@ desktop ? null, gpu ? null, system ? "x86_64-linux", - theme ? "stylix", + theme ? "default", type ? "default", repo ? "nixpkgs-unstable" }: inputs.${repo}.lib.nixosSystem { @@ -113,7 +113,7 @@ desktop ? null, gpu ? null, system ? "x86_64-linux", - theme ? "stylix", + theme ? "default", type ? "default", repo ? "nixpkgs", unfree ? false @@ -149,7 +149,7 @@ desktop ? null, system ? "x86_64-linux", gpu ? null, - theme ? "stylix", + theme ? "default", repo ? "nixpkgs", unfree ? false, format @@ -192,7 +192,7 @@ desktop ? null, system ? "x86_64-linux", gpu ? null, - theme ? "stylix", + theme ? "default", format }: inputs.nixos-generators.nixosGenerate { specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; }; From ff25cc2ff29cdda2a86c440bf06b4e9b105b3b9c Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 12 Jun 2024 18:29:07 +0900 Subject: [PATCH 14/14] Final 24.05 update --- flake.lock | 225 +++++++++++++++---------- flake.nix | 1 - nixos/common/desktops/xfce/default.nix | 4 +- nixos/hosts/nixos-desktop/default.nix | 2 +- shell.nix | 1 - 5 files changed, 137 insertions(+), 96 deletions(-) diff --git a/flake.lock b/flake.lock index 80772350..4d0d9bec 100644 --- a/flake.lock +++ b/flake.lock @@ -164,11 +164,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1715699772, - "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", + "lastModified": 1718111523, + "narHash": "sha256-AeJpRoIT4H+MLLgd+F8HUPA+6hOXRiSOZ5RpmNP9Xvg=", "owner": "serokell", "repo": "deploy-rs", - "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", + "rev": "ea0aaeb222ed07722b05ef2d8fbb840df4f77c49", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1717770040, - "narHash": "sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds=", + "lastModified": 1718008439, + "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", "owner": "nix-community", "repo": "disko", - "rev": "398acc470f7c2d68621db01900f053e6000129c4", + "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1717591035, - "narHash": "sha256-xtrHrY2H23jlqOPY/fp0n13vaQkJl4bBAZHQ6T7lVMU=", + "lastModified": 1717963159, + "narHash": "sha256-IkplGeSrZUdzxAOdXtOTecvyAiVSzGO45/xjDeof6QE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "bec5a54900e92fb8d4ce6064eab6a1dce517a06b", + "rev": "16e2c33e3c817208811e389fc716d6c4aabf7923", "type": "github" }, "original": { @@ -796,16 +796,15 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -889,11 +888,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -906,17 +905,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1717784649, - "narHash": "sha256-Yqdk5sUODNh8QxOVVb5UVvv4a0Yl/uU6p98y7OeK4R8=", + "lastModified": 1718139749, + "narHash": "sha256-m6L3GOTGsji8QPlUiJNzamhbSHGlK+JTTJoD/f8fikw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c31d9ef4172452f6f219f91d9b87a24d91f0cf3a", + "rev": "8412ffcc42012888757cd00a004871e8bc353cf2", "type": "github" }, "original": { @@ -954,6 +954,10 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -964,11 +968,11 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -977,6 +981,31 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -989,11 +1018,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -1008,11 +1037,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1717685136, - "narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=", + "lastModified": 1718173451, + "narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52", + "rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48", "type": "github" }, "original": { @@ -1034,11 +1063,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1717801791, - "narHash": "sha256-CEotbHLdhkltv8OsHojqN1cJynVMNOX+0lJgqIoD6Gk=", + "lastModified": 1718178907, + "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e8850266af6aedfd73c46c7518fd54c1f6c89e7b", + "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", "type": "github" }, "original": { @@ -1053,11 +1082,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717330178, - "narHash": "sha256-rRZjmC3xcPpHTJHnEy3T99O86Ecjao5YhakzaoNiRcs=", + "lastModified": 1717935050, + "narHash": "sha256-UWi8G3J+pS+9LVMdjrpLJwncdiMQWrnuUd5ygxCHeNc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7", + "rev": "1b6ea3be6ba37d4d3ba6e5041e2f152bb684ba2c", "type": "github" }, "original": { @@ -1191,11 +1220,11 @@ ] }, "locked": { - "lastModified": 1716210724, - "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -1206,11 +1235,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "lastModified": 1717995329, + "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "type": "github" }, "original": { @@ -1237,11 +1266,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717289404, + "lastModified": 1717894324, "narHash": "sha256-4q6ZO3BqHgdd3Aacb/xiQXB4g9TQKpQg/praTpD9vbI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e090cb30ae82f4b4461aafdb808847c6c97b08c2", + "rev": "13eac98dc5233fe7e52f0cd0e2cba7dcd77feca5", "type": "github" }, "original": { @@ -1268,11 +1297,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1717265169, - "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", + "lastModified": 1717880976, + "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", + "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "type": "github" }, "original": { @@ -1284,11 +1313,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -1305,11 +1334,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1717784639, - "narHash": "sha256-AfyQclkLlsyGIzP0gLzvFtBDxdO3a/QtJxzRr5WB5m0=", + "lastModified": 1718173415, + "narHash": "sha256-BnQqPiR2XH7GWlnW5V9BM1rkl7uvLo1S3rIF9TmCfWk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "3dac7060bfd7896e31d623a7bc88bd89d380c007", + "rev": "9d9509d75ec144438c0a84c9f5fcd92df3f1a0d2", "type": "github" }, "original": { @@ -1320,11 +1349,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -1352,16 +1381,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -1383,11 +1412,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -1399,11 +1428,27 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1717774105, + "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d226935fd75012939397c83f6c385e4d6d832288", "type": "github" }, "original": { @@ -1413,7 +1458,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -1437,17 +1482,15 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1717799968, - "narHash": "sha256-NvmBPOpaf2z8aId+stIJK3/URuc4EaL3KeurKkHTxRA=", + "lastModified": 1718098450, + "narHash": "sha256-QDKPhT61Cf82/7G7vMyEfKQSIGGzs33FyT+4RB34spo=", "owner": "nix-community", "repo": "nixvim", - "rev": "552e8b0a8551acc43292d06258829fe0621980e2", + "rev": "7a2d065ccec902c17db71bd2ba3e485a0952f43b", "type": "github" }, "original": { @@ -1474,11 +1517,11 @@ }, "nur": { "locked": { - "lastModified": 1717805329, - "narHash": "sha256-/QfJN9PkD0HAXCbn46uI0hcbzwNvC3U95V7NJ0RuZSs=", + "lastModified": 1718179719, + "narHash": "sha256-7BjOQwrlKldaReQZi72FSNHwR9zitDYqVxffxZqtG1s=", "owner": "nix-community", "repo": "NUR", - "rev": "c170f285f35b652f95606e62350dd8ae2829b39e", + "rev": "4b5cb23bf23145600c6211d21d7647daea9fb4dd", "type": "github" }, "original": { @@ -1682,11 +1725,11 @@ ] }, "locked": { - "lastModified": 1717726729, - "narHash": "sha256-2WDKLjVRKWXbadnJHSOUb46PTq3D5nS89vhHTphRw1M=", + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f52ac9ae95bd60c0780d6e32baea22e542e11e1", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", "type": "github" }, "original": { @@ -1713,15 +1756,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", + "lastModified": 1718137936, + "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", + "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "type": "github" }, "original": { @@ -1742,14 +1785,14 @@ "flake-compat": "flake-compat_7", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1717593209, - "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "owner": "danth", "repo": "stylix", - "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { @@ -1878,11 +1921,11 @@ ] }, "locked": { - "lastModified": 1717278143, - "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { @@ -1958,11 +2001,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f082bbd8..7e963752 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,6 @@ stylix.url = "github:danth/stylix"; # nixvim - neovim configuration management in nix nixvim.url = "github:nix-community/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; # lanzaboote - Secureboot Configuration lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix index 9d3e958d..ac5490e0 100644 --- a/nixos/common/desktops/xfce/default.nix +++ b/nixos/common/desktops/xfce/default.nix @@ -18,8 +18,8 @@ # Configure keymap in X11 services.xserver = { enable = true; - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; autorun = true; desktopManager.xfce.enable = true; }; diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index 187b2c81..68a0eb4f 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -67,7 +67,7 @@ # nVidia gpu options pkgs.gwe - pkgs.nvtop-nvidia + pkgs.nvtopPackages.nvidia # WINE # support 32-bit only pkgs.wine diff --git a/shell.nix b/shell.nix index 1523d1eb..b07588fc 100644 --- a/shell.nix +++ b/shell.nix @@ -11,7 +11,6 @@ pkgs.nix pkgs.git pkgs.vim - pkgs.nixfmt pkgs.ssh-to-pgp (pkgs.callPackage sops-nix {}).sops-import-keys-hook ];