From ada9f02d0e45558a63da3e8d07a10128a938ec48 Mon Sep 17 00:00:00 2001 From: Isshi0417 Date: Fri, 12 Jul 2024 12:23:21 +0900 Subject: [PATCH] Fix stylix --- hosts/default/configuration.nix | 2 +- modules/home-manager/ricing/default.nix | 2 +- .../home-manager/ricing/stylix/default.nix | 12 ++---- modules/ricing/default.nix | 2 +- modules/ricing/stylix/default.nix | 35 ++++++++++++---- modules/ricing/stylix/themes/default.nix | 7 ---- modules/ricing/stylix/themes/dracula.nix | 5 --- modules/ricing/stylix/themes/ghibli.nix | 5 --- modules/ricing/stylix/themes/kuromi.nix | 14 ------- modules/ricing/stylix/themes/nostalgia.nix | 42 ------------------- modules/system/desktop/awesome.nix | 11 +++++ modules/system/desktop/default.nix | 1 + 12 files changed, 46 insertions(+), 92 deletions(-) delete mode 100644 modules/ricing/stylix/themes/default.nix delete mode 100644 modules/ricing/stylix/themes/dracula.nix delete mode 100644 modules/ricing/stylix/themes/ghibli.nix delete mode 100644 modules/ricing/stylix/themes/kuromi.nix delete mode 100644 modules/ricing/stylix/themes/nostalgia.nix create mode 100644 modules/system/desktop/awesome.nix diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index db8e7fb..2d4a69a 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -94,7 +94,7 @@ }; }; - home-manager.backupFileExtension = "backup"; + home-manager.backupFileExtension = "hm-backup-1"; environment.sessionVariables = { FLAKE = "/home/shoi/etc/nixos"; diff --git a/modules/home-manager/ricing/default.nix b/modules/home-manager/ricing/default.nix index f1a2b74..ee796e9 100644 --- a/modules/home-manager/ricing/default.nix +++ b/modules/home-manager/ricing/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./hyprland + ./stylix ]; # GTK theming diff --git a/modules/home-manager/ricing/stylix/default.nix b/modules/home-manager/ricing/stylix/default.nix index 252ae97..dcc3a1c 100644 --- a/modules/home-manager/ricing/stylix/default.nix +++ b/modules/home-manager/ricing/stylix/default.nix @@ -3,15 +3,11 @@ { stylix = { enable = true; - autoEnable = true; + autoEnable = false; - image = ../../../wallpapers/maze.png; - - opacity = { - applications = 0.9; - desktop = 0.5; - popups = 0.9; - terminal = 0.9; + targets = { + gnome.enable = true; + gtk.enable = true; }; }; } \ No newline at end of file diff --git a/modules/ricing/default.nix b/modules/ricing/default.nix index a0e24a1..a39e3be 100644 --- a/modules/ricing/default.nix +++ b/modules/ricing/default.nix @@ -2,7 +2,7 @@ { imports = [ - + ./stylix ]; environment.systemPackages = with pkgs; [ diff --git a/modules/ricing/stylix/default.nix b/modules/ricing/stylix/default.nix index 3a69a14..6872d60 100644 --- a/modules/ricing/stylix/default.nix +++ b/modules/ricing/stylix/default.nix @@ -1,14 +1,33 @@ -{ pkgs, ... }: +{ ... }: { - imports = [ - ./themes - ]; + stylix = { + enable = true; + autoEnable = true; - stylix.homeManagerIntegration.followSystem = true; + base16Scheme = { + base00 = "343232"; + base01 = "413e3e"; + base02 = "4f4a4a"; + base03 = "5c5656"; + base04 = "6a6262"; + base05 = "f6f6ee"; + base06 = "eeeedd"; + base07 = "e5e5cd"; + base08 = "fb5c82"; + base09 = "c2c561"; + base0A = "fbd444"; + base0B = "6075e6"; + base0C = "f273d4"; + base0D = "85c5a8"; + base0E = "caca9b"; + base0F = "953f48"; + }; - stylix.cursor.package = pkgs.bibata-cursors; - stylix.cursor.name = "Bibata-Modern-Ice"; + image = ../../wallpapers/maze.png; - stylix.polarity = "dark"; + polarity = "dark"; + + targets.grub.useImage = true; + }; } \ No newline at end of file diff --git a/modules/ricing/stylix/themes/default.nix b/modules/ricing/stylix/themes/default.nix deleted file mode 100644 index 41114c2..0000000 --- a/modules/ricing/stylix/themes/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./nostalgia.nix - ]; -} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/dracula.nix b/modules/ricing/stylix/themes/dracula.nix deleted file mode 100644 index e38f1d3..0000000 --- a/modules/ricing/stylix/themes/dracula.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, pkgs, ... }: - -{ - stylix.image = ./wallpapers/dracula-pro.png; -} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/ghibli.nix b/modules/ricing/stylix/themes/ghibli.nix deleted file mode 100644 index b9fc05b..0000000 --- a/modules/ricing/stylix/themes/ghibli.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: - -{ - stylix.image = ./wallpapers/ghibli-3.png; -} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/kuromi.nix b/modules/ricing/stylix/themes/kuromi.nix deleted file mode 100644 index e9e91cd..0000000 --- a/modules/ricing/stylix/themes/kuromi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, config, ... }: - -let - cfg = config.kuromi; -in { - options = { - kuromi.enable = lib.mkEnableOption "Enable Module"; - }; - - config = lib.mkIf cfg.enable { - stylix.enable = true; - stylix.image = ../../wallpapers/kuromi.jpg; - }; -} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/nostalgia.nix b/modules/ricing/stylix/themes/nostalgia.nix deleted file mode 100644 index 2569164..0000000 --- a/modules/ricing/stylix/themes/nostalgia.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs, ... }: - -{ - stylix.enable = true; - stylix.autoEnable = true; - - stylix.image = ../../../wallpapers/maze.png; - - stylix.base16Scheme = { - base00 = "2b3339"; # Default Background - base01 = "323c41";# Lighter Background (Used for status bars, line number and folding marks) - base02 = "503946";# Selection Background - base03 = "868d80";# Comments, Invisibles, Line Highlighting - base04 = "d3c6aa";# Dark Foreground (Used for status bars) - base05 = "d3c6aa";# Default Foreground, Caret, Delimiters, Operators - base06 = "e9e8d2";# Light Foreground (Not often used) - base07 = "fff9e8";# Light Background (Not often used) - base08 = "7fbbb3";# Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = "d699b6";# Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "83c092";# Classes, Markup Bold, Search Text Background - base0B = "dbbc7f";# Strings, Inherited Class, Markup Code, Diff Inserted - base0C = "e69875";# Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = "a7c080";# Functions, Methods, Attribute IDs, Headings - base0E = "e67e80";# Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = "d699b6";# Deprecated, Opening/Closing Embedded Language Tags, e.g. - }; - - # GRUB - stylix.targets.grub = { - enable = true; - useImage = true; - }; - - # Console - stylix.targets.console.enable = true; - - # GNOME - stylix.targets.gnome.enable = true; - - # GTK - stylix.targets.gtk.enable = true; -} \ No newline at end of file diff --git a/modules/system/desktop/awesome.nix b/modules/system/desktop/awesome.nix new file mode 100644 index 0000000..830c6e2 --- /dev/null +++ b/modules/system/desktop/awesome.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + services.xserver.windowManager.awesome = { + enable = true; + luaModules = with pkgs.luaPackages; [ + luarocks + luadbi-mysql + ]; + }; +} \ No newline at end of file diff --git a/modules/system/desktop/default.nix b/modules/system/desktop/default.nix index 59b00f3..8080e3b 100644 --- a/modules/system/desktop/default.nix +++ b/modules/system/desktop/default.nix @@ -4,5 +4,6 @@ imports = [ ./gnome-de.nix ./hyprland.nix + ./awesome.nix ]; } \ No newline at end of file