diff --git a/flake.lock b/flake.lock index 9ba5633..efc8aa7 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": 1694167471, + "narHash": "sha256-/SUFUaz7Q7goeCbFd4rKyRPXZfGQzJjyU1tA2fZRNHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4959cd51c6731a0e2fe92eaf0c9288f98333e2b5", + "rev": "d1f1457e3f66a757526da0cb49e5f93ba2c5dfc3", "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": { diff --git a/users/ultra/home.nix b/users/ultra/home.nix index fe93c43..6eb825d 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; @@ -42,6 +42,7 @@ in { stateVersion = "22.11"; packages = with pkgs; [ firefox + tor-browser-bundle-bin kate distrobox fish @@ -141,6 +142,14 @@ in { filezilla fluffychat bitwarden + akregator + bitwarden + schildichat-desktop + xonsh + kiwix + htmlq + lite + comma ]; }; @@ -209,7 +218,38 @@ in { }; }; }; - + vscode = { + enable = true; + package = pkgs.vscodium; + mutableExtensionsDir = false; + extensions = with pkgs.vscode-extensions; [ + enkia.tokyo-night # Tokyo Night theme + arcticicestudio.nord-visual-studio-code # Nord theme + jnoortheen.nix-ide # Nix stuff + # 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"; + cursorBlinking = "smooth"; + cursorSmoothCaretAnimation = "on"; + tabSize = 2; + accessibilitySupport = "off"; + }; + workbench = { + colorTheme = "Tokyo Night"; + }; + files = { + autoSave = "on"; + }; + }; + }; }; services = {