From fa3f7dc6f9dd24f17f8614e6508b232bd5283a37 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 23 Dec 2024 22:40:30 +0100 Subject: [PATCH] fix: refactor/remove some faulty code --- modules/home/default.nix | 26 +------------------------- modules/home/packages.nix | 3 --- modules/home/packages.yoshino.nix | 7 ------- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index 2ec3a21..4cf86ac 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,6 +1,5 @@ -{ pkgs, inputs, config, username, host, ...}: +{ ... }: { imports = - if (host == "sakura") then [(import ./git.nix)] ++ [(import ./swaync/default.nix)] ++ [(import ./fonts.nix)] @@ -17,28 +16,5 @@ ++ [(import ./waybar)] ++ [(import ./wofi.nix)] ++ [(import ./zsh.nix)] - ++ [(import ./tmux.nix)] - else if (host == "violet") then - [(import ./git.nix)] - ++ [(import ./nvim.nix)] - ++ [(import ./packages.violet.nix)] - ++ [(import ./scripts/scripts.nix)] - ++ [(import ./zsh.nix)] - ++ [(import ./tmux.nix)] - else if (host == "yoshino") then - [(import ./git.nix)] - ++ [(import ./swaync/default.nix)] - ++ [(import ./fonts.nix)] - ++ [(import ./hyprland)] - ++ [(import ./kitty.nix)] - ++ [(import ./mako.nix)] - ++ [(import ./nvim.nix)] - ++ [(import ./zathura.nix)] - ++ [(import ./packages.yoshino.nix)] - ++ [(import ./scripts/scripts.nix)] - ++ [(import ./swaylock.nix)] - ++ [(import ./waybar)] - ++ [(import ./wofi.nix)] - ++ [(import ./zsh.nix)] ++ [(import ./tmux.nix)]; } diff --git a/modules/home/packages.nix b/modules/home/packages.nix index b594b19..ca58b67 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -18,7 +18,6 @@ # pastel # generate, analyze, convert and manipulate colors glow # Render Markdown from the terminal # htmlq # jq but for HTML - android-tools # ADB/Fastboot eva # Calculator anki-bin # Flashcards obs-studio # Record video stuff @@ -39,8 +38,6 @@ eza file fzf - gimp - darktable lazygit gitleaks # TODO: adds pre-commit hook libreoffice diff --git a/modules/home/packages.yoshino.nix b/modules/home/packages.yoshino.nix index 0a61e77..838e604 100644 --- a/modules/home/packages.yoshino.nix +++ b/modules/home/packages.yoshino.nix @@ -5,7 +5,6 @@ bandwhich # Terminal bandwidth utilization tool element-desktop # Nheko is kinda shit so sadly this has to happen signal-desktop # Since the bridge is broken :( - socat # Required for `hyprland-smart-borders` tesseract # Screen grabbing text from images/PDFs/etc pixcat # Display images in the terminal lm_sensors # Show sensor outputs, i.e. temperatures @@ -22,10 +21,7 @@ # termpdfpy # Read PDFs from the terminal, errors out for now anki-bin # Review flashcards vimv # Bulk rename - audacity # Record audio stuff - obs-studio # Record video stuff exiftool # Read exif data from CLI - kdenlive # Video editor translate-shell # Google Translate but in the CLI wireguard-tools # VPN connections openresolv # required for wireguard-tools @@ -42,8 +38,6 @@ eza file fzf - gimp - darktable lazygit gitleaks # TODO: adds pre-commit hook xfce.thunar @@ -52,7 +46,6 @@ ripgrep yt-dlp wineWowPackages.wayland - # element-desktop # wayland version is very laggy for me spotify thunderbird neofetch