From 462c4c400428d45911415e93c457cfa904cc3e1a Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 31 Aug 2026 18:07:45 +0200 Subject: [PATCH] add more apps to theme and remove quickshell startup from niri --- #flake.nix# | 59 ------------------------------------- .#flake.nix | 1 - flake.nix | 1 + modules/home.nix | 5 +++- modules/programs/fuzzel.nix | 30 ++++++++++--------- modules/programs/niri.nix | 1 - 6 files changed, 21 insertions(+), 76 deletions(-) delete mode 100644 #flake.nix# delete mode 120000 .#flake.nix diff --git a/#flake.nix# b/#flake.nix# deleted file mode 100644 index a596813..0000000 --- a/#flake.nix# +++ /dev/null @@ -1,59 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - base16.url = "github:SenchoPens/base16.nix"; - home-manager.url = "github:nix-community/home-manager"; - tt-schemes = { - url = "github:tinted-theming/schemes"; - flake = false; - }; - tt-terminal = { - url = "github:tinted-theming/tinted-terminal"; - flake = false; - }; - - }; - outputs = - { - self, - nixpkgs, - base16, - home-manager, - ... - }@inputs: - let - theme = "catppuccin-mocha"; - in - { - nixosConfigurations.nerv = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./theme.nix - ({ pkgs, ... }: { - config.theming.theme = "catppuccin-mocha"; - config.theming.font = "Iosevka"; - config.theming.fontPackage = pkgs.iosevka; - }) - base16.nixosModule - ({ config, ... }: { scheme = "${config.theming.theme}"; }) - ./modules/hosts/nerv/configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs; }; - imports = [ - ./modules/home.nix - ./modules/programs/emacs.nix - ./modules/programs/niri.nix - ./modules/programs/foot.nix - ./modules/programs/quickshell.nix - ./modules/programs/fuzzel.nix - ]; - } - ]; - }; - - }; - -} diff --git a/.#flake.nix b/.#flake.nix deleted file mode 120000 index 8bdf959..0000000 --- a/.#flake.nix +++ /dev/null @@ -1 +0,0 @@ -lucy@nerv.7899:1788190389 \ No newline at end of file diff --git a/flake.nix b/flake.nix index 0d87c5d..a596813 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,7 @@ ./modules/programs/niri.nix ./modules/programs/foot.nix ./modules/programs/quickshell.nix + ./modules/programs/fuzzel.nix ]; } ]; diff --git a/modules/home.nix b/modules/home.nix index c770b05..8dd2351 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -13,7 +13,6 @@ in nixfmt clang kdePackages.qtdeclarative - fuzzel ]; home.stateVersion = "26.05"; home.pointerCursor = { @@ -25,6 +24,10 @@ in gtk = { enable = true; colorScheme = "dark"; + theme = { + name = "adw-gtk3-dark"; + package = pkgs.adw-gtk3; + }; iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix index 36e0ac8..f490212 100644 --- a/modules/programs/fuzzel.nix +++ b/modules/programs/fuzzel.nix @@ -1,21 +1,23 @@ -{ config }: +{ config, ... }: let c = config.scheme.withHashtag; in { - home-manager.users.lucy.programs.fuzzel = { - enable = true; - settings = { - main = { - font = "${config.theming.font}:size=12"; - }; - border.width = 2; - colors = { - background = c.base00; - text = c.base05; - match = c.base0D; - selection = c.base0D; - border = c.base0D; + home-manager.users.lucy = { + programs.fuzzel = { + enable = true; + settings = { + main = { + font = "${config.theming.font}:size=12"; + }; + border.width = 2; + colors = { + background = "${c.base00}ff"; + text = "${c.base05}ff"; + match = "${c.base0D}ff"; + selection = "${c.base0D}ff"; + border = "${c.base0D}ff"; + }; }; }; }; diff --git a/modules/programs/niri.nix b/modules/programs/niri.nix index 646c905..eb117e1 100644 --- a/modules/programs/niri.nix +++ b/modules/programs/niri.nix @@ -60,7 +60,6 @@ inactive-color "${config.scheme.withHashtag.base02}" } } - spawn-at-startup "qs" screenshot-path null animations {} window-rule {