From 1d500409a4151b34186830779ee5d4e499433d71 Mon Sep 17 00:00:00 2001 From: neverness Date: Sun, 24 Nov 2024 17:17:07 +0900 Subject: [PATCH] update --- README.md | 10 +- flake.lock | 198 +++++++++--------- flake.nix | 16 +- modules/colors.nix | 67 +----- modules/home/programs/cli/tgt/app.nix | 13 ++ modules/home/programs/cli/tgt/default.nix | 14 ++ modules/home/programs/cli/tgt/logger.nix | 9 + modules/home/programs/cli/tgt/telegram.nix | 15 ++ modules/home/programs/cli/tgt/theme.nix | 80 +++++++ modules/home/programs/gui/spotify/default.nix | 6 +- modules/home/themes/stylix/default.nix | 8 +- modules/home/wm/terminals/default.nix | 2 +- modules/home/wm/terminals/wezterm/default.nix | 65 ++++++ modules/nixos/hardware/sound/default.nix | 2 +- secrets.nix | 6 + workst/builder.nix | 0 workst/default.nix | 7 +- workst/home/default.nix | 6 +- workst/home/parts/pkgs.nix | 2 +- 19 files changed, 340 insertions(+), 186 deletions(-) create mode 100644 modules/home/programs/cli/tgt/app.nix create mode 100644 modules/home/programs/cli/tgt/default.nix create mode 100644 modules/home/programs/cli/tgt/logger.nix create mode 100644 modules/home/programs/cli/tgt/telegram.nix create mode 100644 modules/home/programs/cli/tgt/theme.nix create mode 100644 modules/home/wm/terminals/wezterm/default.nix create mode 100644 secrets.nix create mode 100644 workst/builder.nix diff --git a/README.md b/README.md index 49db21a..3a2459d 100644 --- a/README.md +++ b/README.md @@ -63,15 +63,15 @@ -![aye](https://git.sr.ht/~neverness/wallpapers/blob/main/dotfiles/workst/fetch.png) +![aye](https://git.sr.ht/~neverness/design/blob/main/dotfiles/workst/fetch.png) -![ауе](https://git.sr.ht/~neverness/wallpapers/blob/main/dotfiles/workst/spotify.png) +![ауе](https://git.sr.ht/~neverness/design/blob/main/dotfiles/workst/spotify.png) -![ауе](https://git.sr.ht/~neverness/wallpapers/blob/main/dotfiles/workst/top.png) +![ауе](https://git.sr.ht/~neverness/design/blob/main/dotfiles/workst/top.png) -![ауе](https://git.sr.ht/~neverness/wallpapers/blob/main/dotfiles/workst/yazi.png) +![ауе](https://git.sr.ht/~neverness/design/blob/main/dotfiles/workst/yazi.png) -![ауе](https://git.sr.ht/~neverness/wallpapers/blob/main/dotfiles/workst/adam_yeee_father.png) +![ауе](https://git.sr.ht/~neverness/design/blob/main/dotfiles/workst/adam_yeee_father.png) #### ENGLISH OR SPANISH??? WHOEVER MOVES IS GAY))))))) diff --git a/flake.lock b/flake.lock index 014308f..dd59dd6 100644 --- a/flake.lock +++ b/flake.lock @@ -99,6 +99,23 @@ "type": "github" } }, + "design": { + "flake": false, + "locked": { + "lastModified": 1732433533, + "narHash": "sha256-VZvuwo4P0INyC3zjNBxNkgwen9Zdw8wn1PzUZdLKvZk=", + "owner": "~neverness", + "repo": "design", + "rev": "73aa672a23fcd5882ce0562e1884fbee10011d49", + "type": "sourcehut" + }, + "original": { + "owner": "~neverness", + "ref": "main", + "repo": "design", + "type": "sourcehut" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -208,24 +225,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -278,6 +277,26 @@ "type": "github" } }, + "gaming": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "umu": "umu" + }, + "locked": { + "lastModified": 1732413017, + "narHash": "sha256-LJy3CkUErelRM3bDojyFB0xe4c2CF/6HTF51QLJkqVA=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "87623b5ebb18d3ab6c342526afe6b7d0cb96c486", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -317,6 +336,22 @@ "type": "github" } }, + "hardware": { + "locked": { + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -395,7 +430,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -518,54 +553,18 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", - "umu": "umu" - }, - "locked": { - "lastModified": 1731375435, - "narHash": "sha256-O2piDr6aQmJd7USZkehOKTZale6jlG+DkoxEVRiu8Iw=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "e9adb42d82ec425ff6218b6e45feb6a1a8eaddb0", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -612,16 +611,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -673,6 +672,24 @@ "type": "github" } }, + "parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -699,23 +716,23 @@ }, "root": { "inputs": { + "design": "design", "disko": "disko", "firefox-addons": "firefox-addons", - "flake-parts": "flake-parts", + "gaming": "gaming", + "hardware": "hardware", "home-manager": "home-manager", "hyprland": "hyprland", - "nix-gaming": "nix-gaming", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nur": "nur", - "spicetify-nix": "spicetify-nix", + "parts": "parts", + "spicetify": "spicetify", "stylix": "stylix", "tgt": "tgt", - "walls": "walls", - "zen-browser": "zen-browser" + "zen": "zen" } }, - "spicetify-nix": { + "spicetify": { "inputs": { "flake-compat": "flake-compat_2", "nixpkgs": [ @@ -723,11 +740,11 @@ ] }, "locked": { - "lastModified": 1731471404, - "narHash": "sha256-xrqZLeXOI5qm90iN5sgyINMU2621jf+WBMJivpTNEWc=", + "lastModified": 1732421741, + "narHash": "sha256-r3q4NYO3Z/OG3Oy5zHrEjAn+s5Bcgy569fUJUG9Ipuc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c80ea8541d55731f143828a574e00d50553e9c7c", + "rev": "8380d08050b6bd1f5c93de48e5ceef5b5105ecf6", "type": "github" }, "original": { @@ -869,17 +886,17 @@ "umu": { "inputs": { "nixpkgs": [ - "nix-gaming", + "gaming", "nixpkgs" ] }, "locked": { "dir": "packaging/nix", - "lastModified": 1730836236, - "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=", + "lastModified": 1732337089, + "narHash": "sha256-dwFza03ETqrcmVGSCdgDDKTWKRgckpQ3vXkZRCYtM9g=", "ref": "refs/heads/main", - "rev": "90352466d502c40e147cfd11a428dde6c2899ab3", - "revCount": 833, + "rev": "f6a6af3191f5497d95d8f8aaa08826a45da199c4", + "revCount": 842, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -891,23 +908,6 @@ "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" } }, - "walls": { - "flake": false, - "locked": { - "lastModified": 1732272835, - "narHash": "sha256-ze9MtewNai+O/R+ZyG3VKNXZcxftJFti/YFoAZvQIWE=", - "owner": "~neverness", - "repo": "wallpapers", - "rev": "46c39fe7cc5b6d6f1e59a520755ab8afe845e3d7", - "type": "sourcehut" - }, - "original": { - "owner": "~neverness", - "ref": "main", - "repo": "wallpapers", - "type": "sourcehut" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -949,18 +949,18 @@ "type": "github" } }, - "zen-browser": { + "zen": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1731281366, - "narHash": "sha256-GALaKG3LyiYw4EdFxSwJidgLHgaDsTuic5uiJlkpdrc=", + "lastModified": 1731689537, + "narHash": "sha256-0wN39XFD5bVcNANh9uLoQYyKbp9r6xX+oON1qI+L9iI=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "d7c020d6b192bfa040a58efaf62be74f9155d1a0", + "rev": "064be844324965da1d596a541fdd831efe4a3a32", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9b86804..cdb9041 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # UNSTABLE nur.url = "github:nix-community/NUR"; # NUR - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # HARDWARE - flake-parts.url = "github:hercules-ci/flake-parts"; # PARTS - nix-gaming.url = "github:fufexan/nix-gaming"; # GAMING + hardware.url = "github:NixOS/nixos-hardware/master"; # HARDWARE + parts.url = "github:hercules-ci/flake-parts"; # PARTS + gaming.url = "github:fufexan/nix-gaming"; # GAMING hyprland.url = "github:hyprwm/Hyprland"; # HYPRLAND stylix.url = "github:danth/stylix"; # STYLIX @@ -17,11 +17,11 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser = { + zen = { url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - spicetify-nix = { # SPOTIFY + spicetify = { # SPOTIFY url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -33,14 +33,14 @@ url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; - walls = { # WALLS - url = "sourcehut:~neverness/wallpapers?ref=main"; + design = { # DISIGNING REPO + url = "sourcehut:~neverness/design?ref=main"; flake = false; }; }; outputs = inputs: - inputs.flake-parts.lib.mkFlake { inherit inputs; } { + inputs.parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" ]; imports = [ ./workst ]; }; diff --git a/modules/colors.nix b/modules/colors.nix index b795d32..e93932d 100644 --- a/modules/colors.nix +++ b/modules/colors.nix @@ -1,64 +1,7 @@ -{ pkgs, config, ... }: { +{ inputs, config, ... }: { stylix = let - theme = config.module.themes.stylix.theme; - tinted = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; - # eighties - # helios - # horizon-terminal-dark - # tokyo-city-terminal-dark - paradise = { - base00 = "#151515"; - base01 = "#1F1F1F"; - base02 = "#2E2E2E"; - base03 = "#424242"; - base04 = "#BBB6B6"; - base05 = "#E8E3E3"; - base06 = "#E8E3E3"; - base07 = "#E8E3E3"; - base08 = "#B66467"; - base09 = "#D9BC8C"; - base0A = "#D9BC8C"; - base0B = "#8C977D"; - base0C = "#8AA6A2"; - base0D = "#8DA3B9"; - base0E = "#A988B0"; - base0F = "#BBB6B6"; - }; - daone = { - base00 = "181818"; - base01 = "282828"; - base02 = "585858"; - base03 = "888888"; - base04 = "c8c8c8"; - base05 = "ffffff"; - base06 = "ffffff"; - base07 = "ffffff"; - base08 = "fa7883"; - base09 = "ffc387"; - base0A = "ff9470"; - base0B = "98c379"; - base0C = "8af5ff"; - base0D = "6bb8ff"; - base0E = "e799ff"; - base0F = "b3684f"; - }; - sweetpastel = { - base00 = "#1B1F23"; - base01 = "#25292d"; - base02 = "#2f3337"; - base03 = "#393d41"; - base04 = "#43474b"; - base05 = "#FDE5E6"; - base06 = "#DEE2E6"; - base07 = "#F8F9FA"; - base08 = "#e5a3a1"; - base09 = "#F1C192"; - base0A = "#ECE3B1"; - base0B = "#B4E3AD"; - base0C = "#F8B3CC"; - base0D = "#A3CBE7"; - base0E = "#CEACE8"; - base0F = "#e5a3a1"; - }; - in { base16Scheme = paradise; }; + design = inputs.design; + cfg = config.module.themes.stylix.theme; + in { base16Scheme = "${design}/base16/${cfg.theme}.yaml"; }; } + diff --git a/modules/home/programs/cli/tgt/app.nix b/modules/home/programs/cli/tgt/app.nix new file mode 100644 index 0000000..b618ee4 --- /dev/null +++ b/modules/home/programs/cli/tgt/app.nix @@ -0,0 +1,13 @@ +{ + home.file.".tgt/telegram.toml".text = '' + mouse_support = false + paste_support = true + frame_rate = 60.0 + show_status_bar = false + show_title_bar = false + theme_enable = false + theme_filename = "theme.toml" + take_api_id_from_telegram_config = true + take_api_hash_from_telegram_config = true + ''; +} diff --git a/modules/home/programs/cli/tgt/default.nix b/modules/home/programs/cli/tgt/default.nix new file mode 100644 index 0000000..8880817 --- /dev/null +++ b/modules/home/programs/cli/tgt/default.nix @@ -0,0 +1,14 @@ +{ inputs, lib, config, ... }: + +with lib; + +let cfg = config.module.programs.cli.tgt; +in { + options = { module.programs.cli.tgt = { enable = mkEnableOption ""; }; }; + + imports = [ ]; + config = mkIf cfg.enable { + home = { packages = with inputs; [ tgt.packages.${system}.default ]; }; + }; +} + diff --git a/modules/home/programs/cli/tgt/logger.nix b/modules/home/programs/cli/tgt/logger.nix new file mode 100644 index 0000000..85f327d --- /dev/null +++ b/modules/home/programs/cli/tgt/logger.nix @@ -0,0 +1,9 @@ +{ + home.file.".tgt/telegram.toml".text = '' + log_dir = ".data/logs" + log_file = "tgt.log" + rotation_frequency = "daily" + max_old_log_files = 7 + log_level = "info" + ''; +} diff --git a/modules/home/programs/cli/tgt/telegram.nix b/modules/home/programs/cli/tgt/telegram.nix new file mode 100644 index 0000000..1c00fc9 --- /dev/null +++ b/modules/home/programs/cli/tgt/telegram.nix @@ -0,0 +1,15 @@ +{ sec, ... }: { + home.file.".tgt/telegram.toml".text = '' + api_id = "${sec.tg.id}" + api_hash = "${sec.tg.hash}" + database_dir = ".data/tg" + use_file_database = true + use_chat_info_database = true + use_message_database = true + system_language_code = "en" + device_model = "Desktop" + verbosity_level = 2 + log_path = ".data/tdlib_rs/tdlib_rs.log" + redirect_stderr = false + ''; +} diff --git a/modules/home/programs/cli/tgt/theme.nix b/modules/home/programs/cli/tgt/theme.nix new file mode 100644 index 0000000..a0e50d7 --- /dev/null +++ b/modules/home/programs/cli/tgt/theme.nix @@ -0,0 +1,80 @@ +{ config, ... }: { + home.file.".tgt/telegram.toml".text = with config.lib.stylix.colors; '' + [palette] + black = "#${base00}" + white = "#${base06}" + + background = "#${base00}" + background_two = "#${base01}" + background_three = "#${base02}" + + primary_light = "#${base06}" + primary = "#$" + primary_dark = "#3d3d3d" + + # Current user + secondary_light = "#c0d3f0" + secondary = "#0767a3" + secondary_dark = "#5f758f" + + # Other users + ternary_light = "#f0d2c5" + ternary = "#c75108" + ternary_dark = "#8a3907" + + highlight_one = "#ec5bfc" + highlight_two = "#8a3594" + + [common] + border_component_focused = { fg = "highlight_one", bg = "background", bold = false, underline = false, italic = false } + item_selected = { fg = "", bg = "background_two", bold = true, underline = false, italic = false } + timestamp = { fg = "primary_dark", bg = "background", bold = false, underline = false, italic = false } + + [chat_list] + self = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + item_selected = { fg = "", bg = "background_two", bold = false, underline = false, italic = false } + item_chat_name = { fg = "primary_light", bg = "background", bold = true, underline = false, italic = false } + item_message_content = { fg = "primary_dark", bg = "background", bold = false, underline = false, italic = true } + item_unread_counter = { fg = "highlight_two", bg = "background", bold = true, underline = false, italic = false } + + [chat] + self = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + chat_name = { fg = "ternary", bg = "background", bold = true, underline = false, italic = false } + message_myself_name = { fg = "secondary", bg = "background", bold = true, underline = false, italic = false } + message_myself_content = { fg = "secondary_light", bg = "background", bold = false, underline = false, italic = false } + message_other_name = { fg = "ternary", bg = "background", bold = true, underline = false, italic = false } + message_other_content = { fg = "ternary_light", bg = "background", bold = false, underline = false, italic = false } + message_reply_text = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + message_myself_reply_name = { fg = "ternary_dark", bg = "background", bold = true, underline = false, italic = false } + message_myself_reply_content = { fg = "primary_dark", bg = "background", bold = false, underline = false, italic = false } + message_other_reply_name = { fg = "secondary_dark", bg = "background", bold = true, underline = false, italic = false } + message_other_reply_content = { fg = "primary_dark", bg = "background", bold = false, underline = false, italic = false } + + [prompt] + self = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + message_text = { fg = "primary_light", bg = "background", bold = false, underline = false, italic = false } + message_text_selected = { fg = "primary_light", bg = "background_three", bold = false, underline = false, italic = true } + message_preview_text = { fg = "primary_dark", bg = "background", bold = false, underline = false, italic = false } + + [reply_message] + self = { fg = "highlight_two", bg = "background", bold = false, underline = false, italic = false } + message_text = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + + [status_bar] + self = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + size_info_text = { fg = "secondary_light", bg = "background", bold = false, underline = false, italic = false } + size_info_numbers = { fg = "ternary_light", bg = "background", bold = false, underline = false, italic = true } + press_key_text = { fg = "secondary_light", bg = "background", bold = false, underline = false, italic = false } + press_key_key = { fg = "ternary_light", bg = "background", bold = false, underline = false, italic = true } + message_quit_text = { fg = "secondary_light", bg = "background", bold = false, underline = false, italic = false } + message_quit_key = { fg = "ternary_light", bg = "background", bold = false, underline = false, italic = true } + open_chat_text = { fg = "secondary_light", bg = "background", bold = false, underline = false, italic = false } + open_chat_name = { fg = "ternary_light", bg = "background", bold = false, underline = false, italic = true } + + [title_bar] + self = { fg = "primary", bg = "background", bold = false, underline = false, italic = false } + title1 = { fg = "primary_light", bg = "background", bold = true, underline = true, italic = true } + title2 = { fg = "secondary_light", bg = "background", bold = true, underline = true, italic = true } + title3 = { fg = "ternary_light", bg = "background", bold = true, underline = true, italic = false } + ''; +} diff --git a/modules/home/programs/gui/spotify/default.nix b/modules/home/programs/gui/spotify/default.nix index feb9bc4..5c89708 100644 --- a/modules/home/programs/gui/spotify/default.nix +++ b/modules/home/programs/gui/spotify/default.nix @@ -1,14 +1,14 @@ -{ pkgs, lib, config, inputs, True, ... }: +{ lib, config, inputs, True, ... }: with lib; let cfg = config.module.programs.gui.spotify; - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + spicePkgs = inputs.spicetify.legacyPackages.${system}; in { options = { module.programs.gui.spotify = { enable = mkEnableOption ""; }; }; - imports = [ inputs.spicetify-nix.homeManagerModules.default ]; + imports = [ inputs.spicetify.homeManagerModules.default ]; config = mkIf cfg.enable { programs.spicetify = True // { theme = spicePkgs.themes.sleek // { diff --git a/modules/home/themes/stylix/default.nix b/modules/home/themes/stylix/default.nix index 937ab11..dacde32 100644 --- a/modules/home/themes/stylix/default.nix +++ b/modules/home/themes/stylix/default.nix @@ -4,11 +4,15 @@ with lib; let cfg = config.module.themes.stylix; - wal = inputs.walls; + wal = inputs.design; in { options = { module.themes.stylix = { enable = mkEnableOption ""; + theme = mkOption { + default = null; + type = types.str; + }; image = mkOption { default = null; type = types.str; @@ -21,7 +25,7 @@ in { stylix = with pkgs; True // { autoEnable = false; - image = "${wal}/desktop/${cfg.image}.jpg"; + image = "${wal}/wallpapers/paradise/${cfg.image}.jpg"; cursor = { name = "GoogleDot-Black"; package = google-cursor; diff --git a/modules/home/wm/terminals/default.nix b/modules/home/wm/terminals/default.nix index f3cf7b6..0f90b67 100644 --- a/modules/home/wm/terminals/default.nix +++ b/modules/home/wm/terminals/default.nix @@ -1 +1 @@ -{ imports = [ ./foot ./kitty ]; } +{ imports = [ ./foot ./kitty ./wezterm ]; } diff --git a/modules/home/wm/terminals/wezterm/default.nix b/modules/home/wm/terminals/wezterm/default.nix new file mode 100644 index 0000000..6e20232 --- /dev/null +++ b/modules/home/wm/terminals/wezterm/default.nix @@ -0,0 +1,65 @@ +{ lib, config, True, False, ... }: + +with lib; + +let cfg = config.module.wm.terminals.wezterm; +in { + options = { module.wm.terminals.wezterm = { enable = mkEnableOption ""; }; }; + + config = mkIf cfg.enable { + programs.wezterm = True // { + extraConfig = '' + return { + -- general + audible_bell = "Disabled", + check_for_updates = false, + enable_scroll_bar = false, + exit_behavior = "CloseOnCleanExit", + warn_about_missing_glyphs = false, + + -- anims + animation_fps = 1, + + -- Cursor + cursor_blink_ease_in = 'Constant', + cursor_blink_ease_out = 'Constant', + cursor_blink_rate = 700, + default_cursor_style = "SteadyBar", + + keys = { + -- paste from the clipboard + { key = 'V', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' }, + + -- paste from the primary selection + { key = 'S', mods = 'SHIFT|CTRL', action = act.PasteFrom 'PrimarySelection' }, + }, + + -- Tab bar + enable_tab_bar = true, + hide_tab_bar_if_only_one_tab = true, + show_tab_index_in_tab_bar = false, + tab_bar_at_bottom = true, + use_fancy_tab_bar = false, + -- try and let the tabs stretch instead of squish + tab_max_width = 10000, + + -- perf + enable_wayland = true, + front_end = "WebGpu", + scrollback_lines = 10000, + + -- term window settings + adjust_window_size_when_changing_font_size = false, + inactive_pane_hsb = { + saturation = 1.0, + brightness = 0.8 + }, + window_background_opacity = 0.85, + window_close_confirmation = "NeverPrompt", + window_decorations = "RESIZE", + window_padding = { left = 12, right = 12, top = 12, bottom = 12, }, + } + ''; + }; + }; +} diff --git a/modules/nixos/hardware/sound/default.nix b/modules/nixos/hardware/sound/default.nix index 44d006d..b3775e2 100644 --- a/modules/nixos/hardware/sound/default.nix +++ b/modules/nixos/hardware/sound/default.nix @@ -6,7 +6,7 @@ let cfg = config.module.hardware.sound; in { options = { module.hardware.sound = { enable = mkEnableOption ""; }; }; - imports = [ inputs.nix-gaming.nixosModules.pipewireLowLatency ]; + imports = [ inputs.gaming.nixosModules.pipewireLowLatency ]; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ pulsemixer ]; security.rtkit = True; diff --git a/secrets.nix b/secrets.nix new file mode 100644 index 0000000..fb05ddb --- /dev/null +++ b/secrets.nix @@ -0,0 +1,6 @@ +{ + tg = { + id = "8041364"; + hash = "e52cad9fb16eb5257da3c80ce51c1670"; + }; +} diff --git a/workst/builder.nix b/workst/builder.nix new file mode 100644 index 0000000..e69de29 diff --git a/workst/default.nix b/workst/default.nix index 80c25df..4a87be7 100644 --- a/workst/default.nix +++ b/workst/default.nix @@ -4,7 +4,8 @@ let userName = "nixzoid"; in { flake = let - lp = inputs.nixpkgs.legacyPackages.x86_64-linux; + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + secrets = import ../secrets.nix; args = rec { # IMPORTS LET_IN FROM HOSTS TO ALL SYSTEM # DIRECTORIES flakeDir = "/persist/flake"; @@ -20,7 +21,7 @@ in { # SYSINFO stateVersion = "24.05"; # IDK platform = "x86_64-linux"; - inherit inputs hostName userName; + inherit inputs hostName userName secrets; }; in with inputs; { formatter = { x86_64-linux = lp.nixfmt; }; @@ -31,7 +32,7 @@ in { homeConfigurations.${userName} = home-manager.lib.homeManagerConfiguration { modules = [ ./home ]; extraSpecialArgs = args; - pkgs = lp; + inherit pkgs; }; }; } diff --git a/workst/home/default.nix b/workst/home/default.nix index 866f33f..f9dd91c 100644 --- a/workst/home/default.nix +++ b/workst/home/default.nix @@ -46,7 +46,10 @@ icon = "adwaita"; }; qt = True; # QT APPS - stylix = True // { image = "train"; }; + stylix = True // { + theme = "chanivibes"; + image = "train"; + }; }; wm = { # WINDOW MANAGER hyprland = True; @@ -54,6 +57,7 @@ terminals = { # TERMINALS kitty = True; foot = False; + wezterm = True; }; misc = { # IDK mako = True; diff --git a/workst/home/parts/pkgs.nix b/workst/home/parts/pkgs.nix index d971730..fae61b8 100644 --- a/workst/home/parts/pkgs.nix +++ b/workst/home/parts/pkgs.nix @@ -21,7 +21,7 @@ jdks = [ temurin-jre-bin-21 temurin-jre-bin-17 temurin-jre-bin-8 ]; }) - inputs.zen-browser.packages."${system}".specific + inputs.zen.packages."${system}".specific ]; cli.pkgs = with pkgs; [ nurl