From 48ecc799b8f4cc7fc07864c4731f3575ac1862f9 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Wed, 6 Sep 2023 11:59:18 +0300 Subject: [PATCH 01/15] added some stuff Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index d540c51..e7c77db 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -42,6 +42,7 @@ in { stateVersion = "22.11"; packages = with pkgs; [ firefox + tor-browser-bundle-bin kate distrobox fish @@ -140,6 +141,8 @@ in { weechat filezilla fluffychat + akregator + bitwarden ]; }; From 6419aa1694af4d4fb39ef002a785e1708b543655 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:00:00 +0300 Subject: [PATCH 02/15] schildichat Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index e7c77db..9d3108b 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -143,6 +143,7 @@ in { fluffychat akregator bitwarden + schildichat ]; }; From 72c04a0a369eba84a7a6dde573894998d8944025 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:00:53 +0300 Subject: [PATCH 03/15] schildichat but fixed. also xonsh Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 9d3108b..1dc8314 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -143,7 +143,8 @@ in { fluffychat akregator bitwarden - schildichat + schildichat-desktop + xonsh ]; }; From da80dcb4524b764803bb9b5f9e4dfe7c1ef0535f Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:38:04 +0300 Subject: [PATCH 04/15] kiwix! Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 1dc8314..414f54d 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -145,6 +145,7 @@ in { bitwarden schildichat-desktop xonsh + kiwix ]; }; From 0c79175556b59d13455bdc8658dd221722fbd0aa Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:44:17 +0300 Subject: [PATCH 05/15] VSCopium Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 414f54d..bb3da88 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -214,7 +214,14 @@ in { }; }; }; - + vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + enkia.tokyo-night # Tokyo Night theme + arcticicestudio.nord-visual-studio-code # Nord theme + ]; + }; }; services = { From de51856d5b408d9ce60097155f8208b32cbead19 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:48:34 +0300 Subject: [PATCH 06/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'eww': 'github:elkowar/eww/25e50eda46379bccd8a7887c18ee35833e0460e8' (2023-06-10) → 'github:elkowar/eww/a9a35c1804d72ef92e04ee71555bd9e5a08fa17e' (2023-08-18) • Updated input 'helix': 'github:helix-editor/helix/843ae971209d41b88b66d282979ed76303ec5e34' (2023-07-13) → 'github:helix-editor/helix/8017bb29990bd15eb31542fa25e8cb1207364b07' (2023-09-08) • Added input 'helix/crane': 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07) • Added input 'helix/crane/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) • Added input 'helix/crane/flake-utils': follows 'helix/flake-utils' • Added input 'helix/crane/nixpkgs': follows 'helix/nixpkgs' • Added input 'helix/crane/rust-overlay': follows 'helix/rust-overlay' • Added input 'helix/flake-utils': 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11) • Added input 'helix/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Removed input 'helix/nci' • Removed input 'helix/nci/dream2nix' • Removed input 'helix/nci/dream2nix/all-cabal-json' • Removed input 'helix/nci/dream2nix/crane' • Removed input 'helix/nci/dream2nix/devshell' • Removed input 'helix/nci/dream2nix/drv-parts' • Removed input 'helix/nci/dream2nix/drv-parts/flake-compat' • Removed input 'helix/nci/dream2nix/drv-parts/flake-parts' • Removed input 'helix/nci/dream2nix/drv-parts/nixpkgs' • Removed input 'helix/nci/dream2nix/flake-compat' • Removed input 'helix/nci/dream2nix/flake-parts' • Removed input 'helix/nci/dream2nix/flake-utils-pre-commit' • Removed input 'helix/nci/dream2nix/ghc-utils' • Removed input 'helix/nci/dream2nix/gomod2nix' • Removed input 'helix/nci/dream2nix/mach-nix' • Removed input 'helix/nci/dream2nix/nix-pypi-fetcher' • Removed input 'helix/nci/dream2nix/nixpkgs' • Removed input 'helix/nci/dream2nix/nixpkgsV1' • Removed input 'helix/nci/dream2nix/poetry2nix' • Removed input 'helix/nci/dream2nix/pre-commit-hooks' • Removed input 'helix/nci/dream2nix/pruned-racket-catalog' • Removed input 'helix/nci/mk-naked-shell' • Removed input 'helix/nci/nixpkgs' • Removed input 'helix/nci/parts' • Removed input 'helix/nci/parts/nixpkgs-lib' • Removed input 'helix/nci/rust-overlay' • Removed input 'helix/parts' • Removed input 'helix/parts/nixpkgs-lib' • Updated input 'helix/rust-overlay': 'github:oxalica/rust-overlay/c57e210faf68e5d5386f18f1b17ad8365d25e4ed' (2023-05-11) → 'github:oxalica/rust-overlay/f335a0213504c7e6481c359dc1009be9cf34432c' (2023-07-27) • Updated input 'helix/rust-overlay/flake-utils': 'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11) → follows 'helix/flake-utils' • Removed input 'helix/rust-overlay/flake-utils/systems' • Updated input 'home-manager': 'github:nix-community/home-manager/e42fb59768f0305085abde0dd27ab5e0cc15420c' (2023-07-12) → 'github:nix-community/home-manager/19c6a4081b14443420358262f8416149bd79561a' (2023-09-08) • Updated input 'hypr-contrib': 'github:hyprwm/contrib/3126196e7ed609e7c427a39dc126ea067de62a65' (2023-07-08) → 'github:hyprwm/contrib/5b67181fced4fb06d26afcf9614b35765c576168' (2023-09-06) • Updated input 'hyprland': 'github:hyprwm/Hyprland/70dae78c1b5b17288a3e343b87ca6d10244ee937' (2023-07-13) → 'github:hyprwm/Hyprland/398e861b554268e43e8af64ba72c682630302ec3' (2023-09-07) • Updated input 'hyprland/hyprland-protocols': 'github:hyprwm/hyprland-protocols/8c279b9fb0f2b031427dc5ef4eab53f2ed835530' (2023-05-16) → 'github:hyprwm/hyprland-protocols/0c2ce70625cb30aef199cb388f99e19a61a6ce03' (2023-08-11) • Added input 'hyprland/hyprland-protocols/systems': follows 'hyprland/systems' • Added input 'hyprland/systems': 'github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68' (2023-07-14) • Updated input 'hyprland/wlroots': 'gitlab:wlroots/wlroots/7e7633abf09b362d0bad9e3fc650fd692369291d' (2023-06-14) → 'gitlab:wlroots/wlroots/717ded9bb0191ea31bf4368be32e7a15fe1b8294' (2023-08-25) • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/4d9ff0c17716936e0b5ca577a39e263633901ed1' (2023-05-29) → 'github:hyprwm/xdg-desktop-portal-hyprland/022469529c8bc95acf222dc5a62389b04c8b1205' (2023-09-06) • Added input 'hyprland/xdph/systems': follows 'hyprland/systems' • Updated input 'nix-but-gigachad': 'github:viperML/nh/1aa1158bdbd41390df8e5b37a9d4d0342c64d2b6' (2023-07-05) → 'github:viperML/nh/5a7b5732c9f7f0db9915cea6a154cf2bc082f895' (2023-09-02) • Updated input 'nix-but-gigachad/flake-parts': 'github:hercules-ci/flake-parts/37dd7bb15791c86d55c5121740a1887ab55ee836' (2023-06-26) → 'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01) • Updated input 'nix-but-gigachad/flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/4f53efe34b3a8877ac923b9350c874e3dcd5dc0a?dir=lib' (2023-05-31) → 'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01) • Updated input 'nix-software-center': 'github:vlinkz/nix-software-center/7ec2e70beeeacfd256239be545187badd832abe6' (2023-06-26) → 'github:vlinkz/nix-software-center/8faa762f9b710520f8b7f81f4892a6e0aba749dc' (2023-08-27) • Updated input 'nix-software-center/utils': 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31) → 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c' (2023-07-11) → 'github:NixOS/nixos-hardware/793de77d9f83418b428e8ba70d1e42c6507d0d35' (2023-09-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12) → 'github:NixOS/nixpkgs/0bffda19b8af722f8069d09d8b6a24594c80b352' (2023-09-06) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/4959cd51c6731a0e2fe92eaf0c9288f98333e2b5' (2023-07-13) → 'github:NixOS/nixpkgs/de26873baa4b59994d5491f4efa90e5716395aec' (2023-09-08) --- flake.lock | 384 ++++++++++++++--------------------------------------- 1 file changed, 101 insertions(+), 283 deletions(-) diff --git a/flake.lock b/flake.lock index 9ba5633..1f10eb8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,125 +1,32 @@ { "nodes": { "crane": { - "flake": false, - "locked": { - "lastModified": 1681175776, - "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "445a3d222947632b5593112bb817850e8a9cf737", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.12.1", - "repo": "crane", - "type": "github" - } - }, - "dream2nix": { "inputs": { - "all-cabal-json": [ - "helix", - "nci" - ], - "crane": "crane", - "devshell": [ - "helix", - "nci" - ], - "drv-parts": "drv-parts", "flake-compat": "flake-compat_2", - "flake-parts": [ + "flake-utils": [ "helix", - "nci", - "parts" - ], - "flake-utils-pre-commit": [ - "helix", - "nci" - ], - "ghc-utils": [ - "helix", - "nci" - ], - "gomod2nix": [ - "helix", - "nci" - ], - "mach-nix": [ - "helix", - "nci" - ], - "nix-pypi-fetcher": [ - "helix", - "nci" + "flake-utils" ], "nixpkgs": [ "helix", - "nci", "nixpkgs" ], - "nixpkgsV1": "nixpkgsV1", - "poetry2nix": [ + "rust-overlay": [ "helix", - "nci" - ], - "pre-commit-hooks": [ - "helix", - "nci" - ], - "pruned-racket-catalog": [ - "helix", - "nci" + "rust-overlay" ] }, "locked": { - "lastModified": 1683212002, - "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096", + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "drv-parts": { - "inputs": { - "flake-compat": [ - "helix", - "nci", - "dream2nix", - "flake-compat" - ], - "flake-parts": [ - "helix", - "nci", - "dream2nix", - "flake-parts" - ], - "nixpkgs": [ - "helix", - "nci", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1680698112, - "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", - "owner": "davhau", - "repo": "drv-parts", - "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", - "type": "github" - }, - "original": { - "owner": "davhau", - "repo": "drv-parts", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, @@ -154,11 +61,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1686423460, - "narHash": "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4=", + "lastModified": 1692366702, + "narHash": "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og=", "owner": "elkowar", "repo": "eww", - "rev": "25e50eda46379bccd8a7887c18ee35833e0460e8", + "rev": "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e", "type": "github" }, "original": { @@ -219,14 +126,14 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1687762428, - "narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=", + "lastModified": 1690933134, + "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "37dd7bb15791c86d55c5121740a1887ab55ee836", + "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "type": "github" }, "original": { @@ -255,11 +162,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -270,19 +177,19 @@ }, "helix": { "inputs": { - "nci": "nci", + "crane": "crane", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], - "parts": "parts_2", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1689253304, - "narHash": "sha256-jlU44ALjLw+Ft7g7+yT1Hs0Fqw2T158i0NptwpavCkc=", + "lastModified": 1694137596, + "narHash": "sha256-c/d4U6DSvaSogXg6uwuGYjrIXK5AW6K1Ovc+z7bB8GE=", "owner": "helix-editor", "repo": "helix", - "rev": "843ae971209d41b88b66d282979ed76303ec5e34", + "rev": "8017bb29990bd15eb31542fa25e8cb1207364b07", "type": "github" }, "original": { @@ -299,11 +206,11 @@ ] }, "locked": { - "lastModified": 1689134369, - "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", + "lastModified": 1694134858, + "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", "owner": "nix-community", "repo": "home-manager", - "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", + "rev": "19c6a4081b14443420358262f8416149bd79561a", "type": "github" }, "original": { @@ -319,11 +226,11 @@ ] }, "locked": { - "lastModified": 1688849364, - "narHash": "sha256-gW4x5YiCWFlckFiaLZo+RWJa1IyQ2Cx4jTrJzNy1OzQ=", + "lastModified": 1693997747, + "narHash": "sha256-W23nMGmDnyBgxO8O/9jcZtiSpa0taMNcRAD1das/ttw=", "owner": "hyprwm", "repo": "contrib", - "rev": "3126196e7ed609e7c427a39dc126ea067de62a65", + "rev": "5b67181fced4fb06d26afcf9614b35765c576168", "type": "github" }, "original": { @@ -338,15 +245,16 @@ "nixpkgs": [ "nixpkgs" ], + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1689251550, - "narHash": "sha256-lgyXuXeKJy0CowgEwQHp7z6k2voRXzLWRjnysPGoHpc=", + "lastModified": 1694097781, + "narHash": "sha256-z2ctVzvAftPUCV5TExLKUBDfAdaF7KpxqEOpG0hFBRg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "70dae78c1b5b17288a3e343b87ca6d10244ee937", + "rev": "398e861b554268e43e8af64ba72c682630302ec3", "type": "github" }, "original": { @@ -360,63 +268,23 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ] - }, - "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "mk-naked-shell": { - "flake": false, - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "nci": { - "inputs": { - "dream2nix": "dream2nix", - "mk-naked-shell": "mk-naked-shell", - "nixpkgs": [ - "helix", - "nixpkgs" ], - "parts": "parts", - "rust-overlay": [ - "helix", - "rust-overlay" + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1683699050, - "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", + "owner": "hyprwm", + "repo": "hyprland-protocols", "type": "github" } }, @@ -429,11 +297,11 @@ ] }, "locked": { - "lastModified": 1688552405, - "narHash": "sha256-vsqQgfHRAFBv1SRyRBSmSKf3OMf9gD+0LVoiqetmqvc=", + "lastModified": 1693636976, + "narHash": "sha256-uyiDao8pK6MgAQKxBEZU/ypMTZBxVbX1NRf5x0oHw+8=", "owner": "viperML", "repo": "nh", - "rev": "1aa1158bdbd41390df8e5b37a9d4d0342c64d2b6", + "rev": "5a7b5732c9f7f0db9915cea6a154cf2bc082f895", "type": "github" }, "original": { @@ -480,11 +348,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1687792881, - "narHash": "sha256-FWNT4+V1j5RjTS7TclYUBbuy80FGAH+aXr0rkIJd6i0=", + "lastModified": 1693158194, + "narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "7ec2e70beeeacfd256239be545187badd832abe6", + "rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc", "type": "github" }, "original": { @@ -495,11 +363,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1689060619, - "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", + "lastModified": 1693718952, + "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c", + "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35", "type": "github" }, "original": { @@ -510,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689192006, - "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { @@ -545,29 +413,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "lastModified": 1690881714, + "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1685564631, - "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "rev": "9e1960bc196baf6881340d53dccb203a951745a2", "type": "github" }, "original": { @@ -580,11 +430,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1689253283, - "narHash": "sha256-1T6BTB8aRl5+nR8bds+MtFYe7SqOVS58hPxSPoa7I3o=", + "lastModified": 1694162759, + "narHash": "sha256-yrPA6ALSlDmfHjla4I8ZvJKrAMe+SAaIKVWdvaeVYOk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4959cd51c6731a0e2fe92eaf0c9288f98333e2b5", + "rev": "de26873baa4b59994d5491f4efa90e5716395aec", "type": "github" }, "original": { @@ -594,61 +444,6 @@ "type": "github" } }, - "nixpkgsV1": { - "locked": { - "lastModified": 1678500271, - "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "parts": { - "inputs": { - "nixpkgs-lib": [ - "helix", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "root": { "inputs": { "everblush": "everblush", @@ -688,18 +483,21 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "helix", + "flake-utils" + ], "nixpkgs": [ "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1683771545, - "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=", + "lastModified": 1690424156, + "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed", + "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", "type": "github" }, "original": { @@ -724,6 +522,21 @@ } }, "systems_2": { + "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_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -740,14 +553,14 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -760,17 +573,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1686753331, - "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", + "lastModified": 1692976565, + "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", "owner": "wlroots", "repo": "wlroots", - "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" } }, @@ -783,14 +597,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", + "lastModified": 1694025408, + "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", + "rev": "022469529c8bc95acf222dc5a62389b04c8b1205", "type": "github" }, "original": { From 92d64d594caedcaf73dae39682d5e542368222c3 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:07:33 +0300 Subject: [PATCH 07/15] VSCopium but FHS Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index bb3da88..4f1782b 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -216,7 +216,7 @@ in { }; vscode = { enable = true; - package = pkgs.vscodium; + package = pkgs.vscodium-fhs; extensions = with pkgs.vscode-extensions; [ enkia.tokyo-night # Tokyo Night theme arcticicestudio.nord-visual-studio-code # Nord theme From 5588f7872ecef530f5743fa13058a8f924404b2e Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:08:59 +0300 Subject: [PATCH 08/15] VSCopium nix stuff Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 4f1782b..6e5a2d1 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -220,6 +220,7 @@ in { extensions = with pkgs.vscode-extensions; [ enkia.tokyo-night # Tokyo Night theme arcticicestudio.nord-visual-studio-code # Nord theme + jnoortheen.nix-ide # Nix stuff ]; }; From e4bff6b326029e00ce96da4660a770cc6167374b Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:10:45 +0300 Subject: [PATCH 09/15] htmlq Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 6e5a2d1..e232bdc 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -146,6 +146,7 @@ in { schildichat-desktop xonsh kiwix + htmlq ]; }; From 5fcef352e0c7705d1bad4f9b5cbe27bd0a51b60d Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:10:56 +0300 Subject: [PATCH 10/15] lite Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index e232bdc..e5c9003 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -147,6 +147,7 @@ in { xonsh kiwix htmlq + lite ]; }; From 7c28ff50aa652f972a08ee22c82b02f7a71a72a4 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:16:15 +0300 Subject: [PATCH 11/15] gitlens Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index e5c9003..2abecb7 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -1,7 +1,7 @@ inputs: { pkgs, lib, config, ... }: let - nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center; + # nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center; /* doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default.override { doomPrivateDir = ./doom.d; @@ -223,6 +223,7 @@ in { enkia.tokyo-night # Tokyo Night theme arcticicestudio.nord-visual-studio-code # Nord theme jnoortheen.nix-ide # Nix stuff + eamodio.gitlens # Giga git ]; }; From a92092ff5ca7e915760279ea31af876503291d87 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:18:47 +0300 Subject: [PATCH 12/15] magit Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 2abecb7..088b52c 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -223,7 +223,8 @@ in { enkia.tokyo-night # Tokyo Night theme arcticicestudio.nord-visual-studio-code # Nord theme jnoortheen.nix-ide # Nix stuff - eamodio.gitlens # Giga git + # eamodio.gitlens # Giga git, but with some paid stuff + kahole.magit # Giga git ]; }; From ab7419dcd4998ce5efe409ac4bef5be23b5277cc Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:27:29 +0300 Subject: [PATCH 13/15] more vscopium Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 088b52c..3d47388 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -226,6 +226,16 @@ in { # eamodio.gitlens # Giga git, but with some paid stuff kahole.magit # Giga git ]; + userSettings = { + nix = { + serverPath = "nil"; + enableLanguageServer = true; + }; + editor = { + fontLigatures = true; + fontFamily = "JetBrainsMono Nerd Font"; + }; + }; }; }; From 1e0542ccef9896a7084bfcf7df778d77d557102d Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:37:21 +0300 Subject: [PATCH 14/15] comma and some more vscoding Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- flake.lock | 6 +++--- users/ultra/home.nix | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 1f10eb8..efc8aa7 100644 --- a/flake.lock +++ b/flake.lock @@ -430,11 +430,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1694162759, - "narHash": "sha256-yrPA6ALSlDmfHjla4I8ZvJKrAMe+SAaIKVWdvaeVYOk=", + "lastModified": 1694167471, + "narHash": "sha256-/SUFUaz7Q7goeCbFd4rKyRPXZfGQzJjyU1tA2fZRNHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "de26873baa4b59994d5491f4efa90e5716395aec", + "rev": "d1f1457e3f66a757526da0cb49e5f93ba2c5dfc3", "type": "github" }, "original": { diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 3d47388..d548806 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -148,6 +148,7 @@ in { kiwix htmlq lite + comma ]; }; @@ -218,7 +219,8 @@ in { }; vscode = { enable = true; - package = pkgs.vscodium-fhs; + package = pkgs.vscodium; + mutableExtensionsDir = false; extensions = with pkgs.vscode-extensions; [ enkia.tokyo-night # Tokyo Night theme arcticicestudio.nord-visual-studio-code # Nord theme @@ -235,6 +237,9 @@ in { fontLigatures = true; fontFamily = "JetBrainsMono Nerd Font"; }; + workbench = { + colorTheme = "Tokyo Night"; + }; }; }; From 1d099fae817b61954b58794312d18d9f0404bc41 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:48:03 +0300 Subject: [PATCH 15/15] more vscopium Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> --- users/ultra/home.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index d548806..5b21ea5 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -236,10 +236,17 @@ in { editor = { fontLigatures = true; fontFamily = "JetBrainsMono Nerd Font"; + cursorBlinking = "smooth"; + cursorSmoothCaretAnimation = "on"; + tabSize = 2; + accessibilitySupport = "off"; }; workbench = { colorTheme = "Tokyo Night"; }; + files = { + autoSave = "on"; + }; }; };