From 8545d6a02f4e8d148e80321e325917ff1e8d9151 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 12 Jun 2024 19:15:32 +0900 Subject: [PATCH] Testing --- flake.lock | 1984 ----------------- flake.nix | 15 +- .../common/desktops/plasma6/default.nix | 1 - home-manager/common/software/cli/btop.nix | 3 - home-manager/common/software/cli/nixvim.nix | 3 +- .../common/software/cli/nixvim/base.nix | 23 +- .../common/software/cli/nixvim/cmp.nix | 53 +- home-manager/common/software/gui/firefox.nix | 2 +- .../desktops/plasma6/default.nix | 6 +- .../desktops/plasma6/plasma-manager.nix | 0 .../desktops/plasma6/default.nix | 6 +- .../desktops/plasma6/plasma-manager.nix | 328 +++ lib/default.nix | 12 +- nixos/common/desktops/xfce/default.nix | 4 +- nixos/common/packages/default.nix | 1 - nixos/common/services/openssh.nix | 2 +- nixos/hosts/nixos-desktop/default.nix | 2 +- nixos/hosts/nixos-framework/default.nix | 2 +- shell.nix | 1 - stylix/themes/default/default.nix | 9 + stylix/themes/default/home-manager/nixvim.nix | 4 + 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/stylix-day/default.nix | 9 + .../themes/stylix-day/home-manager/nixvim.nix | 4 + stylix/themes/stylix/default.nix | 3 +- stylix/themes/stylix/sakura-night.yaml | 18 - stylix/themes/tokyo-day/default.nix | 4 +- stylix/themes/tokyo-night/default.nix | 4 +- 31 files changed, 423 insertions(+), 2092 deletions(-) delete mode 100644 flake.lock 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 create mode 100644 stylix/themes/default/default.nix create mode 100644 stylix/themes/default/home-manager/nixvim.nix create mode 100644 stylix/themes/stylix-day/default.nix create mode 100644 stylix/themes/stylix-day/home-manager/nixvim.nix delete mode 100644 stylix/themes/stylix/sakura-night.yaml diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 20969508..00000000 --- a/flake.lock +++ /dev/null @@ -1,1984 +0,0 @@ -{ - "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1689633990, - "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "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": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", - "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", - "type": "github" - }, - "original": { - "owner": "chriskempson", - "repo": "base16-vim", - "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": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717354014, - "narHash": "sha256-WwQo3TGnEbpp3tPqHHqqiXK3jXD9oykdhKaxrv9UzKs=", - "owner": "aksiksi", - "repo": "compose2nix", - "rev": "3cc5f141667c1dd434570ab6cb2dbac5739edc52", - "type": "github" - }, - "original": { - "owner": "aksiksi", - "repo": "compose2nix", - "type": "github" - } - }, - "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", - "owner": "ipetkov", - "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1715699772, - "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717770040, - "narHash": "sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds=", - "owner": "nix-community", - "repo": "disko", - "rev": "398acc470f7c2d68621db01900f053e6000129c4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "doom-emacs": { - "inputs": { - "doom-emacs": "doom-emacs_2", - "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", - "emacs-so-long": "emacs-so-long", - "evil-escape": "evil-escape", - "evil-markdown": "evil-markdown", - "evil-org-mode": "evil-org-mode", - "evil-quick-diff": "evil-quick-diff", - "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "format-all": "format-all", - "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs", - "nose": "nose", - "ob-racket": "ob-racket", - "org": "org", - "org-contrib": "org-contrib", - "org-yt": "org-yt", - "php-extras": "php-extras", - "revealjs": "revealjs", - "rotate-text": "rotate-text", - "sln-mode": "sln-mode", - "ts-fold": "ts-fold", - "ws-butler": "ws-butler" - }, - "locked": { - "lastModified": 1701264882, - "narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=", - "owner": "nix-community", - "repo": "nix-doom-emacs", - "rev": "f7413022370f24bb53cb450bfb2803233510113e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-doom-emacs", - "type": "github" - } - }, - "doom-emacs_2": { - "flake": false, - "locked": { - "lastModified": 1662497747, - "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", - "type": "github" - } - }, - "doom-snippets": { - "flake": false, - "locked": { - "lastModified": 1694887483, - "narHash": "sha256-KlKhruPSLPSKqUnr5/U65arm16VrY9ORzm+XKNZhpTQ=", - "owner": "doomemacs", - "repo": "snippets", - "rev": "f022984ee1318a4015d5d081b3c3dab5a60dc6ff", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "snippets", - "type": "github" - } - }, - "emacs-overlay": { - "flake": false, - "locked": { - "lastModified": 1676366521, - "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", - "type": "github" - } - }, - "emacs-so-long": { - "flake": false, - "locked": { - "lastModified": 1575031854, - "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", - "owner": "hlissner", - "repo": "emacs-so-long", - "rev": "ed666b0716f60e8988c455804de24b55919e71ca", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "emacs-so-long", - "type": "github" - } - }, - "evil-escape": { - "flake": false, - "locked": { - "lastModified": 1588439096, - "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", - "owner": "hlissner", - "repo": "evil-escape", - "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-escape", - "type": "github" - } - }, - "evil-markdown": { - "flake": false, - "locked": { - "lastModified": 1626852210, - "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", - "owner": "Somelauw", - "repo": "evil-markdown", - "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", - "type": "github" - }, - "original": { - "owner": "Somelauw", - "repo": "evil-markdown", - "type": "github" - } - }, - "evil-org-mode": { - "flake": false, - "locked": { - "lastModified": 1607203864, - "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", - "owner": "hlissner", - "repo": "evil-org-mode", - "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-org-mode", - "type": "github" - } - }, - "evil-quick-diff": { - "flake": false, - "locked": { - "lastModified": 1575189609, - "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", - "type": "github" - }, - "original": { - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "type": "github" - } - }, - "explain-pause-mode": { - "flake": false, - "locked": { - "lastModified": 1595842060, - "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", - "owner": "lastquestion", - "repo": "explain-pause-mode", - "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", - "type": "github" - }, - "original": { - "owner": "lastquestion", - "repo": "explain-pause-mode", - "type": "github" - } - }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1717591035, - "narHash": "sha256-xtrHrY2H23jlqOPY/fp0n13vaQkJl4bBAZHQ6T7lVMU=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "bec5a54900e92fb8d4ce6064eab6a1dce517a06b", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "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": { - "lastModified": 1581716637, - "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - }, - "original": { - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - } - }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "plasma-manager", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714377222, - "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700847865, - "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1717181720, - "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "systems": "systems_3", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1717856701, - "narHash": "sha256-0GxcDi2kXKYi2IrTobYqXoyZMPTD7GT9KNc3Dxivy6g=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "7789caad39f9c19553fe8baf779c0196938f645a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1717784906, - "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1717685136, - "narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1717801791, - "narHash": "sha256-CEotbHLdhkltv8OsHojqN1cJynVMNOX+0lJgqIoD6Gk=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "e8850266af6aedfd73c46c7518fd54c1f6c89e7b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lanzaboote", - "type": "github" - } - }, - "lib-aggregate": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1717330178, - "narHash": "sha256-rRZjmC3xcPpHTJHnEy3T99O86Ecjao5YhakzaoNiRcs=", - "owner": "nix-community", - "repo": "lib-aggregate", - "rev": "64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lib-aggregate", - "type": "github" - } - }, - "nix-eval-jobs": { - "inputs": { - "flake-parts": "flake-parts_2", - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1717698186, - "narHash": "sha256-e3/cvm7bAn0RsTBcPfHwuYOi2lwoO4jpTn4nmMSvHfU=", - "owner": "nix-community", - "repo": "nix-eval-jobs", - "rev": "b6169e08e76e10b673d1b54f944cddb1e7cbea97", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-eval-jobs", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-straight": { - "flake": false, - "locked": { - "lastModified": 1694361489, - "narHash": "sha256-kjDp+j6OtrmqbtjQB5uuOtjS08+kgJQuxFqhWE1Y9Rw=", - "owner": "nix-community", - "repo": "nix-straight.el", - "rev": "748be99b84be0b130e946288099806a0f16d6e57", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-straight.el", - "type": "github" - } - }, - "nixlib": { - "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716210724, - "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1717828156, - "narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "057a7996d012f342a38a26261ee529cebb1755ef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1695806987, - "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1717289404, - "narHash": "sha256-4q6ZO3BqHgdd3Aacb/xiQXB4g9TQKpQg/praTpD9vbI=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e090cb30ae82f4b4461aafdb808847c6c97b08c2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "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=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs-wayland": { - "inputs": { - "flake-compat": "flake-compat_4", - "lib-aggregate": "lib-aggregate", - "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1717834783, - "narHash": "sha256-NiBJ7EgvGmDmXy1MG1r++afIzFJBmir2PQ4wmMNIaWw=", - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "rev": "021a0a37c336730956f5ce741c2a5c0e5c113b40", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1717530100, - "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1715037484, - "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "beautysh": "beautysh", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1713951100, - "narHash": "sha256-ObeER1qB/i06lk7jQqVp9DdTKnykNaojOVoX9GcCoRc=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "7c59615585f691b560d9522c94d8f3195853ca8e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "nixos-23.11", - "repo": "nixvim", - "type": "github" - } - }, - "nose": { - "flake": false, - "locked": { - "lastModified": 1400604510, - "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", - "owner": "emacsattic", - "repo": "nose", - "rev": "f8528297519eba911696c4e68fa88892de9a7b72", - "type": "github" - }, - "original": { - "owner": "emacsattic", - "repo": "nose", - "type": "github" - } - }, - "nur": { - "locked": { - "lastModified": 1717857394, - "narHash": "sha256-cFIod8vGScvmizwuRjmrvU+D0dFbV2rwjZcqW+FnxRk=", - "owner": "nix-community", - "repo": "NUR", - "rev": "bcfbaa1b80c88d8c3ba75076f28fae4d5cb20c2e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "ob-racket": { - "flake": false, - "locked": { - "lastModified": 1584656173, - "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", - "owner": "xchrishawk", - "repo": "ob-racket", - "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", - "type": "github" - }, - "original": { - "owner": "xchrishawk", - "repo": "ob-racket", - "type": "github" - } - }, - "org": { - "flake": false, - "locked": { - "lastModified": 1695726851, - "narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=", - "owner": "emacs-straight", - "repo": "org-mode", - "rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9", - "type": "github" - }, - "original": { - "owner": "emacs-straight", - "repo": "org-mode", - "type": "github" - } - }, - "org-contrib": { - "flake": false, - "locked": { - "lastModified": 1694946041, - "narHash": "sha256-X/HFG6NZe5BY00KvGbcsIuf9R6Lg8x7Uhd0Y5+Q3qZU=", - "owner": "emacsmirror", - "repo": "org-contrib", - "rev": "5eabbf22bdd4523c922a30787e98ee66c24221aa", - "type": "github" - }, - "original": { - "owner": "emacsmirror", - "repo": "org-contrib", - "type": "github" - } - }, - "org-yt": { - "flake": false, - "locked": { - "lastModified": 1527381913, - "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", - "owner": "TobiasZawada", - "repo": "org-yt", - "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", - "type": "github" - }, - "original": { - "owner": "TobiasZawada", - "repo": "org-yt", - "type": "github" - } - }, - "php-extras": { - "flake": false, - "locked": { - "lastModified": 1573312690, - "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", - "owner": "arnested", - "repo": "php-extras", - "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", - "type": "github" - }, - "original": { - "owner": "arnested", - "repo": "php-extras", - "type": "github" - } - }, - "plasma-manager": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1717666468, - "narHash": "sha256-SKPMh/Apjk3DhY0B/SqTvmt1/UFf2AHwoVPTGA6Md9c=", - "owner": "pjones", - "repo": "plasma-manager", - "rev": "d982fe0063be13bbe57a0c4ace8b406236812b94", - "type": "github" - }, - "original": { - "owner": "pjones", - "repo": "plasma-manager", - "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": [ - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "revealjs": { - "flake": false, - "locked": { - "lastModified": 1695738029, - "narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=", - "owner": "hakimel", - "repo": "reveal.js", - "rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757", - "type": "github" - }, - "original": { - "owner": "hakimel", - "repo": "reveal.js", - "type": "github" - } - }, - "root": { - "inputs": { - "compose2nix": "compose2nix", - "deploy-rs": "deploy-rs", - "disko": "disko", - "doom-emacs": "doom-emacs", - "firefox-gnome-theme": "firefox-gnome-theme", - "home-manager": "home-manager", - "hyprland": "hyprland", - "jovian": "jovian", - "lanzaboote": "lanzaboote", - "nixos-generators": "nixos-generators", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", - "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-wayland": "nixpkgs-wayland", - "nixvim": "nixvim", - "nur": "nur", - "plasma-manager": "plasma-manager", - "sops-nix": "sops-nix", - "stylix": "stylix" - } - }, - "rotate-text": { - "flake": false, - "locked": { - "lastModified": 1322962747, - "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", - "owner": "debug-ito", - "repo": "rotate-text.el", - "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", - "type": "github" - }, - "original": { - "owner": "debug-ito", - "repo": "rotate-text.el", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717726729, - "narHash": "sha256-2WDKLjVRKWXbadnJHSOUb46PTq3D5nS89vhHTphRw1M=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "7f52ac9ae95bd60c0780d6e32baea22e542e11e1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "sln-mode": { - "flake": false, - "locked": { - "lastModified": 1423727528, - "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", - "owner": "sensorflo", - "repo": "sln-mode", - "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", - "type": "github" - }, - "original": { - "owner": "sensorflo", - "repo": "sln-mode", - "type": "github" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_3" - }, - "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "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", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1716327543, - "narHash": "sha256-hQoxnofg9YqQBs/TUOX6oJAm7EEghFgaDdqK7DD+0T4=", - "owner": "danth", - "repo": "stylix", - "rev": "3c8f033fd585835387a754160f47dab0c37ad5ae", - "type": "github" - }, - "original": { - "owner": "danth", - "ref": "release-23.11", - "repo": "stylix", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "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": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "ts-fold": { - "flake": false, - "locked": { - "lastModified": 1695278494, - "narHash": "sha256-O4NcUC1u08W8ZslqoA/i+iTaLotKwheURXQWBxLLMFc=", - "owner": "jcs-elpa", - "repo": "ts-fold", - "rev": "70b2c79ff4daa7351d4e2917b0343b9a18d4d4f2", - "type": "github" - }, - "original": { - "owner": "jcs-elpa", - "repo": "ts-fold", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "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": { - "lastModified": 1634511126, - "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", - "owner": "hlissner", - "repo": "ws-butler", - "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "ws-butler", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index 2d8c8cf9..7e963752 100644 --- a/flake.nix +++ b/flake.nix @@ -2,19 +2,16 @@ description = "NixOS System Config"; inputs = { # Stable Packages - nixpkgs.url = "nixpkgs/nixos-23.11"; + 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-23.11"; + 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/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.inputs.nixpkgs.follows = "nixpkgs"; + nixvim.url = "github:nix-community/nixvim"; # lanzaboote - Secureboot Configuration lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; @@ -64,7 +61,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"; 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 +74,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"; 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/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/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.nix b/home-manager/common/software/cli/nixvim.nix index c17f468a..486b38d1 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 = { @@ -67,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 be094e23..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; @@ -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 @@ -196,39 +195,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..af3a4e33 100644 --- a/home-manager/common/software/cli/nixvim/cmp.nix +++ b/home-manager/common/software/cli/nixvim/cmp.nix @@ -10,44 +10,32 @@ cmp-nvim-lsp-document-symbol.enable = true; cmp-nvim-lsp-signature-help.enable = true; - 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 })"; - "" = { - action = "cmp.mapping.select_prev_item()"; - modes = [ - "i" - "s" - ]; + 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()"; }; - "" = { - action = "cmp.mapping.select_next_item()"; - modes = [ - "i" - "s" - ]; - }; - }; - 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"; }; + 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/ @@ -62,7 +50,8 @@ item.menu = menu_icon[entry.source.name] return item end, - ''; + ''; + }; }; }; }; 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-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..5b800972 --- /dev/null +++ b/home-manager/hosts/nixos-framework/desktops/plasma6/plasma-manager.nix @@ -0,0 +1,328 @@ +{ + 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+\x3d"]; + "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"."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; + "kcminputrc"."Mouse"."XLbInptPointerAcceleration" = "-0.6"; + "kcminputrc"."Mouse"."cursorTheme" = "ePapirus"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kdeglobals"."General"."AccentColor" = "168,57,175"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; + "kdeglobals"."General"."accentColorFromWallpaper" = true; + "kdeglobals"."KDE"."SingleClick" = true; + "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" = "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"; + "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" = "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"; + "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"."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; + "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"."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"."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/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; }; 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/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-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/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 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 ]; 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; +} 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/stylix-day/default.nix b/stylix/themes/stylix-day/default.nix new file mode 100644 index 00000000..d19b6efd --- /dev/null +++ b/stylix/themes/stylix-day/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + # Themes https://github.com/tinted-theming/base16-schemes + stylix = { + image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png; + base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave-light.yaml"; + polarity = "light"; + 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/default.nix b/stylix/themes/stylix/default.nix index de977e00..c424b75e 100644 --- a/stylix/themes/stylix/default.nix +++ b/stylix/themes/stylix/default.nix @@ -1,9 +1,8 @@ { 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"; 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" 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 +}