diff --git a/flake.lock b/flake.lock index 2285002..d896d44 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1691497029, - "narHash": "sha256-vPuQkOxTU/XZfj2gCcrtZDmQ9xV95B4cvtMtmChhhGQ=", + "lastModified": 1692476235, + "narHash": "sha256-NGUDp/24HCIVWE0xZNHIdzz3q2WDk7MQz1wC7ub/e2U=", "owner": "Kirottu", "repo": "anyrun", - "rev": "7679b2fafdb2eab202a76aab9b563e16c50b7b06", + "rev": "76af3eb198f376303194c31a83f2399a043acf1b", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1691950993, - "narHash": "sha256-7GvvoIRkigRbACvqyRQB3tFrccSWnpEH0ZkmzgLKCR0=", + "lastModified": 1693391373, + "narHash": "sha256-3oLjlbJm/FTBL0v3YDPo9pOCRR8yPjJmaL+e89ryWnM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "def0e546482c60a2cb17a282e39466b0daa02e54", + "rev": "e39c38830e3e31c1c975710bddf90da2a5a35acb", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1690660426, - "narHash": "sha256-YUuH1BZ3G5dhHRZ1Z9XPXyorm8vV8G+jYbcdIGxOcOs=", + "lastModified": 1692366702, + "narHash": "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og=", "owner": "elkowar", "repo": "eww", - "rev": "dc3129aee2806823bdad87785f7ef80651d5245c", + "rev": "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1687083327, - "narHash": "sha256-1ZHIwhBaieb/Lvbph5NTgPta+r7V0RlaffgX3kbO9Jw=", + "lastModified": 1691100095, + "narHash": "sha256-qp+M5l18qHRmvUkYOqoi5AaspX7ZbqsVf6S8qQgEnFs=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "8f729fcbb4deccb0a588f1ec2fdb01785b4f0059", + "rev": "9a594f75cc782c481df9d108624409d429a23f19", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1691882297, - "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=", + "lastModified": 1693399033, + "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c3ab5ea047e6dc73df530948f7367455749d8906", + "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1691956363, - "narHash": "sha256-7OEF20mGdHWHX29w2UpSs5/uyzwQ+v1UaXFQK+4wyCA=", + "lastModified": 1693395737, + "narHash": "sha256-5A/kappjfRyM/pvbhDzhlaBOJhrrZbYaMWkQD11yk4c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0314a727eb27dd880b172b9ff2dc78c863f3ce5f", + "rev": "28a90d6055f7b616c611c839967765f6536a7cd9", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1691957223, - "narHash": "sha256-sbFNN/3j9ac7t0RuH3AYVFVxrAWLrI1vAMVp9mNCxXk=", + "lastModified": 1692983260, + "narHash": "sha256-mhwUyffx/7qPAu8m5C2aag8Ijo/d+1kTpQiOF+VcO70=", "owner": "chriscochrun", "repo": "church-presenter", - "rev": "a70acbdeeaccf4e3585fbc20872bb260516ad52e", + "rev": "bc3024434e45e79f993880e2e69467f95b721389", "type": "gitlab" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1690663306, - "narHash": "sha256-W0FGaSmnXUJa54T5c2SMHyAG3i/U2CJo9IMGFiCv74U=", + "lastModified": 1692363215, + "narHash": "sha256-S1wOozSPegIKK9dRBZoox9/vpdiLGC21I33Q0X0YwBU=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "2e53fd2e512872684f0619ac1540b7f229dbd206", + "rev": "70bfb03e885c30de777d6fbcc7c7c14a87f309b6", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1691871742, - "narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=", + "lastModified": 1692952286, + "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "430a56dd16fe583a812b2df44dca002acab2f4f6", + "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1693158576, + "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1691831739, - "narHash": "sha256-6e12VCvA7jOjhzJ1adLiUV1GTPXGBcCfhggsDwiuNB4=", + "lastModified": 1693231525, + "narHash": "sha256-Zmh8m0HHcgGBDth6jdJPmc4UAAP0L4jQmqIztywF1Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fe694c4156b84dac12627685c7ae592a71e2206", + "rev": "c540061ac8d72d6e6d99345bd2d590c82b2f58c1", "type": "github" }, "original": { @@ -421,11 +421,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1690593349, - "narHash": "sha256-i6jdORO+YiP19pFNeR7oYIIwmzQvdxwNO+BmtATcYpA=", + "lastModified": 1692279307, + "narHash": "sha256-7BMWvpLpGs3zvAm0c1HVYVoVIe0m0Cfp2GPpqxDte3U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11cf5e1c74fe6892e860afeeaf3bfb84fdb7b1c3", + "rev": "02bba6c619c91e8c8eef9ba1129d0eff31741445", "type": "github" }, "original": { @@ -467,11 +467,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1690558459, - "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=", + "lastModified": 1692207601, + "narHash": "sha256-tfPGNKQcJT1cvT6ufqO/7ydYNL6mcJClvzbrzhKjB80=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33", + "rev": "b30c68669df77d981ce4aefd6b9d378563f6fc4e", "type": "github" }, "original": { @@ -483,11 +483,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1693377291, + "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "e7f38be3775bab9659575f192ece011c033655f0", "type": "github" }, "original": { @@ -650,18 +650,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1691073628, - "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=", + "lastModified": 1692976565, + "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", "owner": "wlroots", "repo": "wlroots", - "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" } }, diff --git a/home/home.nix b/home/home.nix index 1059b20..1cce3cd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -754,8 +754,13 @@ window#waybar > box { enable = true; bashrcExtra = '' # export ENV_EFI_CODE_SECURE=/run/libvirt/nix-ovmf/OVMF_CODE.fd ENV_EFI_VARS_SECURE=/run/libvirt/nix-ovmf/OVMF_VARS.fd - source $(blesh-share)/ble.sh - ble-face auto_complete="fg=238" + case "$-" in + *i*) + source $(blesh-share)/ble.sh + ble-face auto_complete="fg=238" + eval "$(starship init bash)" + macchina;; + esac # export LESS_TERMCAP_mb=$'\e[1;32m' # export LESS_TERMCAP_md=$'\e[1;32m' # export LESS_TERMCAP_me=$'\e[0m' @@ -763,8 +768,6 @@ window#waybar > box { # export LESS_TERMCAP_so=$'\e[01;33m' # export LESS_TERMCAP_ue=$'\e[0m' # export LESS_TERMCAP_us=$'\e[1;4;31m' - eval "$(starship init bash)" - macchina ''; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index 2de45b9..e178ff0 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -129,7 +129,7 @@ with lib; programs.hyprland = { enable = true; xwayland.enable = true; - xwayland.hidpi = true; + # xwayland.hidpi = true; }; services.avahi = { diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index ca13c0b..68f2861 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -136,7 +136,7 @@ with lib; picom-jonaburg pamixer playerctl - # jellyfin-mpv-shim + jellyfin-mpv-shim pfetch macchina gimp