From 80677af5064d1aaeabe54a7b603bfa891c46aaec Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 2 Dec 2022 23:23:08 +0700 Subject: [PATCH 1/9] flake: bump inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'agenix': 'github:ryantm/agenix/6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0' (2022-09-25) → 'github:ryantm/agenix/a630400067c6d03c9b3e0455347dc8559db14288' (2022-10-15) • Updated input 'discover': 'github:trigg/Discover/de83063f3452b1cdee89b4c3779103eae2c90cbb' (2022-09-22) → 'github:trigg/Discover/1a8ffdad78c8fd215465acd3dcd271375bcae76e' (2022-10-28) • Updated input 'fast-syntax-highlighting': 'github:zdharma-continuum/fast-syntax-highlighting/770bcd986620d6172097dc161178210855808ee0' (2022-10-01) → 'github:zdharma-continuum/fast-syntax-highlighting/7c390ee3bfa8069b8519582399e0a67444e6ea61' (2022-11-20) • Updated input 'home-manager': 'github:nix-community/home-manager/e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9' (2022-10-03) → 'github:nix-community/home-manager/71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9' (2022-12-02) • Updated input 'home-manager/utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'home-manager-raccoon': 'github:nix-community/home-manager/f7641a3ff398ccce952e19a199d775934e518c1d' (2022-11-21) → 'github:nix-community/home-manager/8f26dec249deb2ad2d53eb3f5a0d558620035642' (2022-12-02) • Updated input 'hosts-blocklists': 'github:notracking/hosts-blocklists/2c3695f3b725c2fcde171c8401e4b90add04a1e1' (2022-10-03) → 'github:notracking/hosts-blocklists/26d141def5a26f8a096f527b0bb48760028bc419' (2022-12-02) • Updated input 'linux-tkg': 'github:Frogging-Family/linux-tkg/1d063ca32634997616d9cb1da81253bdedc67054' (2022-10-02) → 'github:Frogging-Family/linux-tkg/b108b3a8d2abf0c5955000292513ea7897654e5d' (2022-12-01) • Updated input 'neovim-nightly': 'github:nix-community/neovim-nightly-overlay/acc75b05773963b245e49f5e51e4fae9dbeea0a5' (2022-10-03) → 'github:nix-community/neovim-nightly-overlay/76ff105f2a950eb54f4da78e633e4f0409b0432f' (2022-12-02) • Updated input 'neovim-nightly/flake-compat': 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19) → 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17) • Updated input 'neovim-nightly/neovim-flake': 'github:neovim/neovim/56998feebd6f7ec0ab68e44cba3425bf39d448b4?dir=contrib' (2022-10-02) → 'github:neovim/neovim/86f9e29c86af9a7f6eb30a7d8ff529898a8b20ec?dir=contrib' (2022-12-02) • Updated input 'neovim-nightly/neovim-flake/flake-utils': 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/e1c0c8935e7f278f137be83718735348136962fa' (2022-10-02) → 'github:fufexan/nix-gaming/9f96bd578ee5c1511535adccd295383d79fb791d' (2022-11-22) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/adccd191a0e83039d537e021f19495b7bad546a1' (2022-08-17) → 'github:nix-community/nixos-generators/50aeec40f2072d2ab267c8ec8a345573704ec110' (2022-11-21) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3024c67a2e9a35450558426c42e7419ab37efd95' (2022-10-01) → 'github:NixOS/nixos-hardware/7883883d135ce5b7eae5dce4bfa12262b85c1c46' (2022-11-28) • Updated input 'nixpkgs-raccoon': 'github:NixOS/nixpkgs/899e7caf59d1954882a8e2dff45ccc0387c186f6' (2022-11-26) → 'github:NixOS/nixpkgs/596a8e828c5dfa504f91918d0fa4152db3ab5502' (2022-11-30) • Updated input 'nvim-treesitter': 'github:nvim-treesitter/nvim-treesitter/7ccb9a056fa43da243e3a439109c354c551c51b6' (2022-10-03) → 'github:nvim-treesitter/nvim-treesitter/a49223a99f28a2d52a20603baff586d630789618' (2022-12-02) • Updated input 'packwiz': 'github:comp500/packwiz/c7c2ca786bd050043dc36f5a35fbe7699a29adbc' (2022-08-26) → 'github:comp500/packwiz/791bfcc30f6868086580fabdf4d797bc02b1554b' (2022-11-28) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/5db6b63124ccedd61e896ec98def85fb4e6668f4' (2022-10-02) → 'github:oxalica/rust-overlay/3d506453ce9c510b12e8dd98781bfaa2ea436772' (2022-12-02) • Updated input 'rust-overlay/flake-utils': 'github:numtide/flake-utils/7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249' (2022-07-04) → 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07) • Updated input 'tree-sitter-glimmer': 'github:alexlafroscia/tree-sitter-glimmer/99f2d6519c686dccc20dff513e744c1bb77224fd' (2022-09-05) → 'github:alexlafroscia/tree-sitter-glimmer/abcc9970da0ed0645741bf52ea70232374bc9e52' (2022-10-11) • Updated input 'website': 'github:LavaDesu/lavadesu.github.io/90c46007ec92fbd818b29c218f99869f594b9d95' (2022-03-25) → 'github:LavaDesu/lavadesu.github.io/4e30c50be520a0a1bbecf408f056e6aaf135df67' (2022-11-09) • Updated input 'zsh-abbr': 'github:olets/zsh-abbr/2b7b26e6a9d5dc4bc8478e47e92fe9e6ff7825c7' (2022-09-08) → 'github:olets/zsh-abbr/f87d868ae93b47d5a0852efbccc95edd8323961f' (2022-11-19) --- flake.lock | 138 ++++++++++++++++++++++++++--------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 4f15680..6e87bb5 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "discover": { "flake": false, "locked": { - "lastModified": 1663849385, - "narHash": "sha256-4yCQqOtOLvpRY4ted28XMvhDmaPS4CI9/mvK/2AAiuQ=", + "lastModified": 1666976749, + "narHash": "sha256-72gojSFMj8LftQLBnyVIORiZhIuaK66+5a0hg3MAbG0=", "owner": "trigg", "repo": "Discover", - "rev": "de83063f3452b1cdee89b4c3779103eae2c90cbb", + "rev": "1a8ffdad78c8fd215465acd3dcd271375bcae76e", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "fast-syntax-highlighting": { "flake": false, "locked": { - "lastModified": 1664594535, - "narHash": "sha256-T4k0pbT7aqLrIRIi2EM15LXCnpRFHzFilAYfRG6kbeY=", + "lastModified": 1668912623, + "narHash": "sha256-wLpgkX53wzomHMEpymvWE86EJfxlIb3S8TPy74WOBD4=", "owner": "zdharma-continuum", "repo": "fast-syntax-highlighting", - "rev": "770bcd986620d6172097dc161178210855808ee0", + "rev": "7c390ee3bfa8069b8519582399e0a67444e6ea61", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1664783440, - "narHash": "sha256-KlMwR7mUf5h8MPnzV7nGFUAt6ih/euW5xgvZ5x+hwvI=", + "lastModified": 1669978198, + "narHash": "sha256-U8sZFwIIDFm9w/Kx58sYrIsWpuQUKmkcQmdBkuQ+gkE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e639dd4dc3e431aa5b5f95325f9a66ac7e0dd9", + "rev": "71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9", "type": "github" }, "original": { @@ -143,11 +143,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1669071065, - "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=", + "lastModified": 1669992734, + "narHash": "sha256-392j/25MF9IHssvGApM454fAkQ8sFCqaf+24cuCImD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f7641a3ff398ccce952e19a199d775934e518c1d", + "rev": "8f26dec249deb2ad2d53eb3f5a0d558620035642", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "hosts-blocklists": { "flake": false, "locked": { - "lastModified": 1664793452, - "narHash": "sha256-LZB8HU8ik7Th13nvHFmCXCYhNT0pvb8xZtX0+MjruzU=", + "lastModified": 1669980425, + "narHash": "sha256-WQk0FiVgKp8WMrabVfMYjhiCTq88jmtC6tFBK2/OaJo=", "owner": "notracking", "repo": "hosts-blocklists", - "rev": "2c3695f3b725c2fcde171c8401e4b90add04a1e1", + "rev": "26d141def5a26f8a096f527b0bb48760028bc419", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1664728413, - "narHash": "sha256-6zgt2t53FQnCHqxu/b0lZLtsvhAdjtLVaeBq3sG1Vu4=", + "lastModified": 1669904372, + "narHash": "sha256-3/vCksSh6mCnYlNF+kyXu59/xUE17vhIRYzOe8Qcznw=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "1d063ca32634997616d9cb1da81253bdedc67054", + "rev": "b108b3a8d2abf0c5955000292513ea7897654e5d", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1664752840, - "narHash": "sha256-dxecs+FwU8MWvTOjUiDM1VZh/z8SdDTwVXXMVYI0JVY=", + "lastModified": 1669957830, + "narHash": "sha256-Hk62hCPlMenr15d7cpJUQbs5JyO7NSfFemW5W6a2JlM=", "owner": "neovim", "repo": "neovim", - "rev": "56998feebd6f7ec0ab68e44cba3425bf39d448b4", + "rev": "86f9e29c86af9a7f6eb30a7d8ff529898a8b20ec", "type": "github" }, "original": { @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1664785227, - "narHash": "sha256-A2YGAxuT3WY+tPA/ww6JbYvld0acsicvxAIC/5r1gFk=", + "lastModified": 1669968870, + "narHash": "sha256-HEfbCa4BVPpovav6pA9hagxvGf30GEni0S5o/9CLW6M=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "acc75b05773963b245e49f5e51e4fae9dbeea0a5", + "rev": "76ff105f2a950eb54f4da78e633e4f0409b0432f", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1664735521, - "narHash": "sha256-+IWo/yZJB29y1ySijHM5qqmN0d5/BmyJpe9CCAEHM80=", + "lastModified": 1669128192, + "narHash": "sha256-iBkK3E/S4XfQDi+2hr8WWitiIUZ5EWsmfTcR4jbIPNA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e1c0c8935e7f278f137be83718735348136962fa", + "rev": "9f96bd578ee5c1511535adccd295383d79fb791d", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1660727616, - "narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=", + "lastModified": 1669065280, + "narHash": "sha256-3+pq1oJWjGDLfd8G/vR3IIFZ+EQ/aglukA0bTiMlf3o=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "adccd191a0e83039d537e021f19495b7bad546a1", + "rev": "50aeec40f2072d2ab267c8ec8a345573704ec110", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1664628729, - "narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=", + "lastModified": 1669650994, + "narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3024c67a2e9a35450558426c42e7419ab37efd95", + "rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixpkgs-raccoon": { "locked": { - "lastModified": 1669465383, - "narHash": "sha256-fVbG427suESAEb8/P47O/zD/G9BSeFxLh94IUzgOchs=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "899e7caf59d1954882a8e2dff45ccc0387c186f6", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1664785779, - "narHash": "sha256-Ia7bexjruXikvfKYM7IQY/+3raa5Y1iLY/kEbO/L8Ac=", + "lastModified": 1669968953, + "narHash": "sha256-a2woc4N+ZPi2yOrX8rhzgrDPmLq4jraxhZECvIROvtg=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "7ccb9a056fa43da243e3a439109c354c551c51b6", + "rev": "a49223a99f28a2d52a20603baff586d630789618", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "packwiz": { "flake": false, "locked": { - "lastModified": 1661555305, - "narHash": "sha256-zx0zvTpnnfRxvjVZwdXNt6obfd8gNiIjBvJnBy3ovts=", + "lastModified": 1669612870, + "narHash": "sha256-VU2Bjx4RBd/LPL62sfXc9XwPiCn2qvllNsT2Ptee4UU=", "owner": "comp500", "repo": "packwiz", - "rev": "c7c2ca786bd050043dc36f5a35fbe7699a29adbc", + "rev": "791bfcc30f6868086580fabdf4d797bc02b1554b", "type": "github" }, "original": { @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1664734860, - "narHash": "sha256-Agin7U5+AhlVqPCZAhlAMlRnoV7rGIZXtDsPspF/DRg=", + "lastModified": 1669948173, + "narHash": "sha256-hfL2dTSBPVEWH117GTBk/mYCJbaa3FQar3CcTlKQvhc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5db6b63124ccedd61e896ec98def85fb4e6668f4", + "rev": "3d506453ce9c510b12e8dd98781bfaa2ea436772", "type": "github" }, "original": { @@ -469,11 +469,11 @@ "tree-sitter-glimmer": { "flake": false, "locked": { - "lastModified": 1662391283, - "narHash": "sha256-0NGlfAhxuBza37dP35uxjsi928+cxihcQSDhwXnitEc=", + "lastModified": 1665483258, + "narHash": "sha256-kkNnyaAXeZJ770Jl4mmOdyXvq6bQd/9Q6eVyr+JV2jY=", "owner": "alexlafroscia", "repo": "tree-sitter-glimmer", - "rev": "99f2d6519c686dccc20dff513e744c1bb77224fd", + "rev": "abcc9970da0ed0645741bf52ea70232374bc9e52", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -531,11 +531,11 @@ "website": { "flake": false, "locked": { - "lastModified": 1648213051, - "narHash": "sha256-474ikN1CPqpd7d/E71cq13ZokuSJyMRe0dRFsczqVxE=", + "lastModified": 1668017714, + "narHash": "sha256-ywy/7xeT6FHkF7lcs+stW1WPV+piE8ztSwcQ161iico=", "owner": "LavaDesu", "repo": "lavadesu.github.io", - "rev": "90c46007ec92fbd818b29c218f99869f594b9d95", + "rev": "4e30c50be520a0a1bbecf408f056e6aaf135df67", "type": "github" }, "original": { @@ -564,11 +564,11 @@ "zsh-abbr": { "flake": false, "locked": { - "lastModified": 1662597003, - "narHash": "sha256-diitszKbu530zXbJx4xmfOjLsITE9ucmWdsz9VTXsKg=", + "lastModified": 1668877669, + "narHash": "sha256-SUu/0vXK6glItxmPZjZMaMLqoTfU7nYtoBS7Lcm6cgk=", "owner": "olets", "repo": "zsh-abbr", - "rev": "2b7b26e6a9d5dc4bc8478e47e92fe9e6ff7825c7", + "rev": "f87d868ae93b47d5a0852efbccc95edd8323961f", "type": "github" }, "original": { From 771f1a466fe94ee636c635a07931537d8369d38a Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 2 Dec 2022 23:25:54 +0700 Subject: [PATCH 2/9] user/picom: remove experimentalBackends --- modules/user/picom.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/user/picom.nix b/modules/user/picom.nix index af9593e..7370487 100644 --- a/modules/user/picom.nix +++ b/modules/user/picom.nix @@ -1,17 +1,7 @@ { config, ... }: { services.picom = { enable = true; - experimentalBackends = true; - # blur = true; - # blurExclude = [ - # (builtins.concatStringsSep " && " [ - # "class_g != 'Alacritty'" - # "class_g != 'kitty'" - # #"class_g != 'Polybar'" - # "class_g != 'URxvt'" - # ]) - # ]; fade = true; fadeDelta = 5; fadeSteps = [ 0.05 0.05 ]; From 2ecdc7624af1467ee8851318c6a34394d4e699b8 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 2 Dec 2022 23:51:33 +0700 Subject: [PATCH 3/9] hosts/sugarcane: readd nginx --- hosts/sugarcane/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix index fb2a276..beb0db9 100644 --- a/hosts/sugarcane/default.nix +++ b/hosts/sugarcane/default.nix @@ -7,7 +7,7 @@ passwd.file = ../../secrets/passwd.age; wg_sugarcane.file = ../../secrets/wg_sugarcane.age; }; - imports = with modules.system; [ + imports = (with modules.system; [ (modulesPath + "/profiles/qemu-guest.nix") inputs.home-manager-raccoon.nixosModule @@ -24,5 +24,8 @@ ./packages.nix ../../users/hana - ]; + ]) ++ + (with modules.services; [ + nginx + ]); } From b31c445150ff23a53c46d83046ca86828f72f1c9 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 2 Dec 2022 23:52:21 +0700 Subject: [PATCH 4/9] user/neovim-minimal: fix theme --- res/config-minimal.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/config-minimal.lua b/res/config-minimal.lua index 7aade79..3f06e11 100644 --- a/res/config-minimal.lua +++ b/res/config-minimal.lua @@ -44,7 +44,9 @@ vim.g.signify_sign_change = vim.g.signify_sign_add vim.g.signify_sign_change_delete = vim.g.signify_sign_delete -- Theming -vim.g.tokyonight_style = 'night' +require("tokyonight").setup({ + style = "night" +}) vim.cmd[[ syntax enable colorscheme tokyonight From 5f029bf6c8817cbcd1e269a004936c14cfb02d3f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 2 Dec 2022 23:54:43 +0700 Subject: [PATCH 5/9] Revert "hosts/sugarcane: readd nginx" This reverts commit 2ecdc7624af1467ee8851318c6a34394d4e699b8. --- hosts/sugarcane/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix index beb0db9..fb2a276 100644 --- a/hosts/sugarcane/default.nix +++ b/hosts/sugarcane/default.nix @@ -7,7 +7,7 @@ passwd.file = ../../secrets/passwd.age; wg_sugarcane.file = ../../secrets/wg_sugarcane.age; }; - imports = (with modules.system; [ + imports = with modules.system; [ (modulesPath + "/profiles/qemu-guest.nix") inputs.home-manager-raccoon.nixosModule @@ -24,8 +24,5 @@ ./packages.nix ../../users/hana - ]) ++ - (with modules.services; [ - nginx - ]); + ]; } From 0299af84a77b751d05903f7a01ff381682e0c214 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 28 Mar 2022 22:57:48 +0700 Subject: [PATCH 6/9] hosts: move nginx from caramel to sugarcane (cherry picked from commit 613280b0e22140be7b662c27c311a31751646ba9) --- hosts/sugarcane/default.nix | 34 +++++++++++++++++++--------------- modules/system/wireguard.nix | 4 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix index fb2a276..d5ed5dd 100644 --- a/hosts/sugarcane/default.nix +++ b/hosts/sugarcane/default.nix @@ -7,22 +7,26 @@ passwd.file = ../../secrets/passwd.age; wg_sugarcane.file = ../../secrets/wg_sugarcane.age; }; - imports = with modules.system; [ - (modulesPath + "/profiles/qemu-guest.nix") - inputs.home-manager-raccoon.nixosModule + imports = + (with modules.system; [ + (modulesPath + "/profiles/qemu-guest.nix") + inputs.home-manager-raccoon.nixosModule - base - home-manager - input - nix-stable - security - wireguard + base + home-manager + input + nix-stable + security + wireguard - ./filesystem.nix - ./kernel.nix - ./networking.nix - ./packages.nix + ./filesystem.nix + ./kernel.nix + ./networking.nix + ./packages.nix - ../../users/hana - ]; + ../../users/hana + ]) ++ + (with modules.services; [ + nginx + ]); } diff --git a/modules/system/wireguard.nix b/modules/system/wireguard.nix index 97717db..af17abe 100644 --- a/modules/system/wireguard.nix +++ b/modules/system/wireguard.nix @@ -6,8 +6,8 @@ let serverIp = "51.79.240.130"; forwarding = { - "80" = [ "10.100.0.2" "80" ]; - "443" = [ "10.100.0.2" "443" ]; +# "80" = [ "10.100.0.2" "80" ]; +# "443" = [ "10.100.0.2" "443" ]; "22727" = [ "10.100.0.3" "7777" ]; }; From 80eae5f33805dd4a33204ac31d0304d4dd55a122 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 28 Mar 2022 23:04:30 +0700 Subject: [PATCH 7/9] services/nginx: open ports 80 and 443 (cherry picked from commit 328b0283483b18dda90904fb975368d414a72118) --- modules/services/nginx.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index 4b01c80..b0aa596 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -1,4 +1,5 @@ { config, inputs, ... }: { + networking.firewall.allowedTCPPorts = [ 80 443 ]; security.acme = { acceptTerms = true; email = "me@lava.moe"; From c520a64c343f1046ff9e44fc4c8fb65f04e4db31 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 22 Nov 2022 19:22:56 +0700 Subject: [PATCH 8/9] secrets: allow sugarcane to access acme_dns, and rekey (cherry picked from commit c34578dd0397e17153893dc9bc43cbfd2fa797cb) (cherry picked from commit 3b5f8350e3716f3e30113d713fb44e33f8dc486e) --- hosts/sugarcane/default.nix | 1 + secrets.nix | 2 +- secrets/acme_dns.age | Bin 411 -> 535 bytes secrets/passwd.age | 25 ++++++++++++------------- secrets/warden_admin.age | Bin 534 -> 554 bytes secrets/wg_blossom.age | 18 ++++++++---------- secrets/wg_caramel.age | Bin 479 -> 449 bytes secrets/wg_sugarcane.age | Bin 461 -> 495 bytes secrets/wpa_conf.age | Bin 567 -> 648 bytes 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix index d5ed5dd..d7f9570 100644 --- a/hosts/sugarcane/default.nix +++ b/hosts/sugarcane/default.nix @@ -4,6 +4,7 @@ time.timeZone = "Asia/Singapore"; age.secrets = { + acme_dns.file = ../../secrets/acme_dns.age; passwd.file = ../../secrets/passwd.age; wg_sugarcane.file = ../../secrets/wg_sugarcane.age; }; diff --git a/secrets.nix b/secrets.nix index a713b13..bf67798 100644 --- a/secrets.nix +++ b/secrets.nix @@ -8,7 +8,7 @@ in { "secrets/passwd.age".publicKeys = [ blossom caramel sugarcane rin ]; "secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ]; - "secrets/acme_dns.age".publicKeys = [ caramel rin ]; + "secrets/acme_dns.age".publicKeys = [ caramel sugarcane rin ]; "secrets/warden_admin.age".publicKeys = [ caramel rin ]; "secrets/wg_blossom.age".publicKeys = [ blossom rin ]; "secrets/wg_caramel.age".publicKeys = [ caramel rin ]; diff --git a/secrets/acme_dns.age b/secrets/acme_dns.age index aae2a16c30dbebc861b988db329834755345eac4..79791745b02c7dd59733275da1058965cc16603f 100644 GIT binary patch delta 508 zcmbQuJe_5NYJGN5WNK-kLWaMAL9&-Yh>MqJu6}NAfuDD}iKS_>Wu~E-sgprka6p)k zM`T1*W`tormv?4rmU)S@OI~iWVYWeOrdxq&UTAPcVyR!IVUk5wMQK53nRB>VQnGP5 zm#&>cadC!jYKoDmsiCEUM}@I@a=Ai*Ux<%mibrO;Nxe^opR-G#flGRrS8lMog@1{E zMo@NCm8VH*rD1wnq-#ExetA)LMO2D~yG5o~u2D{jfuEOwXr9f&LL=04bkmDc6N^*1O2czPf(-IgJ@fst)5`s_1Kj+I!cq%DxO8=O6-p}1OFVK- z%6tMmQ%x-k!>aPqN?p^Fs-nD$d^00GN{!94-7|9Cd?U*Pi@9`eIduw6eAlHUsVr+) zc=Xej{nwXVz0q`ZnorQZ7mwx(GeofN;E~;DUi0kz_FadjPMd!)`rnj1S6c?Xs?8FU kUs|pcd?YHku=}a<-Peo1DEzZjXw-_5y{mJnZ|31J0Q(TOJ^%m! delta 383 zcmbQvGMjmVYJI4sTSQK}LW)aXgqy!fW@ve4MQUz^VR(RBRIsn1seYAtMTw((R#Zh% zrc+XJXi!i(S8179dP;!4k4tWpZ&azild)%bc%*ApT9CGfd5BkWka1MLMMh**Nk*V6 zm#&>cadC!jYKoDmsiCDpc2Q(%X`n)6zOh?Gl2L(6W_?yfnUPmTWSL)pv8S7Xi=#_r zdU%$nhiiUlPMUMMaaA%`Sx%)%u2Ds$ds?Yig;PLjszGkHWlDZZvPq<)t9N8bxKDY7 zWlmODMtCvEIvw5gqSVCVRIW0UfHHT3?A(fojI0cEuQV=QU0nsU%5;lT(?rXH3S+bU zV&B4w%rH-rsDQN8MD5DpEN>?Z_aOa{WM_B%sEAOm!p0EAA2qITm02G2^<5AuI?MBk zBk=8+5Efw`@j&05CntJF2r6%~N~_5Z&OA^YSGP3o+IjByODtc!r`9f4`rxVQKCRF5 cE?37z09Yr7_y7O^ diff --git a/secrets/passwd.age b/secrets/passwd.age index 0e7d693..e792792 100644 --- a/secrets/passwd.age +++ b/secrets/passwd.age @@ -1,14 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg U5BvNdCURLw3Za/EFnyiwJWE+nR05pw6N/gyCCtejRg -UwW0knEEwdbsNIDF8pCIbwwf4X5hahwZ0Cx8w2+b6i0 --> ssh-ed25519 Hx37cw vO0M5kzkG7BtuNpC5+xtM663HKqj80KQ0qWh+wkSPxM -lbTCCCv+VNuGXPmpC7rzLeTlqZWqAXzc24eZ1gZShBI --> ssh-ed25519 krYeuQ DCsEUqV49Wg4BdWydxKmVQnFZrwxpFd6ZhJ1w9RyC3w -gio9eITeS3kjOW/jtm2ajmKqvBecj+rjlvAqLILuiW4 --> ssh-ed25519 CUCjXQ eGjsQfi+/Habc+KcQZRtVp2T+Vs/QK+VR6tmouxkzWw -y1aAwk8qJ4m0xmIGsQbMnT01+zawmp0B34tUX+mPkSw --> 4"nrU-grease hfIl x e)a -xyMmSA ---- ISCslqpC6CkOA7RcpPOtAC8JA68s3AhMdYdeDlJOW6M -\o$;|*,< -yC YSAuۈU2`DUw,f~S|B2;c+ձa)F$TܸrЫv^sAtdòXP \ No newline at end of file +-> ssh-ed25519 CUCjXQ ZrbLZXETJagm+HHfxYT0a8pyUngDlw6YKNG3xK5W9zQ +L8D/Hr/ir0BFnZrJKtCkfSQkX+/4OzHg0m26RzHCE9U +-> ssh-ed25519 krYeuQ 10ymP+C5ZeRwrnxtErKA9VKHuVPy8+bNHJObzX0Jp0U +OCquEuxRe3xt12IkmkP8RnY8pz9KcRKNVIQVWA52eIE +-> ssh-ed25519 Hx37cw v1nwWHdbSLdk8Wk0RF0nKBGIiANyXBxOEyU8jESA7Wc +an8NMIhDKgNhHBecOzEuXHKdcr3+aAQPXly88+791a0 +-> ssh-ed25519 U9FXlg L/9mBIcwWLDcEZWT32Oo0WzWeoRVoZN2Rah7oNt7Gio +akZ3AdYuKAEfXiNKZk3XHm4IrwSCjCPKe9yk9mfYmVI +-> +-grease Q{/ ++e/clwQ33SN111HEvsNUxjXJl0NRROAK +--- f0/c5YRQjnyZirMkYSA05W0meE1lOMXaDSh9xbwBiR4 +ͅИ_N@rċnv_y,]!nDx񯮴SXBnz~b79bȌeHA֮d!ΌOsJZ}P3W&S\w_gC" \ No newline at end of file diff --git a/secrets/warden_admin.age b/secrets/warden_admin.age index 972ef49f73da20460bb0b623b8ba3071683294b3..900de0aaaeff43fd677b33506f33a2c63ebc9379 100644 GIT binary patch delta 528 zcmbQnvWjJbYJGN5WNK-kLVi?apnhn+et2n6L~dbnWTanVa#5~-g`vA~Sw>Zwerkrh zn~{0Ce@VFsSBQC-Z&{VEVOdpjMQCzhh;eaYnTNkYewM$5t5Ld}zqeDaeqL%oXqb;L zm#&>cadC!jYKoDmsiCDpsHIy(PP&3|s%e#LMOAL1X??L%R=Q_KPGE#bnX{w2OQDHl zN|Z~bONpCjvYBH8k02kM6 z|Fn9y;Bu!z{fvNp2i-3&E z440BHE?r$+g|OTZ$6OybkErs9oWdOcFw^=_&!9;6TnlsaqGWSNwk0i%* zU#^vwFXN79Z7;2QvH9GuHrEdyr^Rlr*2_BY7H~8=`Tvtv-pp(_7Y_dJtLyc4X^QOM z-Lg%IiN`2HrRsoYZODz5z4G&CYj8;xvba4zv5DPXYJibjP*_D&Mz(Xheq~~2gsDNWxrs-x zZ*h)yReo?eS8!ofX<&&-Mv9rIvrAA;p|)9AVWmNqepIPnu5o#ybGms!Xo;n3VVH{n zm#&>cadC!jYKoDmsiCDpc2Q(%X`q5`>P-{cP{x3T-nVcV~~#sz}H5^vH-z3umLmjQpbPNUn&YNWZfDA}1GjgT&OT zOe6Q;%;a3hG?RkB?Cc_+3s!GQS-*WRX11?=%U4^XBoD4sMO5=Qe zFa4~*oMbGFkU-;%s4}C_B7@|jis0fB_tYpOi)5}{E*xI=t>sVV%ePso7MotJ z`g4MPZFc{nOJ93B9A_JcD(wz4J{R4SnJ0MaX|KWeoj2Jh?a!VxSl diff --git a/secrets/wg_blossom.age b/secrets/wg_blossom.age index 6b5df62..2d3fdad 100644 --- a/secrets/wg_blossom.age +++ b/secrets/wg_blossom.age @@ -1,11 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg Y/Q29duiKdP+fV11ellTIMtHFyi9saczXfbcnq7iB0s -D9P8MAHlFOLR7P8Ux90CjljnhExARGnuSuw24AXOr5c --> ssh-ed25519 CUCjXQ eGpAJd5fydYBlC7o34CP7091jg4O4NsuLji1/rYtQVg -9/rgYCpe9wcCrLM7fTYI92oa+3+SAEK6ZgJNmBeOtnM --> A-grease xTj~+6%4 aF]RZn tj](JCp -5iDN8bexrr7eNqyFwBNCUefrOqAIS10KppbrdDJH1+fD0TkUifEOjcM2uV/+3tH2 -dYX5eM94zkmwxw ---- QKnJmu6ICTTfadXCKLKii03FXVTBqAFvbAZVHGzGLzE - ssh-ed25519 CUCjXQ Fp3Mrgaw4yRKvdabJJ3dNcnKXJUqRuZP4QO8f3wN3SY +IkH7jnotoXzo8HE42s2pT3MR4JckFbdBWajnsOBJZl8 +-> ssh-ed25519 U9FXlg 89PWDDxlJs2wAx0MpHQ4/nQOYBhDOW3IHbT8ZMNrW1U +5SqO0LRGbnPSaT4Wyskn+TjLROkBlXZj4CZpUdprASw +-> 7.-grease "7|kya +h1PiRYdaZsbG0yfAlNY/jSFOwcKxWi5DhZqn20c8iQ +--- Z76EcD46quTH32YiSgnqhHpDdRcZJu5Q/+jtOutFl6c +xCrwbkgcަqnբͲߒ֜d'ts֝>\nݟTo/~4|֖ \ No newline at end of file diff --git a/secrets/wg_caramel.age b/secrets/wg_caramel.age index 2a18202bcd6cea702c270ac871e992141510fdfb..57604cf7ed37f9c0761cd0ae8ab2c2a5515580c5 100644 GIT binary patch delta 422 zcmcc5e2{s9YJGN5WNK-kf<=UZb5(g}ZlJMyqOo~IRcL8uU{0!Onqgp8NU&LjiFbH* zScp%cnOm?4m${)^d3L&cpm}0>m9}3cadC!jYKoDmsiCDpsHIy(PP&3+pi_Qfo=;wYe!Wwwey~?rX_|4Uwo6EgTZCJg zOI}`SnMr<;WuAv;QdKrrq=9#_PpN64fm=wZzFC@gm}jVKL2_wPcA36*a!OuVfsbjB zv2j*%nM*RrIz!#`qSVCVR4&Vu0E4t-%ZN00|6(WOETeSOLQ9{(T$7-{tmMk<UCN~bC}$Mk^UAmc1Q*Yb4Ftf0aaXH#dcVvBSWE?r$+h4iGNOy5#x^9WPl z#Jo`F^0Z=oNAr?&SHHZXtTZRr(p+z!lJKG`{Y3M8u75vLTr*C-dm8#?otW%N#f2e< zxgB;N5O14qJ$drZx!Z!CE!VnNb^hOqkcGRgItt`-%7Rt5w=X;6G~@avY3~m9@2{?3 Rz3`_qeJ%T`!aHl{0RVqMnxy~$ delta 452 zcmX@ee4lxOYJI4sTSQK}LSA99hq0%Aj%SfeN>!$7ildojrg@Tqf22{OWv0KWL1ku+ zrMIhTNp5g5msv@PS%!OZq(!BXqhGeKmy3UZfqA8|yQ^Q4p=*k-t9y`RdS$kMcD{!z zm#&>cadC!jYKoDmsiCDpc2Q(%X`n(_T10T6iLskUL48QLNtAxLzhAngPlaKYNm03L zRep$Jh((~YZ=zd9dU`omaEPl}e!g*9T1IZVSwWhAgtvcMXp);(PElD@TCty3h)<cgJ4JJG%xM&$_g%BU0nr>!VH7Ts-P@S*Ssi8mnai`=ipS!?0}MRW9RaS)RF+7 zl+1`qGyg(;uTZYqJdbH^Z*&Y|!!|98xxiCpTlwqt>=j{)8SdQr&3Vo6@b72o&1`&U t)e_1~!qz)ISs(i~EkV)pXyfUIc^OL>EvEbyNtyUw;cw=Xg=szB8v!4lpZ@>= diff --git a/secrets/wg_sugarcane.age b/secrets/wg_sugarcane.age index 9c967393313c9e4c43911e6fbf0fedf56b3adbd9..208c84696f0e2a1e06d37c24c9301ea27821a9e9 100644 GIT binary patch delta 468 zcmX@h{GNG&YQ0B=v3YX2f`Px8k#=y9QKfTkX-cadC!jYKoDmsiCDpsHIy(PP#&odz81YvvX#JQN4v>QA$v$VPH{iy1QqTiC1QB zuwP2qSVCVRE4U!>j9eFsfaIe5%nFlI*Q$(?veMuJpG2-4!y-#}OQ%9d zPm|Kh>~Oz)gRlU%s@&`-6UU02FxLp5&@e-%U{@|(U0nt5)S!x-3T^ZBq@rvir^2F0 zBVW(Viol#w%RGz13M0>SU*Gbw&`2+fauY7!eRk>>#6pUy=Us91e;vE&Gmq>?C*F>x zX%fGh*KW=UE|aKV^<#a!r_7%d6SthqIkiM1P4R5r%JO%q_QBa5@iqJRT%Yvx-R5=k KC*>Y~RtW(7pQ+~n delta 434 zcmaFQe3p5FYJI4sTSQK}f^R@}a*2MFM^u=TS-4YyQ+ZK_Nq~M@X@)_fXNr4@e~Q0> zZ@FoHj-Q7km$|n`RkD|}XHHUXkcnSFuv3YlUv{CdYp{1(hGAq@s=leQp<7m7M7pH` zm#&>cadC!jYKoDmsiCEUM}@I@a=AjOYhsycWLl)QM}2BWWroF4aJsp#NnVnNzGJXY<`k7UQl$ZU&%l5*qRFw-oj68$7+H^0nsuGVh9Nh@Zl zirSoH1pSCr7eD)iW^L`&TR;mU^<*RDFyHIAd bSB^KX;97rXtH5mDHJ;bJ8BTnelkW}yRMwWu diff --git a/secrets/wpa_conf.age b/secrets/wpa_conf.age index 60be4dbaa21a3f34ff8a9cc41e0c90ccf1fa59b0..bec6ef19c8d7121ec9eccaa7951072b9f69cb13b 100644 GIT binary patch delta 622 zcmdna(!n}Gwca_@IV&Pi!O_emFx%I{CCj+nEZi(9$t2Sytt2TuG&DUsyD-xuIXKtN zG}$uOEi=f1%O}sLuq-*#-6_H>(KjNgtjeXx&96AEG|ke<#W5q;vcR{h(5N!dJ5)cJ zOV>`JxHv;MHO0u()X-8PyC^cXG*BV4qAJY9Ti?>pr{2IM$TvI0($mSg+&!(#qS7<3 zGT0==q&Pb=A~Pts$~BoQ$1EZz(m60&-`&_aKh@MQ(9b2!qS7!UIG`jlKg-h7-6^>+ zz$mLQ(b5Fnx=>5Eh@5nVFe9&I(^NzKLgOTT7iZU0!;~Tu|00Vrzof|eBxCn1Llajc z6Vr6ZTt`;}u8MN6vZQPye@F9lx1jP+N6!FXFQX(c_wwX0k3g4#g6xV&!w}2xumE>Y zkagZ(y6Hu!iN&c39#NT5+Ik8pj#-Yyc~-7mJ{cBXm43zf6=p zNnY9}Va0`kzD}NLW%X6Qg)X6HejX8Kg zM#jm^Tdpq@`}_FQQQ3#5`_7mi-X<5y#Ly^sh}W=JSNeU|+wDS6tMbAGAO2!0cmM2L wQeLUJd)n^3J#6c$H~DYRciS=7<)rgV?!ZV@UFKa%CFUmQPd2>QmXBNn0N&-<82|tP delta 541 zcmeBR-Oe&WwLa9+Eg~mfAt@xt**LJEEU&;Ivoa?lvP?hRv(P`$KP)uF-N-1{v&5@3 zGutiO-9I~@tH?adMcc$VHO1XHD6}xgEZo>D)g|04)!5z3-_xMf!@x7FG^N`JxHv;MHO0u()X-8PyC^cXG*F?$s3M>+FT}Xezdpy^%ObEKDcqn)U%M(PFVnp! zN83L!$iO|&FfBRP($Ip-Da5=W$vw%(&o@6MBD^FZ%~;xX;*^TQK=-`*%z#{{bZyJ< zZ0`({U=z1uu9CE{qJk*1H1m=a1GAvi!0h0Nya-p%Aj^sp=iKa|#G=d$&j8o33=e-t zkag~%dAYjjMX8C!sR}V6Nos`(I-zP2CJL3tTv_EMh1r2zy1Kdw!DY@>`hn&ZPAQoc zX~vnM9_c2<#T6bo8TC=#9(gAI&JjT_7U52=?g7DpTvGD>MR~H@w3$yVi{!ui@Ox#? ze}<#Hza9F2mu@qy5t%xxIzI Date: Sat, 3 Dec 2022 00:00:03 +0700 Subject: [PATCH 9/9] user/zsh: update abbreviations --- modules/system/home-manager.nix | 1 - modules/user/zsh.nix | 17 +++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/system/home-manager.nix b/modules/system/home-manager.nix index 43bc0ac..cb07f48 100644 --- a/modules/system/home-manager.nix +++ b/modules/system/home-manager.nix @@ -4,7 +4,6 @@ useUserPackages = true; extraSpecialArgs = { inherit enableGUI inputs modules; - sysConfig = config; }; }; } diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix index 35b5e7c..a03d6ee 100644 --- a/modules/user/zsh.nix +++ b/modules/user/zsh.nix @@ -1,5 +1,5 @@ # vim: ft=nix -{ config, inputs, pkgs, sysConfig, ... }: +{ config, inputs, pkgs, ... }: let lib = pkgs.lib; @@ -15,19 +15,12 @@ let ll = "ls -al"; q = "exit"; - peach = "ssh lava@peach"; - bunny = "ssh bunny@peach"; - - fa = "grep -Inr"; - fai = "grep -Iinr"; + fa = "rg"; + fai = "rg -i"; g1 = "xgamma -gamma 1"; g3 = "xgamma -gamma 1.3"; - bat = "echo 'battery' | doas tee /sys/class/drm/card1/device/power_dpm_state"; - bal = "echo 'balanced' | doas tee /sys/class/drm/card1/device/power_dpm_state"; - sclk = "doas setclock 50000 70000 800"; - sysu = "doas systemctl restart"; sysd = "doas systemctl stop"; syss = "doas systemctl status"; @@ -38,7 +31,7 @@ let jf = "doas journalctl -f"; fl = "cd ~/Projects/flakes"; - nr = "doas nixos-rebuild switch --flake .#${sysConfig.networking.hostName} -v"; + nr = "doas nixos-rebuild switch --flake .# -v -L"; gs = "git status"; ga = "git add"; @@ -49,7 +42,7 @@ let gco = "git checkout"; gd = "git diff"; gds = "git diff --staged"; - gf = "git commit --amend --no-edit --reset-author"; + gf = "git commit --amend --reset-author --no-edit"; gl = "git log"; gr = "git rebase -i"; };