diff --git a/flake.lock b/flake.lock index d64aa307..a8fcdb9a 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1704321386, - "narHash": "sha256-d2ZIWHHsVviiqLDUuezuNO6w+V87EW6M+DwtNLN/Hmk=", + "lastModified": 1704677738, + "narHash": "sha256-3WYyt1QitK6+PNngv9QOn1GrxI42PXRDhC+FjAQBHP4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c81bc3f9baa0571d03d1297faddf3a08737fe49e", + "rev": "d8117453224ee4497573ed1b80f3bc62c68cf5be", "type": "github" }, "original": { @@ -70,27 +70,30 @@ "type": "github" } }, - "flake-utils": { + "flake-parts": { "inputs": { - "systems": "systems" + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -106,9 +109,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -124,9 +127,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -171,11 +174,32 @@ ] }, "locked": { - "lastModified": 1704383912, - "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", + "lastModified": 1704809957, + "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "owner": "nix-community", "repo": "home-manager", - "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", + "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { @@ -193,11 +217,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1704401523, - "narHash": "sha256-NSomiVEOXMRYlYLkPtBfXmMEL73tvWDAinG6zRWeRPo=", + "lastModified": 1704829327, + "narHash": "sha256-lUU1f6jaBMbbUI4CUHa1H0sf/yxbydK4JbxpGgUMGgk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "aeeeace102c14ea0ab4df6840ee225e1b14ea970", + "rev": "b240704bee1d04eacc27654ea875cf6f15033c7c", "type": "github" }, "original": { @@ -319,7 +343,10 @@ }, "hyprlang_3": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "xdg-portal-hyprland", + "nixpkgs" + ] }, "locked": { "lastModified": 1704287638, @@ -354,6 +381,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1704194953, @@ -385,22 +433,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "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_2": { "locked": { "lastModified": 1702645756, @@ -419,11 +451,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { @@ -482,22 +514,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1703961334, "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", @@ -515,18 +531,20 @@ }, "nixvim": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-parts": "flake-parts", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704409528, - "narHash": "sha256-P71jg1WyqKpXFBcl4p+ffAh4ihRQfCDINdTLK/ZV51g=", + "lastModified": 1704812275, + "narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=", "owner": "nix-community", "repo": "nixvim", - "rev": "5281e7957fb9b8536a6bd36d53b130d86a2639c0", + "rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e", "type": "github" }, "original": { @@ -537,11 +555,11 @@ }, "nur": { "locked": { - "lastModified": 1704409697, - "narHash": "sha256-nKi0q9agRHR2gXXQ3sUiJOr40e+20YyXC6yl6yDvZMU=", + "lastModified": 1704848647, + "narHash": "sha256-1IviMpJ0Ab22hMXH31u5d56VPmiSmvHe/qq8J9ewBsw=", "owner": "nix-community", "repo": "NUR", - "rev": "e329dc95214e8a0dd28d04d512263098fd7f4493", + "rev": "b0d642dc5a4d2fcf7ca7b5fe10121c77a8e2792d", "type": "github" }, "original": { @@ -553,20 +571,23 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "lastModified": 1704668415, + "narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c", "type": "github" }, "original": { @@ -608,7 +629,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -686,21 +707,6 @@ } }, "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": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -715,7 +721,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -734,16 +740,16 @@ "inputs": { "hyprland-protocols": "hyprland-protocols_2", "nixpkgs": "nixpkgs_5", - "systems": "systems_6", + "systems": "systems_5", "wlroots": "wlroots_2", "xdph": "xdph_2" }, "locked": { - "lastModified": 1704401523, - "narHash": "sha256-NSomiVEOXMRYlYLkPtBfXmMEL73tvWDAinG6zRWeRPo=", + "lastModified": 1704829327, + "narHash": "sha256-lUU1f6jaBMbbUI4CUHa1H0sf/yxbydK4JbxpGgUMGgk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "aeeeace102c14ea0ab4df6840ee225e1b14ea970", + "rev": "b240704bee1d04eacc27654ea875cf6f15033c7c", "type": "github" }, "original": { @@ -794,15 +800,15 @@ "inputs": { "hyprland-protocols": "hyprland-protocols_3", "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_8", - "systems": "systems_7" + "nixpkgs": "nixpkgs_7", + "systems": "systems_6" }, "locked": { - "lastModified": 1704400467, - "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", + "lastModified": 1704659450, + "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", + "rev": "6a5de92769d5b7038134044053f90e7458f6a197", "type": "github" }, "original": { diff --git a/home/desktop/cli/shell/zsh/default.nix b/home/desktop/cli/shell/zsh/default.nix index 438ee705..8806ddf1 100644 --- a/home/desktop/cli/shell/zsh/default.nix +++ b/home/desktop/cli/shell/zsh/default.nix @@ -134,7 +134,6 @@ in postman = "postman --use-gl=desktop"; insomnia = "insomnia --use-gl=desktop"; beekeeper-studio = "beekeeper-studio --use-gl=desktop"; - bad = "appimage-run ~/Downloads/BadlionClient"; g = "git"; ga = "git add"; gaa = "git add ."; diff --git a/home/desktop/cli/terminal/default.nix b/home/desktop/cli/terminal/default.nix index 391dd713..26000f2d 100644 --- a/home/desktop/cli/terminal/default.nix +++ b/home/desktop/cli/terminal/default.nix @@ -3,6 +3,6 @@ _: { # ./st ./foot ./kitty - # ./wezterm + ./wezterm ]; } diff --git a/home/desktop/cli/terminal/wezterm/default.nix b/home/desktop/cli/terminal/wezterm/default.nix index b37efc76..539bf60a 100644 --- a/home/desktop/cli/terminal/wezterm/default.nix +++ b/home/desktop/cli/terminal/wezterm/default.nix @@ -8,10 +8,13 @@ _: { local xcursor_theme = "macOS-BigSur" return { check_for_updates = false, - font_size = 12, - font = wezterm.font('Liga SFMono Nerd Font', { weight = 'Medium', italic = false }), + font_size = 16, + freetype_load_flags = 'NO_HINTING', + freetype_load_target = 'Normal', + line_height = 1.0, + font = wezterm.font('Berkeley Mono Trial', { weight = 'Medium', italic = false }), font = wezterm.font_with_fallback { - { family = 'Liga SFMono Nerd Font', weight = 'Medium', italic = false }, + { family = 'Berkeley Mono Trial', weight = 'Medium', italic = false }, 'Noto Color Emoji', }, adjust_window_size_when_changing_font_size = false, @@ -19,7 +22,7 @@ _: { default_cursor_style = "SteadyBlock", cursor_blink_ease_in = 'EaseIn', cursor_blink_ease_out = 'EaseOut', - color_scheme = "Tokyo Night", + color_scheme = "Catppuccin Mocha", enable_scroll_bar = false, enable_tab_bar = false, enable_wayland = false, diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix index 278f0d56..16a97b3f 100644 --- a/hosts/redyf/configuration.nix +++ b/hosts/redyf/configuration.nix @@ -119,6 +119,26 @@ cp -R $src/*.otf $out/share/fonts/opentype/ ''; }; + monolisa = prev.stdenvNoCC.mkDerivation rec { + pname = "monolisa"; + version = "dev"; + src = inputs.monolisa; + dontConfigure = true; + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -R $src/*.ttf $out/share/fonts/opentype/ + ''; + }; + berkeley = prev.stdenvNoCC.mkDerivation rec { + pname = "berkeley"; + version = "dev"; + src = inputs.berkeley; + dontConfigure = true; + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -R $src/*.otf $out/share/fonts/opentype/ + ''; + }; } ) ]; @@ -128,6 +148,8 @@ enableDefaultPackages = true; packages = with pkgs; [ sf-mono-liga-bin + monolisa + berkeley ]; fontconfig = { enable = true;