From c0a5437b52e36793a8d37282fbebdee3be689cfc Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 18 Mar 2024 11:45:39 +0900 Subject: [PATCH] Update --- .../common/software/cli/nixvim/alpha.nix | 1 + .../common/software/cli/nixvim/base.nix | 2 +- home-manager/common/software/gui/default.nix | 6 +-- .../common/software/gui/thunderbird.nix | 8 --- home-manager/common/software/gui/vscodium.nix | 54 ------------------- home-manager/default.nix | 4 +- home-manager/small.nix | 4 +- nixos/common/desktops/hyprland/default.nix | 12 ----- stylix/green/default.nix | 9 ---- stylix/green/everforest-dark-hard.yaml | 18 ------- stylix/green/home-manager/nixvim.nix | 4 -- stylix/gruvbox/default.nix | 9 ---- stylix/gruvbox/home-manager/nixvim.nix | 4 -- stylix/sakura-day/default.nix | 8 --- stylix/sakura-day/home-manager/nixvim.nix | 4 -- stylix/sakura-day/sakura.yaml | 19 ------- stylix/sakura-night/default.nix | 9 ---- stylix/sakura-night/home-manager/nixvim.nix | 4 -- stylix/sakura-night/sakura-night.yaml | 18 ------- stylix/stylix/default.nix | 10 ---- stylix/stylix/home-manager/nixvim.nix | 4 -- stylix/stylix/sakura-night.yaml | 18 ------- stylix/tokyo-day/default.nix | 8 --- stylix/tokyo-day/home-manager/nixvim.nix | 4 -- stylix/tokyo-night/default.nix | 9 ---- stylix/tokyo-night/home-manager/nixvim.nix | 4 -- 26 files changed, 8 insertions(+), 246 deletions(-) delete mode 100644 home-manager/common/software/gui/thunderbird.nix delete mode 100644 home-manager/common/software/gui/vscodium.nix delete mode 100644 stylix/green/default.nix delete mode 100644 stylix/green/everforest-dark-hard.yaml delete mode 100644 stylix/green/home-manager/nixvim.nix delete mode 100644 stylix/gruvbox/default.nix delete mode 100644 stylix/gruvbox/home-manager/nixvim.nix delete mode 100644 stylix/sakura-day/default.nix delete mode 100644 stylix/sakura-day/home-manager/nixvim.nix delete mode 100644 stylix/sakura-day/sakura.yaml delete mode 100644 stylix/sakura-night/default.nix delete mode 100644 stylix/sakura-night/home-manager/nixvim.nix delete mode 100644 stylix/sakura-night/sakura-night.yaml delete mode 100644 stylix/stylix/default.nix delete mode 100644 stylix/stylix/home-manager/nixvim.nix delete mode 100644 stylix/stylix/sakura-night.yaml delete mode 100644 stylix/tokyo-day/default.nix delete mode 100644 stylix/tokyo-day/home-manager/nixvim.nix delete mode 100644 stylix/tokyo-night/default.nix delete mode 100644 stylix/tokyo-night/home-manager/nixvim.nix diff --git a/home-manager/common/software/cli/nixvim/alpha.nix b/home-manager/common/software/cli/nixvim/alpha.nix index 9238e977..4249521b 100644 --- a/home-manager/common/software/cli/nixvim/alpha.nix +++ b/home-manager/common/software/cli/nixvim/alpha.nix @@ -15,6 +15,7 @@ " ██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║ " " ██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║ " " ╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ " + " Be kind to yourself. " ]; opts = { position = "center"; diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix index f15ccee2..694b5bca 100644 --- a/home-manager/common/software/cli/nixvim/base.nix +++ b/home-manager/common/software/cli/nixvim/base.nix @@ -2,7 +2,7 @@ imports = [ ./alpha.nix inputs.nixvim.homeManagerModules.nixvim - ] ++ lib.optional (builtins.isString theme) ../../../../../stylix/${theme}/home-manager/nixvim.nix; + ] ++ lib.optional (builtins.isString theme) ../../../../../stylix/themes/${theme}/home-manager/nixvim.nix; # https://github.com/nix-community/nixvim diff --git a/home-manager/common/software/gui/default.nix b/home-manager/common/software/gui/default.nix index fc76d0d6..bdebbec5 100644 --- a/home-manager/common/software/gui/default.nix +++ b/home-manager/common/software/gui/default.nix @@ -1,8 +1,6 @@ -{ hostname, ... }: { +{ ... }: { imports = [ ./kitty.nix ./firefox.nix - # ./thunderbird.nix - ./vscodium.nix ]; -} \ No newline at end of file +} diff --git a/home-manager/common/software/gui/thunderbird.nix b/home-manager/common/software/gui/thunderbird.nix deleted file mode 100644 index deb88f1a..00000000 --- a/home-manager/common/software/gui/thunderbird.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: { - programs.thunderbird = { - enable = true; - profiles."Default" = { - isDefault = true; - }; - }; -} \ No newline at end of file diff --git a/home-manager/common/software/gui/vscodium.nix b/home-manager/common/software/gui/vscodium.nix deleted file mode 100644 index 61c26045..00000000 --- a/home-manager/common/software/gui/vscodium.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, pkgs, ... }: { - programs.vscode = { - enable = false; - package = pkgs.vscodium; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - extensions = with pkgs.vscode-extensions; [ - waderyan.gitblame # See Git Blame info in status bar - vscodevim.vim # Vim keybinds - oderwat.indent-rainbow # Colorise indents - naumovs.color-highlight # Highlight HTML color codes - - # Themes - enkia.tokyo-night - ]; - userSettings = { - # Theming: - "window.autoDetectColorScheme" = true; - "workbench.preferredLightColorTheme" = "Tokyo Night Light"; - "workbench.preferredDarkColorTheme" = "Tokyo Night"; - "workbench.colorTheme" = "Tokyo Night"; - "workbench.iconTheme" = ""; - - # Workbench - "workbench.startupEditor" = "none"; - "diffEditor.ignoreTrimWhitespace" = false; - "workbench.editor.autoLockGroups" = { - "mainThreadWebview-markdown.preview" = true; - }; - "editor.fontFamily" = "JetBrainsMono Regular"; - "editor.fontLigatures" = true; - - # Telemetry = - "redhat.telemetry.enabled" = false; - "telemetry.telemetryLevel" = "off"; - - # Git = - "git.enableSmartCommit" = true; - "git.confirmSync" = false; - "git.autofetch" = true; - - # Language Specific - # Python = - "python.diagnostics.sourceMapsEnabled" = true; - "python.linting.pylintEnabled" = true; - "python.linting.pylintArgs" = [ - "--rcfile=~/.config/pylintrc" - ]; - - # Rust - "rust-analyzer.cargo.buildScripts.overrideCommand" = null; - }; - }; -} \ No newline at end of file diff --git a/home-manager/default.nix b/home-manager/default.nix index 5b983c7c..a920e5ae 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, inputs, hostname, system, username, desktop, theme, hmStateVersion, ... }: { +{ lib, inputs, hostname, username, desktop, hmStateVersion, ... }: { imports = [ # Common configs ./common/software/cli @@ -8,7 +8,7 @@ # Theming inputs.stylix.homeManagerModules.stylix - ../stylix/${theme} + ../stylix ] ++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs diff --git a/home-manager/small.nix b/home-manager/small.nix index 21617d02..4b267e6d 100644 --- a/home-manager/small.nix +++ b/home-manager/small.nix @@ -1,4 +1,4 @@ -{ lib, inputs, hostname, username, desktop, theme, hmStateVersion, ... }: { +{ lib, inputs, hostname, username, desktop, hmStateVersion, ... }: { imports = [ # Common configs ./common/software/cli/bash.nix @@ -13,7 +13,7 @@ # Theming inputs.stylix.homeManagerModules.stylix - ../stylix/${theme} + ../stylix ] ++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix index 91a32459..ed05f3b5 100644 --- a/nixos/common/desktops/hyprland/default.nix +++ b/nixos/common/desktops/hyprland/default.nix @@ -1,17 +1,5 @@ {inputs, pkgs, system, theme, ...}: { - # nixpkgs = { - # overlays = [ - # # https://github.com/nix-community/nixpkgs-wayland - # inputs.nixpkgs-wayland.overlay - # ]; - # }; - - imports = [ - inputs.stylix.nixosModules.stylix - ../../../../stylix/${theme} - ]; - stylix = { image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png; opacity = { diff --git a/stylix/green/default.nix b/stylix/green/default.nix deleted file mode 100644 index 4db3b6a8..00000000 --- a/stylix/green/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - polarity = "dark"; - base16Scheme = ./everforest-dark-hard.yaml; - autoEnable = true; - }; -} diff --git a/stylix/green/everforest-dark-hard.yaml b/stylix/green/everforest-dark-hard.yaml deleted file mode 100644 index a80bc545..00000000 --- a/stylix/green/everforest-dark-hard.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Everforest Dark Hard" -author: "Oskar Liew (https://github.com/OskarLiew)" -base00: "272e33" # bg0, Default background -base01: "2e383c" # bg1, Lighter background -base02: "414b50" # bg3, Selection background -base03: "859289" # grey1, Comments -base04: "9da9a0" # grey2, Dark foreground -base05: "d3c6aa" # fg, Default foreground -base06: "e4e1cd" # bg3, Light foreground -base07: "fdf6e3" # bg0, Light background -base08: "7fbbb3" # blue -base09: "d699b6" # purple -base0A: "dbbc7f" # yellow -base0B: "83c092" # aqua -base0C: "e69875" # orange -base0D: "a7c080" # green -base0E: "e67e80" # red -base0F: "4C3743" # bg_visual \ No newline at end of file diff --git a/stylix/green/home-manager/nixvim.nix b/stylix/green/home-manager/nixvim.nix deleted file mode 100644 index 8b4c069c..00000000 --- a/stylix/green/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "everforest"; - stylix.targets.nixvim.enable = false; -} diff --git a/stylix/gruvbox/default.nix b/stylix/gruvbox/default.nix deleted file mode 100644 index c6818fa4..00000000 --- a/stylix/gruvbox/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{lib, inputs, pkgs, gpu, system, theme, ...}: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; - autoEnable = true; - }; -} \ No newline at end of file diff --git a/stylix/gruvbox/home-manager/nixvim.nix b/stylix/gruvbox/home-manager/nixvim.nix deleted file mode 100644 index f62fe493..00000000 --- a/stylix/gruvbox/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "gruvbox"; - stylix.targets.nixvim.enable = false; -} diff --git a/stylix/sakura-day/default.nix b/stylix/sakura-day/default.nix deleted file mode 100644 index f31ecacb..00000000 --- a/stylix/sakura-day/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{lib, inputs, pkgs, gpu, system, theme, ...}: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - base16Scheme = ./sakura.yaml; - autoEnable = true; - }; -} \ No newline at end of file diff --git a/stylix/sakura-day/home-manager/nixvim.nix b/stylix/sakura-day/home-manager/nixvim.nix deleted file mode 100644 index aebe2a23..00000000 --- a/stylix/sakura-day/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "rose-pine-dawn"; - stylix.targets.nixvim.enable = false; -} diff --git a/stylix/sakura-day/sakura.yaml b/stylix/sakura-day/sakura.yaml deleted file mode 100644 index d406739b..00000000 --- a/stylix/sakura-day/sakura.yaml +++ /dev/null @@ -1,19 +0,0 @@ -scheme: "Cupcake" -author: "Chris Kempson (http://chriskempson.com)" -variant: "light" -base00: "fbf1f2" -base01: "f2f1f4" -base02: "d8d5dd" -base03: "bfb9c6" -base04: "a59daf" -base05: "8b8198" -base06: "72677E" -base07: "585062" -base08: "D57E85" -base09: "EBB790" -base0A: "DCB16C" -base0B: "A3B367" -base0C: "69A9A7" -base0D: "7297B9" -base0E: "BB99B4" -base0F: "BAA58C" \ No newline at end of file diff --git a/stylix/sakura-night/default.nix b/stylix/sakura-night/default.nix deleted file mode 100644 index fed7b182..00000000 --- a/stylix/sakura-night/default.nix +++ /dev/null @@ -1,9 +0,0 @@ - {... }: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - base16Scheme = ./sakura-night.yaml; - polarity = "dark"; - autoEnable = true; - }; -} diff --git a/stylix/sakura-night/home-manager/nixvim.nix b/stylix/sakura-night/home-manager/nixvim.nix deleted file mode 100644 index 37245b1c..00000000 --- a/stylix/sakura-night/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "rose-pine-moon"; - stylix.targets.nixvim.enable = false; -} diff --git a/stylix/sakura-night/sakura-night.yaml b/stylix/sakura-night/sakura-night.yaml deleted file mode 100644 index 8d825331..00000000 --- a/stylix/sakura-night/sakura-night.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Rosé Pine Moon" -variant: "dark" -base00: "232136" -base01: "2a273f" -base02: "393552" -base03: "6e6a86" -base04: "908caa" -base05: "e0def4" -base06: "e0def4" -base07: "56526e" -base08: "eb6f92" -base09: "f6c177" -base0A: "ea9a97" -base0B: "3e8fb0" -base0C: "9ccfd8" -base0D: "c4a7e7" -base0E: "f6c177" -base0F: "56526e" \ No newline at end of file diff --git a/stylix/stylix/default.nix b/stylix/stylix/default.nix deleted file mode 100644 index de977e00..00000000 --- a/stylix/stylix/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - polarity = "dark"; - # base16Scheme = ./sakura-night.yaml; - base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; - autoEnable = true; - }; -} diff --git a/stylix/stylix/home-manager/nixvim.nix b/stylix/stylix/home-manager/nixvim.nix deleted file mode 100644 index 540bc0e4..00000000 --- a/stylix/stylix/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "sonokai"; - stylix.targets.nixvim.enable = false; -} diff --git a/stylix/stylix/sakura-night.yaml b/stylix/stylix/sakura-night.yaml deleted file mode 100644 index a4ff1ca5..00000000 --- a/stylix/stylix/sakura-night.yaml +++ /dev/null @@ -1,18 +0,0 @@ -scheme: "Rosé Pine Moon" -variant: "dark" -base00: "232136" -base01: "2a273f" -base02: "393552" -base03: "6e6a86" -base04: "908caa" -base05: "e0def4" -base06: "e0def4" -base07: "56526e" -base08: "eb6f92" -base09: "f6c177" -base0A: "ea9a97" -base0B: "3e8fb0" -base0C: "9ccfd8" -base0D: "c4a7e7" -base0E: "f6c177" -base0F: "56526e" diff --git a/stylix/tokyo-day/default.nix b/stylix/tokyo-day/default.nix deleted file mode 100644 index 0d2d4982..00000000 --- a/stylix/tokyo-day/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{lib, inputs, pkgs, gpu, system, theme, ...}: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-light.yaml"; - autoEnable = true; - }; -} \ No newline at end of file diff --git a/stylix/tokyo-day/home-manager/nixvim.nix b/stylix/tokyo-day/home-manager/nixvim.nix deleted file mode 100644 index 9287c8bf..00000000 --- a/stylix/tokyo-day/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "tokyonight-day"; - stylix.targets.nixvim.enable = false; -} diff --git a/stylix/tokyo-night/default.nix b/stylix/tokyo-night/default.nix deleted file mode 100644 index b79d8d3b..00000000 --- a/stylix/tokyo-night/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{lib, inputs, pkgs, gpu, system, theme, ...}: { - # Themes https://github.com/tinted-theming/base16-schemes - stylix = { - image = /etc/nixos/git/docs/icons/nixos/white.png; - polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml"; - autoEnable = true; - }; -} \ No newline at end of file diff --git a/stylix/tokyo-night/home-manager/nixvim.nix b/stylix/tokyo-night/home-manager/nixvim.nix deleted file mode 100644 index a9fa3b3a..00000000 --- a/stylix/tokyo-night/home-manager/nixvim.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - programs.nixvim.colorscheme = lib.mkForce "tokyonight-night"; - stylix.targets.nixvim.enable = false; -}