From 9233675f483bab44a37f7e19f0a66c3b0bf598de Mon Sep 17 00:00:00 2001 From: zack Date: Sat, 12 Oct 2024 19:45:59 -0400 Subject: [PATCH] stuff --- homes/x86_64-linux/zoey@earth/default.nix | 1 + modules/home/apps/term/alacritty/default.nix | 26 ++++++++++++------- modules/home/apps/term/rio/default.nix | 10 ++++--- .../tools/neovim/config/lua/plugins/core.lua | 12 +++++++++ .../neovim/config/snippets/nixconfig.json | 25 ++++++++++++++++++ modules/home/wms/hyprland/default.nix | 6 ++--- modules/nixos/sites/search/default.nix | 1 - modules/nixos/ui/fonts/default.nix | 2 +- packages/zen-browser-unwrapped/default.nix | 8 +++--- 9 files changed, 68 insertions(+), 23 deletions(-) create mode 100644 modules/home/apps/tools/neovim/config/snippets/nixconfig.json diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index 5b6ccf1..31ffbb7 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -23,6 +23,7 @@ term.kitty.enable = true; term.foot.enable = true; term.rio.enable = true; + term.alacritty.enable = true; music.spotify.enable = true; diff --git a/modules/home/apps/term/alacritty/default.nix b/modules/home/apps/term/alacritty/default.nix index 7894601..20d8a1a 100644 --- a/modules/home/apps/term/alacritty/default.nix +++ b/modules/home/apps/term/alacritty/default.nix @@ -13,20 +13,20 @@ in { fonts = { normal = { - family = mkStringOpt "ZedMono NFM" "The Family of the font"; - style = mkStringOpt "Bold" "The Style of the font"; - }; - bold = { - family = mkStringOpt "ZedMono NFM" "The Family of the font"; + family = mkStringOpt "Iosevka" "The Family of the font"; style = mkStringOpt "ExtraBold" "The Style of the font"; }; + bold = { + family = mkStringOpt "Iosevka" "The Family of the font"; + style = mkStringOpt "Heavy" "The Style of the font"; + }; italic = { - family = mkStringOpt "ZedMono NFM" "The Family of the font"; - style = mkStringOpt "Bold Italic" "The Style of the font"; + family = mkStringOpt "Iosevka" "The Family of the font"; + style = mkStringOpt "ExtraBold Italic" "The Style of the font"; }; bold_italic = { - family = mkStringOpt "ZedMono NFM" "The Family of the font"; - style = mkStringOpt "ExtraBold Italic" "The Style of the font"; + family = mkStringOpt "Iosevka" "The Family of the font"; + style = mkStringOpt "Heavy Italic" "The Style of the font"; }; }; }; @@ -37,7 +37,13 @@ in { catppuccin.enable = true; settings = { - background_opacity = "0.75"; + window = { + opacity = 0.95; + padding = { + x = 20; + y = 20; + }; + }; font = { normal = cfg.fonts.normal; bold = cfg.fonts.bold; diff --git a/modules/home/apps/term/rio/default.nix b/modules/home/apps/term/rio/default.nix index f69b542..72cd2a8 100644 --- a/modules/home/apps/term/rio/default.nix +++ b/modules/home/apps/term/rio/default.nix @@ -2,6 +2,7 @@ lib, config, pkgs, + inputs, ... }: with lib; @@ -15,6 +16,7 @@ in { config = mkIf cfg.enable { programs.rio = { enable = true; + package = inputs.rio-term.packages.${pkgs.system}.default; settings = { window = { opacity = 0.9; @@ -31,25 +33,25 @@ in { fonts = { regular = { family = "Iosevka"; - style = "normal"; + style = "Normal"; weight = 700; }; bold = { family = "Iosevka"; - style = "normal"; + style = "Normal"; weight = 800; }; italic = { family = "Iosevka"; - style = "italic"; + style = "Italic"; weight = 700; }; bold-italic = { family = "Iosevka"; - style = "italic"; + style = "Italic"; weight = 800; }; }; diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index bd0a97f..1cf80d5 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -5,6 +5,18 @@ return { colorscheme = "catppuccin", }, }, + { + "L3MON4D3/LuaSnip", + dependencies = { + "rafamadriz/friendly-snippets", + }, + config = function() + require("luasnip.loaders.from_vscode").lazy_load() + require("luasnip.loaders.from_vscode").lazy_load({ + paths = vim.fn.stdpath("config") .. "/snippets/", + }) + end, + }, { "stevearc/conform.nvim", opts = { diff --git a/modules/home/apps/tools/neovim/config/snippets/nixconfig.json b/modules/home/apps/tools/neovim/config/snippets/nixconfig.json new file mode 100644 index 0000000..1b3230c --- /dev/null +++ b/modules/home/apps/tools/neovim/config/snippets/nixconfig.json @@ -0,0 +1,25 @@ +{ + "Nix Module Template": { + "prefix": "nixcfg", + "body": [ + "{", + " lib,", + " config,", + " pkgs,", + " ...", + "}:", + "with lib;", + "with lib.custom; let", + " cfg = config.${1:moduleName};", + "in {", + " options.${1:moduleName} = with types; {", + " enable = mkBoolOpt false \"${2:Description}\";", + " };", + " config = mkIf cfg.enable {", + " $0", + " };", + "}" + ], + "description": "Template for a Nix module" + } +} diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index 553348c..5918c7d 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -60,11 +60,11 @@ in { wayland.windowManager.hyprland.settings = with colors; { exec-once = [ - "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"" + # "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"" "sway-audio-idle-inhibit" "zen-browser" "sleep 6;telegram-desktop" - "sleep 6;thunderbird" + "sleep 10;thunderbird" "vesktop" "spotify" "slack" @@ -72,7 +72,7 @@ in { bind = [ - ''${mod},RETURN,exec,kitty'' + ''${mod},RETURN,exec,${pkgs.kitty}/bin/kitty'' "${mod},D,exec,killall anyrun || anyrun" "${mod},Q,killactive" diff --git a/modules/nixos/sites/search/default.nix b/modules/nixos/sites/search/default.nix index b7e6019..71fb376 100644 --- a/modules/nixos/sites/search/default.nix +++ b/modules/nixos/sites/search/default.nix @@ -17,7 +17,6 @@ in { config = mkIf cfg.enable { services.searx = { enable = true; - package = pkgs.searxng; runInUwsgi = true; settings = { # server.port = 8080; diff --git a/modules/nixos/ui/fonts/default.nix b/modules/nixos/ui/fonts/default.nix index 888cbfa..7d9ce79 100644 --- a/modules/nixos/ui/fonts/default.nix +++ b/modules/nixos/ui/fonts/default.nix @@ -40,7 +40,7 @@ in { exportGlyphNames = true [buildPlans.IosevkaCustom.variants] - inherits = "ss03" + inherits = "ss01" ''; }) noto-fonts diff --git a/packages/zen-browser-unwrapped/default.nix b/packages/zen-browser-unwrapped/default.nix index 0b644b9..df5c84f 100644 --- a/packages/zen-browser-unwrapped/default.nix +++ b/packages/zen-browser-unwrapped/default.nix @@ -151,21 +151,21 @@ in buildStdenv.mkDerivation rec { pname = "zen-browser-unwrapped"; - version = "1.0.1-a.7"; + version = "1.0.1-a.8"; src = fetchFromGitHub { owner = "zen-browser"; repo = "desktop"; - rev = "2345563879de10bec3f94ad60408f63e7d2e5780"; + rev = "${version}"; leaveDotGit = true; fetchSubmodules = true; - hash = lib.fakeHash; + hash = "sha256-88/9IX3YCrbVdcp9uiz713T5b4WigJf1NkZeINWGkzM="; }; firefoxVersion = (lib.importJSON "${src}/surfer.json").version.version; firefoxSrc = fetchurl { url = "mirror://mozilla/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.xz"; - hash = "sha256-AnIloemwdPAHLiLHJkzyew0jZMZ1w8qBGqbCX7Abn3A="; + hash = "sha256-BA6DSslN1SRvnXemb3tDxDxi9TjQC1+UWXU03B23dhY="; }; SURFER_COMPAT = generic;