From 0ac695975c6182ef37d16f66e389b5182f561c8b Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sat, 30 Mar 2024 22:14:37 +0100 Subject: [PATCH] fmt --- flake.lock | 44 ++++++--------- flake.nix | 1 + home/modules/rofi.nix | 128 +++++++++++++++++++++--------------------- 3 files changed, 83 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 880b809..ce9c930 100644 --- a/flake.lock +++ b/flake.lock @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1711604890, - "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -288,11 +288,11 @@ ] }, "locked": { - "lastModified": 1711591334, - "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -335,19 +335,11 @@ }, "nixpkgs-master": { "locked": { -<<<<<<< HEAD - "lastModified": 1711651867, - "narHash": "sha256-QR1P5wE+K+P86HsTcA1vK7zPVIibrEfykETUGE8aZ9A=", + "lastModified": 1711832515, + "narHash": "sha256-RtO7XBMlXQDr31B26zDmCp9vQF1oIdnuFStRnqYj6cc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cdbfcbbd2b142800ef6ca2d53ce86b24b1c5f1f", -======= - "lastModified": 1711747752, - "narHash": "sha256-iEeV/qrWaKfbdhR49B5F/sm/k0yxiGUAE5eXaoLSFNs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "387ef8710bf6ec095dea0829462f3d76a8a7f31f", ->>>>>>> 10d7e7a560b4ae17e9c2df26080f4555c9719833 + "rev": "9db82fb29eb1e7e07285580e61724601651ddbda", "type": "github" }, "original": { @@ -375,11 +367,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -418,11 +410,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711745924, - "narHash": "sha256-ZYVrOg12pWNbY1hx1lOu3cwER6xalEHUUIXnfbkCtUY=", + "lastModified": 1711809391, + "narHash": "sha256-/nGV6P8nB/R/ysbl1KQIKIwp1mQPXxtnoEd+pf3X+nw=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f83bcf2906c1c933316396221024f3482a7b086", + "rev": "0c16f59202c5062d12ef9cd4560cc9fca9d99f9a", "type": "github" }, "original": { @@ -446,11 +438,11 @@ ] }, "locked": { - "lastModified": 1711519547, - "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", + "lastModified": 1711760932, + "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", + "rev": "c11e43aed6f17336c25cd120eac886b96c455731", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ea3f59b..b39e651 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + spicetify-nix.url = "github:the-argus/spicetify-nix"; }; #inputs.agenix.url = "github:ryantm/agenix"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; diff --git a/home/modules/rofi.nix b/home/modules/rofi.nix index 3e89629..b770bc8 100644 --- a/home/modules/rofi.nix +++ b/home/modules/rofi.nix @@ -22,82 +22,82 @@ ]; font = "Hack Nerd Font Mono 13"; }; - theme = let mkLiteral = config.lib.formats.rasi.mkLiteral; - in { - "*" = { - bg = mkLiteral "#303446FF"; - fg = mkLiteral "#D9E0EEFF"; - ac = mkLiteral "#8CAAEEFF"; - }; + theme = let + mkLiteral = config.lib.formats.rasi.mkLiteral; + in { + "*" = { + bg = mkLiteral "#303446FF"; + fg = mkLiteral "#D9E0EEFF"; + ac = mkLiteral "#8CAAEEFF"; + }; - "#window" = { - location = mkLiteral "center"; - width = mkLiteral "50%"; - }; + "#window" = { + location = mkLiteral "center"; + width = mkLiteral "50%"; + }; - "#prompt" = { - background-color = mkLiteral "@bg"; - text-color = mkLiteral "@fg"; - }; + "#prompt" = { + background-color = mkLiteral "@bg"; + text-color = mkLiteral "@fg"; + }; - "#textbox-prompt-colon" = { - text-color = mkLiteral "@fg"; - }; + "#textbox-prompt-colon" = { + text-color = mkLiteral "@fg"; + }; - "#entry" = { - background-color = mkLiteral "@bg"; - text-color = mkLiteral "@fg"; - blink = mkLiteral "true"; - }; + "#entry" = { + background-color = mkLiteral "@bg"; + text-color = mkLiteral "@fg"; + blink = mkLiteral "true"; + }; - "#inputbar" = { - children = mkLiteral "[ prompt, entry ]"; - background-color = mkLiteral "@bg"; - text-color = mkLiteral "@fg"; - padding = mkLiteral "5px"; - }; + "#inputbar" = { + children = mkLiteral "[ prompt, entry ]"; + background-color = mkLiteral "@bg"; + text-color = mkLiteral "@fg"; + padding = mkLiteral "5px"; + }; - "#listview" = { - background-color = mkLiteral "@bg"; - columns = mkLiteral "1"; - lines = mkLiteral "5"; - cycle = mkLiteral "false"; - dynamic = mkLiteral "true"; - }; + "#listview" = { + background-color = mkLiteral "@bg"; + columns = mkLiteral "1"; + lines = mkLiteral "5"; + cycle = mkLiteral "false"; + dynamic = mkLiteral "true"; + }; - "#mainbox" = { - background-color = mkLiteral "@bg"; - border = mkLiteral "3px"; - border-color = mkLiteral "@ac"; - children = mkLiteral "[ inputbar, listview ]"; - padding = mkLiteral "10px"; - }; + "#mainbox" = { + background-color = mkLiteral "@bg"; + border = mkLiteral "3px"; + border-color = mkLiteral "@ac"; + children = mkLiteral "[ inputbar, listview ]"; + padding = mkLiteral "10px"; + }; - "#element" = { - background-color = mkLiteral "@bg"; - text-color = mkLiteral "@fg"; - padding = mkLiteral "5px"; - }; + "#element" = { + background-color = mkLiteral "@bg"; + text-color = mkLiteral "@fg"; + padding = mkLiteral "5px"; + }; - "#element-icon" = { - background-color = mkLiteral "@bg"; - text-color = mkLiteral "@fg"; - size = mkLiteral "32px"; - }; + "#element-icon" = { + background-color = mkLiteral "@bg"; + text-color = mkLiteral "@fg"; + size = mkLiteral "32px"; + }; - "#element-text" = { - background-color = mkLiteral "@bg"; - text-color = mkLiteral "@fg"; - padding = mkLiteral "5px"; - }; + "#element-text" = { + background-color = mkLiteral "@bg"; + text-color = mkLiteral "@fg"; + padding = mkLiteral "5px"; + }; - "#element selected" = { - border = mkLiteral "3px"; - border-color = mkLiteral "@ac"; - }; - }; + "#element selected" = { + border = mkLiteral "3px"; + border-color = mkLiteral "@ac"; + }; + }; }; #home.file.".config/rofi/config.rasi".text = builtins.readFile ../config-files/rofi/config.rasi; #home.file.".local/share/rofi/themes/catppuccin-mocha.rasi".text = builtins.readFile ../config-files/rofi/catppuccin-mocha.rasi; } -