From a6c15b1e549e33c9e2decf1f383f9b397f7a4e9f Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Tue, 25 Mar 2025 16:18:56 +0100
Subject: [PATCH] reduce stylix reach
---
hosts/spectre-x360-2018/default.nix | 1 +
modules/home-manager/code.nix | 6 +--
modules/home-manager/documents.nix | 7 +++
modules/home-manager/flatpaks.nix | 10 +++--
modules/home-manager/kitty.nix | 8 ++++
modules/home-manager/stylix.nix | 2 +-
modules/home-manager/wofi.nix | 67 ++---------------------------
modules/nixos/flatpak.nix | 9 ++++
users/remy.nix | 1 +
9 files changed, 40 insertions(+), 71 deletions(-)
create mode 100644 modules/home-manager/documents.nix
create mode 100644 modules/nixos/flatpak.nix
diff --git a/hosts/spectre-x360-2018/default.nix b/hosts/spectre-x360-2018/default.nix
index 7d0e722..32cef4a 100644
--- a/hosts/spectre-x360-2018/default.nix
+++ b/hosts/spectre-x360-2018/default.nix
@@ -6,6 +6,7 @@
./hardware-configuration.nix
../../modules/nixos/bluetooth.nix
../../modules/nixos/flakes.nix
+ ../../modules/nixos/flatpak.nix
../../modules/nixos/fonts.nix
../../modules/nixos/hyprland.nix
../../modules/nixos/monitoring.nix
diff --git a/modules/home-manager/code.nix b/modules/home-manager/code.nix
index 4c91fa1..8efaf8f 100644
--- a/modules/home-manager/code.nix
+++ b/modules/home-manager/code.nix
@@ -34,9 +34,9 @@
# visual
"window.menuBarVisibility" = "toggle";
- # "editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace";
- # "terminal.integrated.fontFamily" = "FiraCode Nerd Font Mono";
- # "workbench.iconTheme" = "vs-seti";
+ "editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace";
+ "terminal.integrated.fontFamily" = "FiraCode Nerd Font Mono";
+ "workbench.iconTheme" = "vs-seti";
# telemetry
"telemetry.enableCrashReporter" = false;
diff --git a/modules/home-manager/documents.nix b/modules/home-manager/documents.nix
new file mode 100644
index 0000000..93cad4b
--- /dev/null
+++ b/modules/home-manager/documents.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}:
+{
+ home.packages = [
+ # pdf viewer
+ pkgs.evince
+ ];
+}
diff --git a/modules/home-manager/flatpaks.nix b/modules/home-manager/flatpaks.nix
index ee358e0..69bca34 100644
--- a/modules/home-manager/flatpaks.nix
+++ b/modules/home-manager/flatpaks.nix
@@ -1,8 +1,12 @@
-{ lib, pkgs, ... }: {
+{
+ lib, pkgs, ...
+}:
+{
+ # requires that flatpaks be enabled in the system configuration as well
services.flatpak.enable = true;
services.flatpak.update.auto.enable = false;
services.flatpak.uninstallUnmanaged = false;
-
+
services.flatpak.packages = [
"com.calibre_ebook.calibre"
"com.github.flxzt.rnote"
@@ -13,4 +17,4 @@
"io.github.zen_browser.zen"
"im.riot.Riot"
];
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
index a16c20b..22af10b 100644
--- a/modules/home-manager/kitty.nix
+++ b/modules/home-manager/kitty.nix
@@ -1,10 +1,18 @@
{pkgs, lib, ...}:
+let
+ stylix = import ./stylix.nix { inherit pkgs; };
+in
{
programs.kitty = {
enable = true;
shellIntegration.enableFishIntegration = true;
settings = {
# # import the colors from the stylix theme, but keep the background black
+ # color0 = stylix.colors.background;
+ # color1 = stylix.base16Scheme.base01;
+ # color2 = stylix.colors.green;
+ # color3 = stylix.colors.yellow;
+
# color0 = stylix.colors.background;
# color1 = stylix.colors.red;
# color2 = stylix.colors.green;
diff --git a/modules/home-manager/stylix.nix b/modules/home-manager/stylix.nix
index 37a99c4..e6e439b 100644
--- a/modules/home-manager/stylix.nix
+++ b/modules/home-manager/stylix.nix
@@ -82,12 +82,12 @@
};
stylix.targets = {
- vscode.enable = true;
hyprpaper.enable = true;
hyprlock.enable = true;
wofi.enable = true;
# disabled because they overwrite too many settings
+ # vscode.enable = true;
# waybar.enable = true;
# kitty.enable = true;
diff --git a/modules/home-manager/wofi.nix b/modules/home-manager/wofi.nix
index 8a3e157..41ccd09 100644
--- a/modules/home-manager/wofi.nix
+++ b/modules/home-manager/wofi.nix
@@ -15,13 +15,13 @@ in {
settings = {
allow_markup = true;
- width = 450;
+ width = 500;
+ height = 400;
show = "drun";
- prompt = "Apps";
+ prompt = "Launch...";
normal_window = true;
layer = "top";
term = "foot";
- height = "305px";
orientation = "vertical";
halign = "fill";
line_wrap = "off";
@@ -40,66 +40,5 @@ in {
key_expand = "Tab";
key_exit = "Escape";
};
-
- style = ''
- * {
- font-family: "${font}";
- font-weight: 500;
- font-size: ${toString font-size}px;
- }
-
- #window {
- background-color: ${background};
- color: ${foreground};
- border-radius: ${toString rounding}px;
- }
-
- #outer-box {
- padding: 20px;
- }
-
- #input {
- background-color: ${background-alt};
- border: 0px solid ${accent};
- color: ${foreground};
- padding: 8px 12px;
- }
-
- #scroll {
- margin-top: 20px;
- }
-
- #inner-box {}
-
- #img {
- padding-right: 8px;
- }
-
- #text {
- color: ${foreground};
- }
-
- #text:selected {
- color: ${foreground};
- }
-
- #entry {
- padding: 6px;
- }
-
- #entry:selected {
- background-color: ${accent};
- color: ${foreground};
- }
-
- #unselected {}
-
- #selected {}
-
- #input,
- #entry:selected {
- border-radius: ${toString rounding}px;
- }
- '';
};
}
diff --git a/modules/nixos/flatpak.nix b/modules/nixos/flatpak.nix
new file mode 100644
index 0000000..59ba40f
--- /dev/null
+++ b/modules/nixos/flatpak.nix
@@ -0,0 +1,9 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+{
+ services.flatpak.enable = true;
+}
diff --git a/users/remy.nix b/users/remy.nix
index 6987188..eb37487 100644
--- a/users/remy.nix
+++ b/users/remy.nix
@@ -5,6 +5,7 @@ with lib.hm.gvariant;
../modules/home-manager/browser.nix
../modules/home-manager/code.nix
../modules/home-manager/dev.nix
+ ../modules/home-manager/documents.nix
../modules/home-manager/fish.nix
../modules/home-manager/flatpaks.nix
../modules/home-manager/hypr