From 3e68b6a7fba7d4c7b25c71782b78c6dd52a63147 Mon Sep 17 00:00:00 2001 From: Isshi0417 Date: Mon, 15 Jul 2024 16:59:59 +0900 Subject: [PATCH] Experiment with stuff --- hosts/default/configuration.nix | 3 ++ hosts/default/home.nix | 3 -- modules/home-manager/default.nix | 11 ++++++- .../{shell => }/oh-my-posh/default.nix | 0 .../home-manager/stylix/gruvbox/default.nix | 31 ------------------- modules/{home-manager => }/shell/default.nix | 17 +++++----- modules/stylix/gruvbox/default.nix | 4 +-- modules/system/default.nix | 18 +++++------ modules/system/desktop/plasma.nix | 4 +++ modules/system/window-manager/default.nix | 7 +++++ 10 files changed, 42 insertions(+), 56 deletions(-) rename modules/home-manager/{shell => }/oh-my-posh/default.nix (100%) delete mode 100644 modules/home-manager/stylix/gruvbox/default.nix rename modules/{home-manager => }/shell/default.nix (57%) create mode 100644 modules/system/window-manager/default.nix diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 5ab297c..6a4d142 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -13,6 +13,9 @@ # System ../../modules/system + # Shell + ../../modules/shell + # NH ../../modules/nh diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 896d565..7e6eb99 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -4,9 +4,6 @@ imports = [ ../../modules/home-manager - - # Styling - ../../modules/home-manager/stylix/gruvbox ]; home.username = "shoi"; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 0eb53ab..59579fb 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -4,8 +4,8 @@ imports = [ ./git ./qt/retro - ./shell ./terminal + ./oh-my-posh ]; # Allow Unfree @@ -38,8 +38,17 @@ # Utils bat.enable = true; + eza.enable = true; lazygit.enable = true; mangohud.enable = true; zathura.enable = true; + zoxide.enable = true; + + zsh = { + enable = true; + enableCompletion = true; + syntaxHighlighting.enable = true; + autosuggestion.enable = true; + }; }; } \ No newline at end of file diff --git a/modules/home-manager/shell/oh-my-posh/default.nix b/modules/home-manager/oh-my-posh/default.nix similarity index 100% rename from modules/home-manager/shell/oh-my-posh/default.nix rename to modules/home-manager/oh-my-posh/default.nix diff --git a/modules/home-manager/stylix/gruvbox/default.nix b/modules/home-manager/stylix/gruvbox/default.nix deleted file mode 100644 index 98505ec..0000000 --- a/modules/home-manager/stylix/gruvbox/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, ... }: - -{ - stylix = { - enable = true; - autoEnable = false; - - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; - - cursor = { - package = pkgs.afterglow-cursors-recolored; - name = "Afterglow-Recolored-Gruvbox-White"; - size = 24; - }; - - image = ../../../wallpapers/gruvbox_ghibli-6.png; - - polarity = "dark"; - - targets = { - bat.enable = true; - firefox.enable = true; - kde.enable = true; - lazygit.enable = true; - mangohud.enable = true; - vesktop.enable = true; - xresources.enable = true; - zathura.enable = true; - }; - }; -} \ No newline at end of file diff --git a/modules/home-manager/shell/default.nix b/modules/shell/default.nix similarity index 57% rename from modules/home-manager/shell/default.nix rename to modules/shell/default.nix index edd396e..71ceed3 100644 --- a/modules/home-manager/shell/default.nix +++ b/modules/shell/default.nix @@ -1,32 +1,29 @@ { pkgs, ... }: { - imports = [ - ./oh-my-posh - ]; - # Download zsh packages - home.packages = with pkgs; [ + environment.systemPackages = with pkgs; [ zsh oh-my-zsh - starship ]; # Enable zsh programs.zsh = { enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; # oh-my-zsh oh-my-zsh = { enable = true; plugins = [ "git" + "thefuck" + "zoxide" ]; }; + }; - + programs.thefuck = { + enable = true; + alias = "fuck"; }; } \ No newline at end of file diff --git a/modules/stylix/gruvbox/default.nix b/modules/stylix/gruvbox/default.nix index aab33be..9e6ec6d 100644 --- a/modules/stylix/gruvbox/default.nix +++ b/modules/stylix/gruvbox/default.nix @@ -5,6 +5,8 @@ enable = true; autoEnable = false; + homeManagerIntegration.autoImport = false; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; cursor = { @@ -13,8 +15,6 @@ size = 24; }; - image = ../wallpapers/gruvbox_ghibli-6.png; - polarity = "dark"; targets = { diff --git a/modules/system/default.nix b/modules/system/default.nix index b9bf367..4134b1a 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -9,21 +9,13 @@ ./printing ./bluetooth ./audio + ./window-manager ]; services.xserver = { enable = true; }; - services.displayManager.sddm = { - enable = true; - - wayland = { - enable = true; - compositor = "kwin"; - }; - }; - nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ @@ -41,5 +33,13 @@ nerdfonts font-awesome ]; + + fontconfig = { + defaultFonts = { + serif = [ "Hack Nerd Font" ]; + sansSerif = [ "DejaVuSansM Nerd Font" ]; + monospace = [ "JetBrainsMono Nerd Font" ]; + }; + }; }; } \ No newline at end of file diff --git a/modules/system/desktop/plasma.nix b/modules/system/desktop/plasma.nix index ea792a2..577015d 100644 --- a/modules/system/desktop/plasma.nix +++ b/modules/system/desktop/plasma.nix @@ -2,4 +2,8 @@ { services.xserver.desktopManager.plasma6.enable = true; + + environment.systemPackages = with pkgs.kdePackages; [ + sddm-kcm + ]; } \ No newline at end of file diff --git a/modules/system/window-manager/default.nix b/modules/system/window-manager/default.nix new file mode 100644 index 0000000..56c5faf --- /dev/null +++ b/modules/system/window-manager/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + services.displayManager.sddm = { + enable = true; + }; +} \ No newline at end of file