From f4a9173ab921da0c5ec2bcf11a91d7ef132c57bf Mon Sep 17 00:00:00 2001 From: cnst Date: Fri, 5 Jul 2024 15:32:13 +0200 Subject: [PATCH] added wezterm --- flake.lock | 36 ++++++++++----------- home/core/appearance/gtk.nix | 7 ++-- home/extra/cnst.nix | 1 + home/extra/kitty/default.nix | 2 +- home/extra/wezterm/default.nix | 7 ++++ nixos/core/default.nix | 1 + nixos/core/fonts.nix | 10 +++++- nixos/core/hyprland.nix | 11 ++++--- nixos/hosts/cnix/hardware-configuration.nix | 1 - nixos/services/cnix.nix | 2 +- 10 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 home/extra/wezterm/default.nix diff --git a/flake.lock b/flake.lock index b7b1304c..8e9e1384 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1720009717, - "narHash": "sha256-HICfiksmANfwC0UaoFJ3L6mLV/mObx6Ad4OtT0w22Zw=", + "lastModified": 1720178308, + "narHash": "sha256-f6XoinA5yS5VrzIEpj4xf6hYT5bD7HqLBGS01wg2kCg=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "a78c64a4dabce5e65361bafc6c1508981c385d71", + "rev": "35d77c2f1a85aebab21d059c04ced002794db5d7", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1719992360, - "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=", + "lastModified": 1720167120, + "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b", + "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1719971132, - "narHash": "sha256-/u/dRd43l8WHW8WIEAtMf4KnayefCLpB3VpLF2FBEno=", + "lastModified": 1720161606, + "narHash": "sha256-B0n9ZIrXGPN0oS1DKBYZu2P1fTsnYMmXQkFtj/6mEQ8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "97bbe0cc1dc3d8962a9d15404a3c41da0ad2a3b3", + "rev": "9e1740926b3910db38a8864e0220d012e14f7e8e", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719963642, - "narHash": "sha256-2+K/i8t4FkGCHEanISE8Q/SbLmWKp1dtpGlf44/x4m0=", + "lastModified": 1720137094, + "narHash": "sha256-K3iDLJy3K/ivR0uTlu2EXT+zrwMYNRn+CBGo+0kxxoc=", "owner": "neovim", "repo": "neovim", - "rev": "d413038b4fd71b7a335b6653aa64d2cb6daeac7b", + "rev": "3e6cec0befd41d37ee36cb4f602e84c58c5f0d27", "type": "github" }, "original": { @@ -573,11 +573,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/home/core/appearance/gtk.nix b/home/core/appearance/gtk.nix index 753998a8..dbc04ed7 100644 --- a/home/core/appearance/gtk.nix +++ b/home/core/appearance/gtk.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.pointerCursor = { name = "Adwaita"; package = pkgs.gnome.adwaita-icon-theme; @@ -16,8 +15,8 @@ name = "Gruvbox-Plus-Dark"; }; font = { - name = "FiraCode Nerd Font Light"; - size = 11; + name = "Monoid Nerd Font Retina Regular"; + size = 9; }; }; } diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix index e914ab1a..b4efa4ff 100644 --- a/home/extra/cnst.nix +++ b/home/extra/cnst.nix @@ -5,6 +5,7 @@ }: { imports = [ ./kitty + ./wezterm ./firefox ./neovim ./mako diff --git a/home/extra/kitty/default.nix b/home/extra/kitty/default.nix index 6825af26..7f8f860b 100644 --- a/home/extra/kitty/default.nix +++ b/home/extra/kitty/default.nix @@ -5,7 +5,7 @@ settings = { enable_audio_bell = false; open_url_with = "firefox-nightly"; - font_family = "Rec Mono Linear"; + font_family = "Input Mono Extra Light"; bold_font = "auto"; italic_font = "auto"; bold_italic_font = "auto"; diff --git a/home/extra/wezterm/default.nix b/home/extra/wezterm/default.nix new file mode 100644 index 00000000..66a5fdee --- /dev/null +++ b/home/extra/wezterm/default.nix @@ -0,0 +1,7 @@ +{ + programs.wezterm = { + enable = true; + enableZshIntegration = true; + colorSchemes = "Gruvbox Material (Gogh)"; + }; +} diff --git a/nixos/core/default.nix b/nixos/core/default.nix index 5bff909e..f40213fd 100644 --- a/nixos/core/default.nix +++ b/nixos/core/default.nix @@ -22,6 +22,7 @@ overlays = []; config = { allowUnfree = true; + input-fonts.acceptLicense = true; }; }; diff --git a/nixos/core/fonts.nix b/nixos/core/fonts.nix index 5192410a..c9ad60af 100644 --- a/nixos/core/fonts.nix +++ b/nixos/core/fonts.nix @@ -7,14 +7,22 @@ fira-code-symbols font-awesome recursive - jetbrains-mono + input-fonts (nerdfonts.override { fonts = [ "JetBrainsMono" "FiraCode" + "FiraMono" "Iosevka" "3270" "DroidSansMono" + "SourceCodePro" + "UbuntuMono" + "Overpass" + "Monoid" + "Mononoki" + "Hack" + "IBMPlexMono" ]; }) ]; diff --git a/nixos/core/hyprland.nix b/nixos/core/hyprland.nix index 787c5b86..ea7dc2e8 100644 --- a/nixos/core/hyprland.nix +++ b/nixos/core/hyprland.nix @@ -5,11 +5,12 @@ xwayland.enable = true; }; environment.sessionVariables = { + MOZ_ENABLE_WAYLAND = 1; NIXOS_OZONE_WL = "1"; - AMD_VULKAN_ICD = "RADV"; - SDL_VIDEODRIVER = "wayland"; - QT_QPA_PLATFORM = "wayland"; - XDG_SESSION_TYPE = "wayland"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + # AMD_VULKAN_ICD = "RADV"; + # SDL_VIDEODRIVER = "wayland"; + # QT_QPA_PLATFORM = "wayland"; + # XDG_SESSION_TYPE = "wayland"; + # QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; }; } diff --git a/nixos/hosts/cnix/hardware-configuration.nix b/nixos/hosts/cnix/hardware-configuration.nix index 6ff364b1..0e2608ad 100644 --- a/nixos/hosts/cnix/hardware-configuration.nix +++ b/nixos/hosts/cnix/hardware-configuration.nix @@ -19,7 +19,6 @@ "usbhid" "usb_storage" "sd_mod" - "amdgpu" ]; kernelModules = []; }; diff --git a/nixos/services/cnix.nix b/nixos/services/cnix.nix index 51c7eccf..2b18b6ca 100644 --- a/nixos/services/cnix.nix +++ b/nixos/services/cnix.nix @@ -39,7 +39,7 @@ extraLayouts.hhkbse = { description = "HHKBse by cnst"; languages = ["se"]; - symbolsFile = /home/cnst/.nix-config/hosts/cnix/xkb/symbols/hhkbse; + symbolsFile = /home/cnst/.nix-config/nixos/hosts/cnix/xkb/symbols/hhkbse; }; layout = "hhkbse"; # dir = "/home/cnst/.nix-config/nixos/xkb";