From 981b0596fdd5c6ef57c1ff22e59a47e9e1d8032b Mon Sep 17 00:00:00 2001 From: mrfluffy Date: Mon, 26 Jan 2026 12:40:14 +0000 Subject: [PATCH] fhasjknjadsf --- configuration.nix | 15 +++++++++--- dots/doom/config.el | 4 +++- dots/hyprland.nix | 4 ++-- flake.lock | 51 ----------------------------------------- flake.nix | 4 ---- home/homePkgs.nix | 56 ++++++++++++--------------------------------- home/stylix.nix | 6 ++--- system/services.nix | 1 + 8 files changed, 36 insertions(+), 105 deletions(-) diff --git a/configuration.nix b/configuration.nix index 30f6eac..ca89f09 100755 --- a/configuration.nix +++ b/configuration.nix @@ -56,9 +56,18 @@ in ]; build-dir = "/nix/var/nix/builds"; auto-optimise-store = true; - substituters = ["https://hyprland.cachix.org"]; - trusted-substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = [ + "https://hyprland.cachix.org" + "https://vicinae.cachix.org" + ]; + trusted-substituters = [ + "https://hyprland.cachix.org" + "https://vicinae.cachix.org" + ]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" + ]; }; # ─── Users ────────────────────────────────────────────────────────────────── diff --git a/dots/doom/config.el b/dots/doom/config.el index 18c9435..95c8b20 100644 --- a/dots/doom/config.el +++ b/dots/doom/config.el @@ -32,8 +32,10 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-one) +(add-to-list 'custom-theme-load-path + (expand-file-name "~/.config/emacs/themes")) +(setq doom-theme 'dank-emacs) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type t) diff --git a/dots/hyprland.nix b/dots/hyprland.nix index 278325d..6c0ec5c 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -21,7 +21,7 @@ let terminal = "footclient"; fileManager = "thunar"; #runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher"; - runner = "vicinae toggle"; + runner = "dms ipc call spotlight toggle"; # runner = "anyrun"; browser = "firefox"; editor = "emacsclient -c"; @@ -41,7 +41,7 @@ in # ─── Monitors ──────────────────────────────────────────────────────────────── source = [ "./dms/outputs.conf" - #"./dms/cursor.conf" + "./dms/cursor.conf" "./dms/colors.conf" ]; diff --git a/flake.lock b/flake.lock index 910fa6c..e679cf5 100644 --- a/flake.lock +++ b/flake.lock @@ -1065,22 +1065,6 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -1253,7 +1237,6 @@ "qs-qml": "qs-qml", "quickshell": "quickshell_4", "stylix": "stylix", - "vicinae": "vicinae", "zen-browser": "zen-browser" } }, @@ -1319,21 +1302,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1415,25 +1383,6 @@ "type": "github" } }, - "vicinae": { - "inputs": { - "nixpkgs": "nixpkgs_6", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1769350309, - "narHash": "sha256-djLzDIyEN+AC37jrfz9/I0Qsyz8KrDREpKJTulE0s9I=", - "owner": "vicinaehq", - "repo": "vicinae", - "rev": "c29392474d95ef517e99418c4c1bf58d6fd5bf67", - "type": "github" - }, - "original": { - "owner": "vicinaehq", - "repo": "vicinae", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index a8cdcfb..576d7e5 100755 --- a/flake.nix +++ b/flake.nix @@ -58,10 +58,6 @@ url = "github:Duckonaut/split-monitor-workspaces"; inputs.hyprland.follows = "hyprland"; }; - vicinae = { - url = "github:vicinaehq/vicinae"; - inputs.nixpkgs.follows = "nixpkgs"; - }; jovian = { url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/homePkgs.nix b/home/homePkgs.nix index f9fbadb..ff9f6d0 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -14,13 +14,23 @@ let name = "default"; isDefault = true; }; - oreo = pkgs.callPackage ../personalPKGS/oreo.nix { }; + + reversal-black = pkgs.reversal-icon-theme.overrideAttrs (old: { + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + # Hardcode the correct upstream invocation for black variant + ./install.sh -t black -d $out/share/icons + rm -f $out/share/icons/*/{AUTHORS,COPYING} + jdupes --quiet --link-soft --recurse $out/share + runHook postInstall + ''; + }); in { imports = [ inputs.zen-browser.homeModules.beta inputs.caelestia.homeManagerModules.default - inputs.vicinae.homeManagerModules.default ]; programs = { @@ -69,44 +79,6 @@ in }; - services.vicinae = { - enable = true; # default: false - systemd = { - enable = true; - environment = { - USE_LAYER_SHELL = 1; - }; - }; - #package = # specify package to use here. Can be omitted. - # Installing (vicinae) extensions declaratively - #settings = { - # faviconService = "twenty"; # twenty | google | none - # font.size = 11; - # popToRootOnClose = false; - # rootSearch.searchFiles = false; - # theme.name = "vicinae-dark"; - # window = { - # csd = true; - # opacity = 0.95; - # rounding = 10; - # }; - #}; - #extensions = [ - # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} { - # inherit pkgs; - # name = "extension-name"; - # src = pkgs.fetchFromGitHub { - # # You can also specify different sources other than github - # owner = "repo-owner"; - # repo = "repo-name"; - # rev = "v1.0"; # If the extension has no releases use the latest commit hash - # # You can get the sha256 by rebuilding once and then copying the output hash from the error message - # sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - # }; # If the extension is in a subdirectory you can add ` + "/subdir"` between the brace and the semicolon here - # }) - #]; - }; - qt.enable = true; # qt.style = "gtk2"; # qt.platformTheme = "qt5ct"; @@ -158,6 +130,7 @@ in slurp swappy wf-recorder + dsearch # ─── Audio / Media Tools ───────────────────────────────────────────────────── openai-whisper @@ -252,7 +225,8 @@ in adw-gtk3 (pkgs.callPackage ../personalPKGS/oreo.nix { colors = [ "all" ]; }) - (pkgs.reversal-icon-theme.override { allColorVariants = true; }) + #(pkgs.reversal-icon-theme.override { colorVariants = ["-black"]; }) + reversal-black pywalfox-native # ─── Experimental (inputs) ─────────────────────────────────────────────────── diff --git a/home/stylix.nix b/home/stylix.nix index 5362f4c..3a368c2 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -31,10 +31,10 @@ in #vscode.enable = true; lazygit.enable = true; #foot.enable = true; - river.enable = true; + #river.enable = true; #hyprland.enable = true; - waybar.enable = true; - nixcord.enable = true; + #waybar.enable = true; + #nixcord.enable = true; #zen-browser = { # enable = true; diff --git a/system/services.nix b/system/services.nix index 1b34168..c241eb6 100755 --- a/system/services.nix +++ b/system/services.nix @@ -66,6 +66,7 @@ in }; services.blueman.enable = true; + services.accounts-daemon.enable = true; # ─── Printing & Files ─────────────────────────────────────────────────────── # Enable CUPS to print documents.