diff --git a/configuration.nix b/configuration.nix index efd05dd..99866bf 100755 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,4 @@ -{ pkgs, pkgs-unstable, rice, inputs, ... }: -let -in +{ pkgs, pkgs-unstable, inputs, ... }: { imports = [ inputs.sops-nix.nixosModules.sops @@ -9,6 +7,7 @@ in ./system-modules/nvidia.nix ./system-modules/users.nix ./system-modules/sound.nix + ./system-modules/fonts.nix ./system-modules/boot.nix ./system-modules/dm.nix ./system-modules/networking.nix @@ -91,22 +90,6 @@ in VISUAL = "hx"; }; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - ] ++ (with rice.font; [ - base.package - code.package - ]) ++ (with pkgs-unstable; [ - newcomputermodern - ]); - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - programs.hyprland = { # config is done with home-manager diff --git a/flake.lock b/flake.lock index 0c76f4d..d0ca59f 100755 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1717931498, - "narHash": "sha256-8j6h9gZmAngPXLFRRtd8ySRb0I43f0rRW0puU8IBwKA=", + "lastModified": 1718337800, + "narHash": "sha256-Azz2lg6WsfT4SDMTA3DtJ6hS7kox3e0buSrV4J+zMAQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3b7b7d83b3561269c2d8f20b5d4d4496bb36b2e6", + "rev": "aaf15fa3ed60109af8aad4cbb19c1fe28b4476ad", "type": "gitlab" }, "original": { @@ -202,17 +202,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1717960589, - "narHash": "sha256-0fPh9sFwzWbvDTTY6omTrYk2r9nBz7e4AzGH6HlRLCo=", + "lastModified": 1718365532, + "narHash": "sha256-2wd1ytcpvnBlhTxP1O/G4PJSY3fKuTxQLDxp+kFP4Sg=", "ref": "refs/heads/main", - "rev": "121c6ac3eae1601a1498e52a9be7030ebfed242c", - "revCount": 4788, + "rev": "a9d53a2252f7ec084e2487d18777e2df01c8c351", + "revCount": 4825, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -228,6 +229,11 @@ "hyprland": [ "hyprland" ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], "systems": [ "hyprland-plugins", "hyprland", @@ -235,11 +241,11 @@ ] }, "locked": { - "lastModified": 1717837954, - "narHash": "sha256-chdXRv+JoiLQ9xwwq4q14X14em94VQaxk+tzkxRnQ5c=", + "lastModified": 1718111105, + "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "8571aa9badf7db9c4911018a5611c038cc776256", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" }, "original": { @@ -277,6 +283,10 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -287,11 +297,11 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -300,6 +310,31 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -352,11 +387,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -400,11 +435,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -431,11 +466,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "type": "github" }, "original": { @@ -520,11 +555,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717902109, - "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", + "lastModified": 1718137936, + "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f0922ad001829b400f0160ba85b47d252fa3d925", + "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "type": "github" }, "original": { @@ -580,11 +615,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2943e0a..91e674d 100755 --- a/flake.nix +++ b/flake.nix @@ -153,6 +153,8 @@ # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); }; base = { + # name = "NewComputerModern08"; + # package = pkgs.newcomputermodern; name = "Atkinson Hyperlegible"; package = pkgs.atkinson-hyperlegible; }; diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 40f3c1e..4fc966f 100755 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/bitwarden.nix b/home-modules/bitwarden.nix index 59f6242..b5414d8 100755 --- a/home-modules/bitwarden.nix +++ b/home-modules/bitwarden.nix @@ -6,28 +6,28 @@ lib.mkIf (host != "NxACE") bitwarden-cli ]; - home.file.".config/Bitwarden CLI/data.json".text = '' - { - "stateVersion": 9, - "global": { - "theme": "system", - "window": {}, - "environmentUrls": { - "base": "https://pw.nx2.site", - "api": null, - "identity": null, - "webVault": null, - "icons": null, - "notifications": null, - "events": null, - "keyConnector": null - }, - "region": "Self-hosted", - "installedVersion": "2023.12.0" - } - } - ''; + # home.file.".config/Bitwarden CLI/data.json".text = '' + # { + # "stateVersion": 9, + # "global": { + # "theme": "system", + # "window": {}, + # "environmentUrls": { + # "base": "https://pw.nx2.site", + # "api": null, + # "identity": null, + # "webVault": null, + # "icons": null, + # "notifications": null, + # "events": null, + # "keyConnector": null + # }, + # "region": "Self-hosted", + # "installedVersion": "2023.12.0" + # } + # } + # ''; - home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session; + # home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session; } diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 620a6eb..7231d31 100755 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, user, secrets, ... }: +{ config, pkgs, lib, rice, user, secrets, ... }: let channels = [ "agurin" @@ -62,683 +62,1354 @@ lib.mkIf (user != "tv") chatterino2 ]; - home.file.".local/share/chatterino/Settings/settings.json".text = builtins.toJSON { - "hotkeys" = { - "addedDefaults" = [ - "change channel" - "close popup window" - "create clip" - "delete" - "emote picker" - "focus down" - "focus left" - "focus right" - "focus up" - "go to end of input" - "go to end of input with selection" - "go to start of input" - "go to start of input with selection" - "new popup window" - "new popup window from tab" - "new split" - "new tab" - "next message" - "open debug popup" - "open quick switcher" - "open settings" - "popup accept" - "popup focus search box" - "popup reject" - "popup scroll down" - "popup scroll up" - "popup select last tab" - "popup select next tab" - "popup select previous tab" - "popup select tab #1" - "popup select tab #2" - "popup select tab #3" - "popup select tab #4" - "popup select tab #5" - "popup select tab #6" - "popup select tab #7" - "popup select tab #8" - "previous message" - "reconnect" - "reload emotes" - "remove tab" - "reopen split" - "scroll page down" - "scroll page up" - "scroll to bottom" - "scroll to top" - "select last tab" - "select next tab" - "select previous tab" - "select tab #1" - "select tab #2" - "select tab #3" - "select tab #4" - "select tab #5" - "select tab #6" - "select tab #7" - "select tab #8" - "send message" - "send message and keep text" - "show global search" - "show search" - "toggle live tabs only" - "toggle local r9k" - "toggle tab visibility" - "zoom in" - "zoom out" - "zoom reset" - ]; - "close popup window" = { - "action" = "delete"; - "keySequence" = "Esc"; - "category" = "popupWindow"; - "arguments" = [ ]; - }; - "popup accept" = { - "action" = "accept"; - "keySequence" = "Return"; - "category" = "popupWindow"; - "arguments" = [ ]; - }; - "popup focus search box" = { - "action" = "search"; - "keySequence" = "Ctrl+F"; - "category" = "popupWindow"; - "arguments" = [ ]; - }; - "popup reject" = { - "action" = "reject"; - "keySequence" = "Esc"; - "category" = "popupWindow"; - "arguments" = [ ]; - }; - "popup scroll down" = { - "action" = "scrollPage"; - "keySequence" = "PgDown"; - "category" = "popupWindow"; - "arguments" = [ - "down" - ]; - }; - "popup scroll up" = { - "action" = "scrollPage"; - "keySequence" = "PgUp"; - "category" = "popupWindow"; - "arguments" = [ - "up" - ]; - }; - "popup select last tab" = { - "action" = "openTab"; - "keySequence" = "Ctrl+9"; - "category" = "popupWindow"; - "arguments" = [ - "last" - ]; - }; - "popup select next tab" = { - "action" = "openTab"; - "keySequence" = "Ctrl+Tab"; - "category" = "popupWindow"; - "arguments" = [ - "next" - ]; - }; - "popup select previous tab" = { - "action" = "openTab"; - "keySequence" = "Ctrl+Shift+Tab"; - "category" = "popupWindow"; - "arguments" = [ - "previous" - ]; - }; - "popup select tab #1" = { - "action" = "openTab"; - "keySequence" = "Ctrl+1"; - "category" = "popupWindow"; - "arguments" = [ - "0" - ]; - }; - "popup select tab #2" = { - "action" = "openTab"; - "keySequence" = "Ctrl+2"; - "category" = "popupWindow"; - "arguments" = [ - "1" - ]; - }; - "popup select tab #3" = { - "action" = "openTab"; - "keySequence" = "Ctrl+3"; - "category" = "popupWindow"; - "arguments" = [ - "2" - ]; - }; - "popup select tab #4" = { - "action" = "openTab"; - "keySequence" = "Ctrl+4"; - "category" = "popupWindow"; - "arguments" = [ - "3" - ]; - }; - "popup select tab #5" = { - "action" = "openTab"; - "keySequence" = "Ctrl+5"; - "category" = "popupWindow"; - "arguments" = [ - "4" - ]; - }; - "popup select tab #6" = { - "action" = "openTab"; - "keySequence" = "Ctrl+6"; - "category" = "popupWindow"; - "arguments" = [ - "5" - ]; - }; - "popup select tab #7" = { - "action" = "openTab"; - "keySequence" = "Ctrl+7"; - "category" = "popupWindow"; - "arguments" = [ - "6" - ]; - }; - "popup select tab #8" = { - "action" = "openTab"; - "keySequence" = "Ctrl+8"; - "category" = "popupWindow"; - "arguments" = [ - "7" - ]; - }; - "change channel" = { - "action" = "changeChannel"; - "keySequence" = "Ctrl+R"; - "category" = "split"; - "arguments" = [ ]; - }; - "create clip" = { - "action" = "createClip"; - "keySequence" = "Alt+X"; - "category" = "split"; - "arguments" = [ ]; - }; - "delete" = { - "action" = "delete"; - "keySequence" = "Ctrl+W"; - "category" = "split"; - "arguments" = [ ]; - }; - "focus down" = { - "action" = "focus"; - "keySequence" = "Alt+Down"; - "category" = "split"; - "arguments" = [ - "down" - ]; - }; - "focus left" = { - "action" = "focus"; - "keySequence" = "Alt+Left"; - "category" = "split"; - "arguments" = [ - "left" - ]; - }; - "focus right" = { - "action" = "focus"; - "keySequence" = "Alt+Right"; - "category" = "split"; - "arguments" = [ - "right" - ]; - }; - "focus up" = { - "action" = "focus"; - "keySequence" = "Alt+Up"; - "category" = "split"; - "arguments" = [ - "up" - ]; - }; - "open debug popup" = { - "action" = "debug"; - "keySequence" = "F10"; - "category" = "split"; - "arguments" = [ ]; - }; - "reconnect" = { - "action" = "reconnect"; - "keySequence" = "Ctrl+F5"; - "category" = "split"; - "arguments" = [ ]; - }; - "reload emotes" = { - "action" = "reloadEmotes"; - "keySequence" = "F5"; - "category" = "split"; - "arguments" = [ ]; - }; - "scroll page down" = { - "action" = "scrollPage"; - "keySequence" = "PgDown"; - "category" = "split"; - "arguments" = [ - "down" - ]; - }; - "scroll page up" = { - "action" = "scrollPage"; - "keySequence" = "PgUp"; - "category" = "split"; - "arguments" = [ - "up" - ]; - }; - "scroll to bottom" = { - "action" = "scrollToBottom"; - "keySequence" = "Ctrl+End"; - "category" = "split"; - "arguments" = [ ]; - }; - "scroll to top" = { - "action" = "scrollToTop"; - "keySequence" = "Ctrl+Home"; - "category" = "split"; - "arguments" = [ ]; - }; - "show global search" = { - "action" = "showGlobalSearch"; - "keySequence" = "Ctrl+Shift+F"; - "category" = "split"; - "arguments" = [ ]; - }; - "show search" = { - "action" = "showSearch"; - "keySequence" = "Ctrl+F"; - "category" = "split"; - "arguments" = [ ]; - }; - "emote picker" = { - "action" = "openEmotesPopup"; - "keySequence" = "Ctrl+E"; - "category" = "splitInput"; - "arguments" = [ ]; - }; - "go to end of input" = { - "action" = "cursorToEnd"; - "keySequence" = "End"; - "category" = "splitInput"; - "arguments" = [ - "withoutSelection" - ]; - }; - "go to end of input with selection" = { - "action" = "cursorToEnd"; - "keySequence" = "Shift+End"; - "category" = "splitInput"; - "arguments" = [ - "withSelection" - ]; - }; - "go to start of input" = { - "action" = "cursorToStart"; - "keySequence" = "Home"; - "category" = "splitInput"; - "arguments" = [ - "withoutSelection" - ]; - }; - "go to start of input with selection" = { - "action" = "cursorToStart"; - "keySequence" = "Shift+Home"; - "category" = "splitInput"; - "arguments" = [ - "withSelection" - ]; - }; - "next message" = { - "action" = "nextMessage"; - "keySequence" = "Down"; - "category" = "splitInput"; - "arguments" = [ ]; - }; - "previous message" = { - "action" = "previousMessage"; - "keySequence" = "Up"; - "category" = "splitInput"; - "arguments" = [ ]; - }; - "send message" = { - "action" = "sendMessage"; - "keySequence" = "Return"; - "category" = "splitInput"; - "arguments" = [ ]; - }; - "send message and keep text" = { - "action" = "sendMessage"; - "keySequence" = "Ctrl+Return"; - "category" = "splitInput"; - "arguments" = [ - "keepInput" - ]; - }; - "new popup window" = { - "action" = "popup"; - "keySequence" = "Ctrl+N"; - "category" = "window"; - "arguments" = [ - "split" - ]; - }; - "new popup window from tab" = { - "action" = "popup"; - "keySequence" = "Ctrl+Shift+N"; - "category" = "window"; - "arguments" = [ - "window" - ]; - }; - "new split" = { - "action" = "newSplit"; - "keySequence" = "Ctrl+T"; - "category" = "window"; - "arguments" = [ ]; - }; - "new tab" = { - "action" = "newTab"; - "keySequence" = "Ctrl+Shift+T"; - "category" = "window"; - "arguments" = [ ]; - }; - "open quick switcher" = { - "action" = "openQuickSwitcher"; - "keySequence" = "Ctrl+K"; - "category" = "window"; - "arguments" = [ ]; - }; - "open settings" = { - "action" = "openSettings"; - "keySequence" = "Ctrl+P"; - "category" = "window"; - "arguments" = [ ]; - }; - "remove tab" = { - "action" = "removeTab"; - "keySequence" = "Ctrl+Shift+W"; - "category" = "window"; - "arguments" = [ ]; - }; - "reopen split" = { - "action" = "reopenSplit"; - "keySequence" = "Ctrl+G"; - "category" = "window"; - "arguments" = [ ]; - }; - "select last tab" = { - "action" = "openTab"; - "keySequence" = "Ctrl+9"; - "category" = "window"; - "arguments" = [ - "last" - ]; - }; - "select next tab" = { - "action" = "openTab"; - "keySequence" = "Ctrl+Tab"; - "category" = "window"; - "arguments" = [ - "next" - ]; - }; - "select previous tab" = { - "action" = "openTab"; - "keySequence" = "Ctrl+Shift+Tab"; - "category" = "window"; - "arguments" = [ - "previous" - ]; - }; - "select tab #1" = { - "action" = "openTab"; - "keySequence" = "Ctrl+1"; - "category" = "window"; - "arguments" = [ - "0" - ]; - }; - "select tab #2" = { - "action" = "openTab"; - "keySequence" = "Ctrl+2"; - "category" = "window"; - "arguments" = [ - "1" - ]; - }; - "select tab #3" = { - "action" = "openTab"; - "keySequence" = "Ctrl+3"; - "category" = "window"; - "arguments" = [ - "2" - ]; - }; - "select tab #4" = { - "action" = "openTab"; - "keySequence" = "Ctrl+4"; - "category" = "window"; - "arguments" = [ - "3" - ]; - }; - "select tab #5" = { - "action" = "openTab"; - "keySequence" = "Ctrl+5"; - "category" = "window"; - "arguments" = [ - "4" - ]; - }; - "select tab #6" = { - "action" = "openTab"; - "keySequence" = "Ctrl+6"; - "category" = "window"; - "arguments" = [ - "5" - ]; - }; - "select tab #7" = { - "action" = "openTab"; - "keySequence" = "Ctrl+7"; - "category" = "window"; - "arguments" = [ - "6" - ]; - }; - "select tab #8" = { - "action" = "openTab"; - "keySequence" = "Ctrl+8"; - "category" = "window"; - "arguments" = [ - "7" - ]; - }; - "toggle live tabs only" = { - "action" = "setTabVisibility"; - "keySequence" = "Ctrl+Shift+L"; - "category" = "window"; - "arguments" = [ - "toggleLiveOnly" - ]; - }; - "toggle local r9k" = { - "action" = "toggleLocalR9K"; - "keySequence" = "Ctrl+H"; - "category" = "window"; - "arguments" = [ ]; - }; - "toggle tab visibility" = { - "action" = "setTabVisibility"; - "keySequence" = "Ctrl+U"; - "category" = "window"; - "arguments" = [ - "toggle" - ]; - }; - "zoom in" = { - "action" = "zoom"; - "keySequence" = "Ctrl++"; - "category" = "window"; - "arguments" = [ - "in" - ]; - }; - "zoom out" = { - "action" = "zoom"; - "keySequence" = "Ctrl+-"; - "category" = "window"; - "arguments" = [ - "out" - ]; - }; - "zoom reset" = { - "action" = "zoom"; - "keySequence" = "Ctrl+0"; - "category" = "window"; - "arguments" = [ - "reset" - ]; - }; - }; - "misc" = { - "currentVersion" = "2.4.6"; - "lockNotebookLayout" = false; - }; - "ui" = { - "lastSelectChannelTab" = 0; - "lastSelectIrcConn" = -1; - }; - "appearance" = { - "theme" = { - "name" = "Black"; - }; - "tabVisibility" = 1; - "currentFontFamily" = "Atkinson Hyperlegible"; - "messages" = { - "alternateMessageBackground" = true; - "showTimestamps" = false; - "timestampFormat" = "h =mm"; - "separateMessages" = true; - "lastMessagePattern" = 10; - "lastMessageColor" = "#ff7f0002"; - "usernameDisplayMode" = 1; - }; - "currentFontSize" = 12; - "splitheader" = { - "showUptime" = true; - "showViewerCount" = true; - "showGame" = true; - "showTitle" = true; - }; - "boldScale" = 63.0; - }; - accounts = secrets.chatterino.accounts; - "behaviour" = { - "pauseOnHoverDuration" = 5.0; - "usernameRightClickBehavior" = 0; - "usernameRightClickBehaviorWithModifier" = 1; - "showJoins" = false; - }; - "highlighting" = { - "selfMessageHighlight" = { - "enabled" = true; - "color" = "#73008cff"; - }; - "badges" = [ - { - "name" = "broadcaster"; - "displayName" = "Broadcaster"; - "showInMentions" = false; - "alert" = false; - "sound" = false; - "soundUrl" = ""; - "color" = "#7f7f3f49"; - } - { - "name" = "admin"; - "displayName" = "Admin"; - "showInMentions" = false; - "alert" = false; - "sound" = false; - "soundUrl" = ""; - "color" = "#7f7f3f49"; - } - { - "name" = "staff"; - "displayName" = "Staff"; - "showInMentions" = false; - "alert" = false; - "sound" = false; - "soundUrl" = ""; - "color" = "#7f7f3f49"; - } - { - "name" = "moderator"; - "displayName" = "Moderator"; - "showInMentions" = false; - "alert" = false; - "sound" = false; - "soundUrl" = ""; - } - { - "name" = "vip"; - "displayName" = "VIP"; - "showInMentions" = false; - "alert" = false; - "sound" = false; - "soundUrl" = ""; - "color" = "#7f7f3578"; - } - ]; - }; - "emotes" = { - "removeSpacesBetweenEmotes" = false; - "showUnlistedSevenTVEmotes" = false; - }; - "similarity" = { - "similarityEnabled" = false; - "hideSimilar" = false; - "hideSimilarMaxDelay" = 30; - "hideSimilarMaxMessagesToCheck" = 5; - }; - }; + home.file.".local/share/chatterino/Settings/settings.json".text = with secrets.chatterino; '' + { + "accounts": { + "current": "${username}", + "uid189594946": { + "clientID": "${clientID}", + "oauthToken": "${oauthToken}", + "userID": "${userID}", + "username": "${username}" + } + }, + "appearance": { + "boldScale": 63.0, + "currentFontFamily": "${rice.font.base.name}", + "currentFontSize": 12, + "messages": { + "alternateMessageBackground": true, + "lastMessageColor": "#ff7f0002", + "lastMessagePattern": 10, + "separateMessages": true, + "showTimestamps": false, + "timestampFormat": "h =mm", + "usernameDisplayMode": 1 + }, + "splitheader": { + "showGame": true, + "showTitle": true, + "showUptime": true, + "showViewerCount": true + }, + "tabVisibility": 1, + "theme": { + "name": "Black" + } + }, + "behaviour": { + "pauseOnHoverDuration": 5.0, + "showJoins": false, + "usernameRightClickBehavior": 0, + "usernameRightClickBehaviorWithModifier": 1 + }, + "emotes": { + "removeSpacesBetweenEmotes": false, + "showUnlistedSevenTVEmotes": true + }, + "highlighting": { + "badges": [ + { + "alert": false, + "color": "#7f7f3f49", + "displayName": "Broadcaster", + "name": "broadcaster", + "showInMentions": false, + "sound": false, + "soundUrl": "" + }, + { + "alert": false, + "color": "#7f7f3f49", + "displayName": "Admin", + "name": "admin", + "showInMentions": false, + "sound": false, + "soundUrl": "" + }, + { + "alert": false, + "color": "#7f7f3f49", + "displayName": "Staff", + "name": "staff", + "showInMentions": false, + "sound": false, + "soundUrl": "" + }, + { + "alert": false, + "displayName": "Moderator", + "name": "moderator", + "showInMentions": false, + "sound": false, + "soundUrl": "" + }, + { + "alert": false, + "color": "#7f7f3578", + "displayName": "VIP", + "name": "vip", + "showInMentions": false, + "sound": false, + "soundUrl": "" + } + ], + "selfMessageHighlight": { + "color": "#73008cff", + "enabled": true + } + }, + "hotkeys": { + "addedDefaults": [ + "change channel", + "close popup window", + "create clip", + "delete", + "emote picker", + "focus down", + "focus left", + "focus right", + "focus up", + "go to end of input", + "go to end of input with selection", + "go to start of input", + "go to start of input with selection", + "new popup window", + "new popup window from tab", + "new split", + "new tab", + "next message", + "open debug popup", + "open quick switcher", + "open settings", + "popup accept", + "popup focus search box", + "popup reject", + "popup scroll down", + "popup scroll up", + "popup select last tab", + "popup select next tab", + "popup select previous tab", + "popup select tab #1", + "popup select tab #2", + "popup select tab #3", + "popup select tab #4", + "popup select tab #5", + "popup select tab #6", + "popup select tab #7", + "popup select tab #8", + "previous message", + "reconnect", + "reload emotes", + "remove tab", + "reopen split", + "scroll page down", + "scroll page up", + "scroll to bottom", + "scroll to top", + "select last tab", + "select next tab", + "select previous tab", + "select tab #1", + "select tab #2", + "select tab #3", + "select tab #4", + "select tab #5", + "select tab #6", + "select tab #7", + "select tab #8", + "send message", + "send message and keep text", + "show global search", + "show search", + "toggle live tabs only", + "toggle local r9k", + "toggle tab visibility", + "zoom in", + "zoom out", + "zoom reset" + ], + "change channel": { + "action": "changeChannel", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+R" + }, + "close popup window": { + "action": "delete", + "arguments": [], + "category": "popupWindow", + "keySequence": "Esc" + }, + "create clip": { + "action": "createClip", + "arguments": [], + "category": "split", + "keySequence": "Alt+X" + }, + "delete": { + "action": "delete", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+W" + }, + "emote picker": { + "action": "openEmotesPopup", + "arguments": [], + "category": "splitInput", + "keySequence": "Ctrl+E" + }, + "focus down": { + "action": "focus", + "arguments": [ + "down" + ], + "category": "split", + "keySequence": "Alt+Down" + }, + "focus left": { + "action": "focus", + "arguments": [ + "left" + ], + "category": "split", + "keySequence": "Alt+Left" + }, + "focus right": { + "action": "focus", + "arguments": [ + "right" + ], + "category": "split", + "keySequence": "Alt+Right" + }, + "focus up": { + "action": "focus", + "arguments": [ + "up" + ], + "category": "split", + "keySequence": "Alt+Up" + }, + "go to end of input": { + "action": "cursorToEnd", + "arguments": [ + "withoutSelection" + ], + "category": "splitInput", + "keySequence": "End" + }, + "go to end of input with selection": { + "action": "cursorToEnd", + "arguments": [ + "withSelection" + ], + "category": "splitInput", + "keySequence": "Shift+End" + }, + "go to start of input": { + "action": "cursorToStart", + "arguments": [ + "withoutSelection" + ], + "category": "splitInput", + "keySequence": "Home" + }, + "go to start of input with selection": { + "action": "cursorToStart", + "arguments": [ + "withSelection" + ], + "category": "splitInput", + "keySequence": "Shift+Home" + }, + "new popup window": { + "action": "popup", + "arguments": [ + "split" + ], + "category": "window", + "keySequence": "Ctrl+N" + }, + "new popup window from tab": { + "action": "popup", + "arguments": [ + "window" + ], + "category": "window", + "keySequence": "Ctrl+Shift+N" + }, + "new split": { + "action": "newSplit", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+T" + }, + "new tab": { + "action": "newTab", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+Shift+T" + }, + "next message": { + "action": "nextMessage", + "arguments": [], + "category": "splitInput", + "keySequence": "Down" + }, + "open debug popup": { + "action": "debug", + "arguments": [], + "category": "split", + "keySequence": "F10" + }, + "open quick switcher": { + "action": "openQuickSwitcher", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+K" + }, + "open settings": { + "action": "openSettings", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+P" + }, + "popup accept": { + "action": "accept", + "arguments": [], + "category": "popupWindow", + "keySequence": "Return" + }, + "popup focus search box": { + "action": "search", + "arguments": [], + "category": "popupWindow", + "keySequence": "Ctrl+F" + }, + "popup reject": { + "action": "reject", + "arguments": [], + "category": "popupWindow", + "keySequence": "Esc" + }, + "popup scroll down": { + "action": "scrollPage", + "arguments": [ + "down" + ], + "category": "popupWindow", + "keySequence": "PgDown" + }, + "popup scroll up": { + "action": "scrollPage", + "arguments": [ + "up" + ], + "category": "popupWindow", + "keySequence": "PgUp" + }, + "popup select last tab": { + "action": "openTab", + "arguments": [ + "last" + ], + "category": "popupWindow", + "keySequence": "Ctrl+9" + }, + "popup select next tab": { + "action": "openTab", + "arguments": [ + "next" + ], + "category": "popupWindow", + "keySequence": "Ctrl+Tab" + }, + "popup select previous tab": { + "action": "openTab", + "arguments": [ + "previous" + ], + "category": "popupWindow", + "keySequence": "Ctrl+Shift+Tab" + }, + "popup select tab #1": { + "action": "openTab", + "arguments": [ + "0" + ], + "category": "popupWindow", + "keySequence": "Ctrl+1" + }, + "popup select tab #2": { + "action": "openTab", + "arguments": [ + "1" + ], + "category": "popupWindow", + "keySequence": "Ctrl+2" + }, + "popup select tab #3": { + "action": "openTab", + "arguments": [ + "2" + ], + "category": "popupWindow", + "keySequence": "Ctrl+3" + }, + "popup select tab #4": { + "action": "openTab", + "arguments": [ + "3" + ], + "category": "popupWindow", + "keySequence": "Ctrl+4" + }, + "popup select tab #5": { + "action": "openTab", + "arguments": [ + "4" + ], + "category": "popupWindow", + "keySequence": "Ctrl+5" + }, + "popup select tab #6": { + "action": "openTab", + "arguments": [ + "5" + ], + "category": "popupWindow", + "keySequence": "Ctrl+6" + }, + "popup select tab #7": { + "action": "openTab", + "arguments": [ + "6" + ], + "category": "popupWindow", + "keySequence": "Ctrl+7" + }, + "popup select tab #8": { + "action": "openTab", + "arguments": [ + "7" + ], + "category": "popupWindow", + "keySequence": "Ctrl+8" + }, + "previous message": { + "action": "previousMessage", + "arguments": [], + "category": "splitInput", + "keySequence": "Up" + }, + "reconnect": { + "action": "reconnect", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+F5" + }, + "reload emotes": { + "action": "reloadEmotes", + "arguments": [], + "category": "split", + "keySequence": "F5" + }, + "remove tab": { + "action": "removeTab", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+Shift+W" + }, + "reopen split": { + "action": "reopenSplit", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+G" + }, + "scroll page down": { + "action": "scrollPage", + "arguments": [ + "down" + ], + "category": "split", + "keySequence": "PgDown" + }, + "scroll page up": { + "action": "scrollPage", + "arguments": [ + "up" + ], + "category": "split", + "keySequence": "PgUp" + }, + "scroll to bottom": { + "action": "scrollToBottom", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+End" + }, + "scroll to top": { + "action": "scrollToTop", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+Home" + }, + "select last tab": { + "action": "openTab", + "arguments": [ + "last" + ], + "category": "window", + "keySequence": "Ctrl+9" + }, + "select next tab": { + "action": "openTab", + "arguments": [ + "next" + ], + "category": "window", + "keySequence": "Ctrl+Tab" + }, + "select previous tab": { + "action": "openTab", + "arguments": [ + "previous" + ], + "category": "window", + "keySequence": "Ctrl+Shift+Tab" + }, + "select tab #1": { + "action": "openTab", + "arguments": [ + "0" + ], + "category": "window", + "keySequence": "Ctrl+1" + }, + "select tab #2": { + "action": "openTab", + "arguments": [ + "1" + ], + "category": "window", + "keySequence": "Ctrl+2" + }, + "select tab #3": { + "action": "openTab", + "arguments": [ + "2" + ], + "category": "window", + "keySequence": "Ctrl+3" + }, + "select tab #4": { + "action": "openTab", + "arguments": [ + "3" + ], + "category": "window", + "keySequence": "Ctrl+4" + }, + "select tab #5": { + "action": "openTab", + "arguments": [ + "4" + ], + "category": "window", + "keySequence": "Ctrl+5" + }, + "select tab #6": { + "action": "openTab", + "arguments": [ + "5" + ], + "category": "window", + "keySequence": "Ctrl+6" + }, + "select tab #7": { + "action": "openTab", + "arguments": [ + "6" + ], + "category": "window", + "keySequence": "Ctrl+7" + }, + "select tab #8": { + "action": "openTab", + "arguments": [ + "7" + ], + "category": "window", + "keySequence": "Ctrl+8" + }, + "send message": { + "action": "sendMessage", + "arguments": [], + "category": "splitInput", + "keySequence": "Return" + }, + "send message and keep text": { + "action": "sendMessage", + "arguments": [ + "keepInput" + ], + "category": "splitInput", + "keySequence": "Ctrl+Return" + }, + "show global search": { + "action": "showGlobalSearch", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+Shift+F" + }, + "show search": { + "action": "showSearch", + "arguments": [], + "category": "split", + "keySequence": "Ctrl+F" + }, + "toggle live tabs only": { + "action": "setTabVisibility", + "arguments": [ + "toggleLiveOnly" + ], + "category": "window", + "keySequence": "Ctrl+Shift+L" + }, + "toggle local r9k": { + "action": "toggleLocalR9K", + "arguments": [], + "category": "window", + "keySequence": "Ctrl+H" + }, + "toggle tab visibility": { + "action": "setTabVisibility", + "arguments": [ + "toggle" + ], + "category": "window", + "keySequence": "Ctrl+U" + }, + "zoom in": { + "action": "zoom", + "arguments": [ + "in" + ], + "category": "window", + "keySequence": "Ctrl++" + }, + "zoom out": { + "action": "zoom", + "arguments": [ + "out" + ], + "category": "window", + "keySequence": "Ctrl+-" + }, + "zoom reset": { + "action": "zoom", + "arguments": [ + "reset" + ], + "category": "window", + "keySequence": "Ctrl+0" + } + }, + "misc": { + "currentVersion": "2.5.1", + "lockNotebookLayout": false + }, + "similarity": { + "hideSimilar": false, + "hideSimilarMaxDelay": 30, + "hideSimilarMaxMessagesToCheck": 5, + "similarityEnabled": false + }, + "ui": { + "lastSelectChannelTab": 0, + "lastSelectIrcConn": -1 + } + } + ''; + # home.file.".local/share/chatterino/Settings/settings.json".text = builtins.toJSON { + # hotkeys = { + # addedDefaults = [ + # "change channel" + # "close popup window" + # "create clip" + # "delete" + # "emote picker" + # "focus down" + # "focus left" + # "focus right" + # "focus up" + # "go to end of input" + # "go to end of input with selection" + # "go to start of input" + # "go to start of input with selection" + # "new popup window" + # "new popup window from tab" + # "new split" + # "new tab" + # "next message" + # "open debug popup" + # "open quick switcher" + # "open settings" + # "popup accept" + # "popup focus search box" + # "popup reject" + # "popup scroll down" + # "popup scroll up" + # "popup select last tab" + # "popup select next tab" + # "popup select previous tab" + # "popup select tab #1" + # "popup select tab #2" + # "popup select tab #3" + # "popup select tab #4" + # "popup select tab #5" + # "popup select tab #6" + # "popup select tab #7" + # "popup select tab #8" + # "previous message" + # "reconnect" + # "reload emotes" + # "remove tab" + # "reopen split" + # "scroll page down" + # "scroll page up" + # "scroll to bottom" + # "scroll to top" + # "select last tab" + # "select next tab" + # "select previous tab" + # "select tab #1" + # "select tab #2" + # "select tab #3" + # "select tab #4" + # "select tab #5" + # "select tab #6" + # "select tab #7" + # "select tab #8" + # "send message" + # "send message and keep text" + # "show global search" + # "show search" + # "toggle live tabs only" + # "toggle local r9k" + # "toggle tab visibility" + # "zoom in" + # "zoom out" + # "zoom reset" + # ]; + # "close popup window" = { + # action = "delete"; + # keySequence = "Esc"; + # category = "popupWindow"; + # arguments = [ ]; + # }; + # "popup accept" = { + # action = "accept"; + # keySequence = "Return"; + # category = "popupWindow"; + # arguments = [ ]; + # }; + # "popup focus search box" = { + # action = "search"; + # keySequence = "Ctrl+F"; + # category = "popupWindow"; + # arguments = [ ]; + # }; + # "popup reject" = { + # action = "reject"; + # keySequence = "Esc"; + # category = "popupWindow"; + # arguments = [ ]; + # }; + # "popup scroll down" = { + # action = "scrollPage"; + # keySequence = "PgDown"; + # category = "popupWindow"; + # arguments = [ + # "down" + # ]; + # }; + # "popup scroll up" = { + # action = "scrollPage"; + # keySequence = "PgUp"; + # category = "popupWindow"; + # arguments = [ + # "up" + # ]; + # }; + # "popup select last tab" = { + # action = "openTab"; + # keySequence = "Ctrl+9"; + # category = "popupWindow"; + # arguments = [ + # "last" + # ]; + # }; + # "popup select next tab" = { + # action = "openTab"; + # keySequence = "Ctrl+Tab"; + # category = "popupWindow"; + # arguments = [ + # "next" + # ]; + # }; + # "popup select previous tab" = { + # action = "openTab"; + # keySequence = "Ctrl+Shift+Tab"; + # category = "popupWindow"; + # arguments = [ + # "previous" + # ]; + # }; + # "popup select tab #1" = { + # action = "openTab"; + # keySequence = "Ctrl+1"; + # category = "popupWindow"; + # arguments = [ + # "0" + # ]; + # }; + # "popup select tab #2" = { + # action = "openTab"; + # keySequence = "Ctrl+2"; + # category = "popupWindow"; + # arguments = [ + # "1" + # ]; + # }; + # "popup select tab #3" = { + # action = "openTab"; + # keySequence = "Ctrl+3"; + # category = "popupWindow"; + # arguments = [ + # "2" + # ]; + # }; + # "popup select tab #4" = { + # action = "openTab"; + # keySequence = "Ctrl+4"; + # category = "popupWindow"; + # arguments = [ + # "3" + # ]; + # }; + # "popup select tab #5" = { + # action = "openTab"; + # keySequence = "Ctrl+5"; + # category = "popupWindow"; + # arguments = [ + # "4" + # ]; + # }; + # "popup select tab #6" = { + # action = "openTab"; + # keySequence = "Ctrl+6"; + # category = "popupWindow"; + # arguments = [ + # "5" + # ]; + # }; + # "popup select tab #7" = { + # action = "openTab"; + # keySequence = "Ctrl+7"; + # category = "popupWindow"; + # arguments = [ + # "6" + # ]; + # }; + # "popup select tab #8" = { + # action = "openTab"; + # keySequence = "Ctrl+8"; + # category = "popupWindow"; + # arguments = [ + # "7" + # ]; + # }; + # "change channel" = { + # action = "changeChannel"; + # keySequence = "Ctrl+R"; + # category = "split"; + # arguments = [ ]; + # }; + # "create clip" = { + # action = "createClip"; + # keySequence = "Alt+X"; + # category = "split"; + # arguments = [ ]; + # }; + # delete = { + # action = "delete"; + # keySequence = "Ctrl+W"; + # category = "split"; + # arguments = [ ]; + # }; + # "focus down" = { + # action = "focus"; + # keySequence = "Alt+Down"; + # category = "split"; + # arguments = [ + # "down" + # ]; + # }; + # "focus left" = { + # action = "focus"; + # keySequence = "Alt+Left"; + # category = "split"; + # arguments = [ + # "left" + # ]; + # }; + # "focus right" = { + # action = "focus"; + # keySequence = "Alt+Right"; + # category = "split"; + # arguments = [ + # "right" + # ]; + # }; + # "focus up" = { + # action = "focus"; + # keySequence = "Alt+Up"; + # category = "split"; + # arguments = [ + # "up" + # ]; + # }; + # "open debug popup" = { + # action = "debug"; + # keySequence = "F10"; + # category = "split"; + # arguments = [ ]; + # }; + # reconnect = { + # action = "reconnect"; + # keySequence = "Ctrl+F5"; + # category = "split"; + # arguments = [ ]; + # }; + # "reload emotes" = { + # action = "reloadEmotes"; + # keySequence = "F5"; + # category = "split"; + # arguments = [ ]; + # }; + # "scroll page down" = { + # action = "scrollPage"; + # keySequence = "PgDown"; + # category = "split"; + # arguments = [ + # "down" + # ]; + # }; + # "scroll page up" = { + # action = "scrollPage"; + # keySequence = "PgUp"; + # category = "split"; + # arguments = [ + # "up" + # ]; + # }; + # "scroll to bottom" = { + # action = "scrollToBottom"; + # keySequence = "Ctrl+End"; + # category = "split"; + # arguments = [ ]; + # }; + # "scroll to top" = { + # action = "scrollToTop"; + # keySequence = "Ctrl+Home"; + # category = "split"; + # arguments = [ ]; + # }; + # "show global search" = { + # action = "showGlobalSearch"; + # keySequence = "Ctrl+Shift+F"; + # category = "split"; + # arguments = [ ]; + # }; + # "show search" = { + # action = "showSearch"; + # keySequence = "Ctrl+F"; + # category = "split"; + # arguments = [ ]; + # }; + # "emote picker" = { + # action = "openEmotesPopup"; + # keySequence = "Ctrl+E"; + # category = "splitInput"; + # arguments = [ ]; + # }; + # "go to end of input" = { + # action = "cursorToEnd"; + # keySequence = "End"; + # category = "splitInput"; + # arguments = [ + # "withoutSelection" + # ]; + # }; + # "go to end of input with selection" = { + # action = "cursorToEnd"; + # keySequence = "Shift+End"; + # category = "splitInput"; + # arguments = [ + # "withSelection" + # ]; + # }; + # "go to start of input" = { + # action = "cursorToStart"; + # keySequence = "Home"; + # category = "splitInput"; + # arguments = [ + # "withoutSelection" + # ]; + # }; + # "go to start of input with selection" = { + # action = "cursorToStart"; + # keySequence = "Shift+Home"; + # category = "splitInput"; + # arguments = [ + # "withSelection" + # ]; + # }; + # "next message" = { + # action = "nextMessage"; + # keySequence = "Down"; + # category = "splitInput"; + # arguments = [ ]; + # }; + # "previous message" = { + # action = "previousMessage"; + # keySequence = "Up"; + # category = "splitInput"; + # arguments = [ ]; + # }; + # "send message" = { + # action = "sendMessage"; + # keySequence = "Return"; + # category = "splitInput"; + # arguments = [ ]; + # }; + # "send message and keep text" = { + # action = "sendMessage"; + # keySequence = "Ctrl+Return"; + # category = "splitInput"; + # arguments = [ + # "keepInput" + # ]; + # }; + # "new popup window" = { + # action = "popup"; + # keySequence = "Ctrl+N"; + # category = "window"; + # arguments = [ + # "split" + # ]; + # }; + # "new popup window from tab" = { + # action = "popup"; + # keySequence = "Ctrl+Shift+N"; + # category = "window"; + # arguments = [ + # "window" + # ]; + # }; + # "new split" = { + # action = "newSplit"; + # keySequence = "Ctrl+T"; + # category = "window"; + # arguments = [ ]; + # }; + # "new tab" = { + # action = "newTab"; + # keySequence = "Ctrl+Shift+T"; + # category = "window"; + # arguments = [ ]; + # }; + # "open quick switcher" = { + # action = "openQuickSwitcher"; + # keySequence = "Ctrl+K"; + # category = "window"; + # arguments = [ ]; + # }; + # "open settings" = { + # action = "openSettings"; + # keySequence = "Ctrl+P"; + # category = "window"; + # arguments = [ ]; + # }; + # "remove tab" = { + # action = "removeTab"; + # keySequence = "Ctrl+Shift+W"; + # category = "window"; + # arguments = [ ]; + # }; + # "reopen split" = { + # action = "reopenSplit"; + # keySequence = "Ctrl+G"; + # category = "window"; + # arguments = [ ]; + # }; + # "select last tab" = { + # action = "openTab"; + # keySequence = "Ctrl+9"; + # category = "window"; + # arguments = [ + # "last" + # ]; + # }; + # "select next tab" = { + # action = "openTab"; + # keySequence = "Ctrl+Tab"; + # category = "window"; + # arguments = [ + # "next" + # ]; + # }; + # "select previous tab" = { + # action = "openTab"; + # keySequence = "Ctrl+Shift+Tab"; + # category = "window"; + # arguments = [ + # "previous" + # ]; + # }; + # "select tab #1" = { + # action = "openTab"; + # keySequence = "Ctrl+1"; + # category = "window"; + # arguments = [ + # "0" + # ]; + # }; + # "select tab #2" = { + # action = "openTab"; + # keySequence = "Ctrl+2"; + # category = "window"; + # arguments = [ + # "1" + # ]; + # }; + # "select tab #3" = { + # action = "openTab"; + # keySequence = "Ctrl+3"; + # category = "window"; + # arguments = [ + # "2" + # ]; + # }; + # "select tab #4" = { + # action = "openTab"; + # keySequence = "Ctrl+4"; + # category = "window"; + # arguments = [ + # "3" + # ]; + # }; + # "select tab #5" = { + # action = "openTab"; + # keySequence = "Ctrl+5"; + # category = "window"; + # arguments = [ + # "4" + # ]; + # }; + # "select tab #6" = { + # action = "openTab"; + # keySequence = "Ctrl+6"; + # category = "window"; + # arguments = [ + # "5" + # ]; + # }; + # "select tab #7" = { + # action = "openTab"; + # keySequence = "Ctrl+7"; + # category = "window"; + # arguments = [ + # "6" + # ]; + # }; + # "select tab #8" = { + # action = "openTab"; + # keySequence = "Ctrl+8"; + # category = "window"; + # arguments = [ + # "7" + # ]; + # }; + # "toggle live tabs only" = { + # action = "setTabVisibility"; + # keySequence = "Ctrl+Shift+L"; + # category = "window"; + # arguments = [ + # "toggleLiveOnly" + # ]; + # }; + # "toggle local r9k" = { + # action = "toggleLocalR9K"; + # keySequence = "Ctrl+H"; + # category = "window"; + # arguments = [ ]; + # }; + # "toggle tab visibility" = { + # action = "setTabVisibility"; + # keySequence = "Ctrl+U"; + # category = "window"; + # arguments = [ + # "toggle" + # ]; + # }; + # "zoom in" = { + # action = "zoom"; + # keySequence = "Ctrl++"; + # category = "window"; + # arguments = [ + # "in" + # ]; + # }; + # "zoom out" = { + # action = "zoom"; + # keySequence = "Ctrl+-"; + # category = "window"; + # arguments = [ + # "out" + # ]; + # }; + # "zoom reset" = { + # action = "zoom"; + # keySequence = "Ctrl+0"; + # category = "window"; + # arguments = [ + # "reset" + # ]; + # }; + # }; + # misc = { + # currentVersion = "2.5.1"; + # lockNotebookLayout = false; + # }; + # ui = { + # lastSelectChannelTab = 0; + # lastSelectIrcConn = -1; + # }; + # appearance = { + # theme = { + # name = "Black"; + # }; + # tabVisibility = 1; + # smoothScrollingNewMessages = true;o + # currentFontFamily = rice.font.base.name; + # messages = { + # alternateMessageBackground = true; + # showTimestamps = false; + # timestampFormat = "h =mm"; + # separateMessages = true; + # lastMessagePattern = 10; + # lastMessageColor = "#ff7f0002"; + # usernameDisplayMode = 1; + # }; + # currentFontSize = 12; + # splitheader = { + # showUptime = true; + # showViewerCount = true; + # showGame = true; + # showTitle = true; + # }; + # boldScale = 63.0; + # }; + # accounts = secrets.chatterino.accounts; + # behaviour = { + # pauseOnHoverDuration = 5.0; + # usernameRightClickBehavior = 0; + # usernameRightClickBehaviorWithModifier = 1; + # showJoins = false; + # }; + # highlighting = { + # selfMessageHighlight = { + # enabled = true; + # color = "#73008cff"; + # }; + # badges = [ + # { + # name = "broadcaster"; + # displayName = "Broadcaster"; + # showInMentions = false; + # alert = false; + # sound = false; + # soundUrl = ""; + # color = "#7f7f3f49"; + # } + # { + # name = "admin"; + # displayName = "Admin"; + # showInMentions = false; + # alert = false; + # sound = false; + # soundUrl = ""; + # color = "#7f7f3f49"; + # } + # { + # name = "staff"; + # displayName = "Staff"; + # showInMentions = false; + # alert = false; + # sound = false; + # soundUrl = ""; + # color = "#7f7f3f49"; + # } + # { + # name = "moderator"; + # displayName = "Moderator"; + # showInMentions = false; + # alert = false; + # sound = false; + # soundUrl = ""; + # } + # { + # name = "vip"; + # displayName = "VIP"; + # showInMentions = false; + # alert = false; + # sound = false; + # soundUrl = ""; + # color = "#7f7f3578"; + # } + # ]; + # }; + # emotes = { + # removeSpacesBetweenEmotes = false; + # showUnlistedSevenTVEmotes = true; + # }; + # similarity = { + # similarityEnabled = false; + # hideSimilar = false; + # hideSimilarMaxDelay = 30; + # hideSimilarMaxMessagesToCheck = 5; + # }; + # }; home.file.".local/share/chatterino/Settings/window-layout.json".text = builtins.toJSON { - "windows" = [ + windows = [ { - "emotePopup" = { - "x" = 0; - "y" = 0; + emotePopup = { + x = 0; + y = 0; }; - "height" = 569; - "state" = "maximized"; - "tabs" = map tabber channels; - "type" = "main"; - "width" = 943; - "x" = 0; - "y" = 0; + height = 569; + state = "maximized"; + tabs = map tabber channels; + type = "main"; + width = 943; + x = 0; + y = 0; } ]; }; diff --git a/home-modules/email.nix b/home-modules/email.nix index 8de4c9e..ee8e666 100755 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, host, secrets, ... }: +{ pkgs, lib, host, rice, secrets, ... }: lib.mkIf (host != "NxACE") { home.packages = with pkgs; [ @@ -6,30 +6,68 @@ lib.mkIf (host != "NxACE") ]; - programs.thunderbird = { + programs.thunderbird = + let + inherit (lib.generators) toJSON; + extensions = toJSON {} { + "default-theme@mozilla.org" = "5787f490-29b8-436e-a111-640da8590790"; + "google@search.mozilla.org" = "cc340383-7068-4b32-a10f-9f19334bfebc"; + "ddg@search.mozilla.org" = "0c340210-f7ab-48e8-9778-600ed5d00160"; + "amazondotcom@search.mozilla.org" = "881d8fdf-5772-4e33-81ff-faac2d1fa92c"; + "wikipedia@search.mozilla.org" = "7ea3d39d-3eea-430f-9bd7-f902d8124d45"; + "bing@search.mozilla.org" = "f480cce8-68af-4082-908e-f8996153352b"; + "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d"; + "lightningcalendartabs@jlx.84" = "12d48e41-412e-4d09-835a-fa6fb8c180eb"; + }; + in { enable = true; profiles = { default = { isDefault = true; - settings = { + settings = with rice.color; { "calendar.alarms.showmissed" = false; "calendar.alarms.playsound" = false; "calendar.alarms.show" = false; + "extensions.webextensions.uuids" = extensions; + "mail.startup.enabledMailCheckOnce" = true; + "mailnews.mark_message_read.delay" = true; + "mailnews.mark_message_read.delay.interval" = 3; + "mailnews.tags.$label1.color" = red.base; + "mailnews.tags.$label1.tag" = "Important"; + "mailnews.tags.$label2.color" = yellow.base; + "mailnews.tags.$label2.tag" = "Work"; + "mailnews.tags.$label3.color" = green.base; + "mailnews.tags.$label3.tag" = "Personal"; + "mailnews.tags.$label4.color" = cyan.base; + "mailnews.tags.$label4.tag" = "To Do"; + "mailnews.tags.$label5.color" = blue.base; + "mailnews.tags.$label5.tag" = "Later"; + "mailnews.headers.showMessageId" = true; + "mailnews.headers.showOrganization" = true; + "mailnews.headers.showReferences" = true; + "mailnews.headers.showSender" = true; + "mailnews.headers.showUserAgent" = true; }; }; }; }; - accounts.email.accounts = { - "gamil-online" = { + accounts.email.accounts = + let + OAuth2Settings = id: { + "mail.smtpserver.smtp_${id}.authMethod" = 10; + "mail.server.server_${id}.authMethod" = 10; + }; + in { + gmail-online = { address = secrets.email.gmail-online.mail; realName = "Lennart J. Kurzweg"; flavor = "gmail.com"; primary = true; + smtp.tls.useStartTls = true; signature = { text = '' - -- About Me: https://nx2.site/about-me Contact: https://nx2.site/contact GPG: https://nx2.site/gpg @@ -39,16 +77,47 @@ lib.mkIf (host != "NxACE") thunderbird = { enable = true; profiles = [ "default" ]; + # The id given as argument is an automatically generated account identifier. + settings = OAuth2Settings; }; }; - "gamil-business" = { + gmail-business = { address = secrets.email.gmail-business.mail; realName = "Lennart J. Kurzweg"; flavor = "gmail.com"; signature = { text = '' - -- + About Me: https://nx2.site/about-me + Contact: https://nx2.site/contact + GPG: https://nx2.site/gpg + ''; + showSignature = "append"; + }; + thunderbird = { + enable = true; + profiles = [ "default" ]; + # The id given as argument is an automatically generated account identifier. + settings = OAuth2Settings; + }; + }; + + hsmw = { + address = secrets.email.hsmw.mail; + userName = secrets.email.hsmw.mail; + realName = "Lennart J. Kurzweg"; + imap = { + port = 993; + host = "xc.hs-mittweida.de"; + }; + smtp = { + port = 465; + host = "xc.hs-mittweida.de"; + }; + signature = { + text = '' + MatNr: ${secrets.email.hsmw.mnr} + SemGr: ${secrets.email.hsmw.semgr} About Me: https://nx2.site/about-me Contact: https://nx2.site/contact GPG: https://nx2.site/gpg @@ -60,34 +129,6 @@ lib.mkIf (host != "NxACE") profiles = [ "default" ]; }; }; - - # "hsmw" = { - # address = secrets.email.hsmw.mail; - # realName = "Lennart J. Kurzweg"; - # imap = { - # port = 993; - # host = "mail.hs-mittweida.de"; - # }; - # smtp = { - # port = 465; - # host = "mail.hs-mittweida.de"; - # }; - # signature = { - # text = '' - # -- - # MatNr: ${secrets.email.hsmw.mnr} - # SemGr: ${secrets.email.hsmw.semgr} - # About Me: https://nx2.site/about-me - # Contact: https://nx2.site/contact - # GPG: https://nx2.site/gpg - # ''; - # showSignature = "append"; - # }; - # thunderbird = { - # enable = true; - # profiles = [ "default" ]; - # }; - # }; }; } diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index 4749372..5947149 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -1,7 +1,8 @@ -{pkgs, secrets, user, inputs, ...}: { +{pkgs, pkgs-unstable, secrets, user, inputs, ...}: { programs.firefox = { enable = true; - package = pkgs.firefox; + package = pkgs-unstable.firefox; + # package = pkgs.firefox; profiles.${user} = { # extensions = with inputs.firefox-addons; [ # ublock-origin diff --git a/home-modules/fish.nix b/home-modules/fish.nix index e59611d..4c13a14 100755 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, system, user, allowed, secrets, ... }: +{ pkgs, lib, rice, user, ... }: lib.mkIf (user != "tv") { home.packages = with pkgs; [ @@ -24,11 +24,11 @@ lib.mkIf (user != "tv") $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-release | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} $(echo -e "$logo" | sed -n 5p): ''${TERM^} - $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ') + $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev) $(echo -e "$logo" | sed -n 8p): ''$(uname -r) - $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1) - $(echo -e "$logo" | sed -n 10p): $(yazi --version) + $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g') + $(echo -e "$logo" | sed -n 10p): $(yazi --version | yazi --version | sed -E 's-(.*?) \(.*-\1-g') $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1) " echo -e "$msg" @@ -79,6 +79,7 @@ lib.mkIf (user != "tv") lzd = "lazydocker"; d = "docker"; dcmp = "docker compose"; + nxsent = ''sent -c \${rice.color.foreground} -b \${rice.color.background}''; code = "codium"; # ya = "yazi"; # function diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 654f4ed..e350537 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -91,23 +91,23 @@ "variableother.member" = foreground; "warning" = red.base; + "markup.heading" = accent.base; "markup.bold" = { - "fg" = foreground; + "fg" = tertiary.bright; "modifiers" = [ "bold" ]; }; - "markup.heading" = foreground; "italic" = { - "fg" = foreground; + "fg" = secondary.bright; "modifiers" = [ "italic" ]; }; - "markup.linktext" = foreground; + "markup.linktext" = accent.base; "markup.linkurl" = { - "fg" = foreground; + "fg" = tertiary.dark; "modifiers" = [ "underlined" ]; }; - "markup.list" = foreground; - "markup.quote" = foreground; - "markup.raw" = foreground; + "markup.list" = accent.bright; + "markup.quote" = weird.bright; + "markup.raw" = special.bright; "markup.strikethrough" = { "modifiers" = [ "crossed_out" ]; }; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index d35ded3..2b5a063 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -49,22 +49,25 @@ let in lib.mkIf (user != "tv") { - home.packages = [ + home.packages = with pkgs; [ # hyprland itself is a system package - pkgs.hyprland-protocols + hyprland-protocols - pkgs-unstable.hyprlock - pkgs-unstable.hypridle + hyprlock + hypridle - pkgs.grim - pkgs.slurp + grim + slurp - ]; + ] ++ (with pkgs-unstable; [ + + ]); wayland.windowManager.hyprland = { enable = true; # package = pkgs-unstable.hyprland; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = pkgs.hyprland; + # package = inputs.hyprland.packages.${pkgs.system}.hyprland; xwayland.enable = true; systemd.enable = true; plugins = [ @@ -261,6 +264,7 @@ lib.mkIf (user != "tv") "opacity ${transparency}, code-oss" "opacity ${transparency}, VSCodium" "opacity ${transparency}, Code" + "opacity ${transparency}, sent" "opacity ${transparency}, neovide" "opacity ${transparency}, obsidian" "opacity ${transparency}, zathura" @@ -287,6 +291,7 @@ lib.mkIf (user != "tv") "float, title:^(wlogout)$" "float, imv" "float, title:^(Page Info — .*)$" + "float, title:^(Compact folders)$" "tile, sent" "fullscreen, wlogout" "workspace 14, lutris" @@ -377,9 +382,9 @@ lib.mkIf (user != "tv") # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace"" "SUPER, T, exec, kitty" "SUPER SHIFT, T, exec, kitty -e sh -c 'ssh nxace'" - "SUPER, Z, swapactiveworkspaces, HDMI-A-1 HDMI-A-2" + # "SUPER, Z, " "SUPER, U, exec, thunderbird " - # "SUPER, I, " + "SUPER, I, exec, kitty -e fish -c 'hx ~/nix-dots/ && fish'" "SUPER, O, exec, obsidian " "SUPER, P, pin " # "SUPER, Ü," @@ -394,13 +399,11 @@ lib.mkIf (user != "tv") "SUPER, S, exec, spotify" "SUPER, D, exec, vesktop" "SUPER, F, fullscreen" - "SUPER, G, exec, xrandr --verbose --output 'DP-1' --primary && lutris" - "SUPER SHIFT, G, exec, /home/nx2/scripts/cursor-lock-toggle.sh" - # "SUPER SHIFT CTRL, G, exec, /home/nx2/scripts/disable-side-monitors.sh" - "SUPER, H, exec, chatterino" - "SUPER, J, focusmonitor, $left" - "SUPER, K, focusmonitor, $main" - "SUPER, L, focusmonitor, $right" + # "SUPER, G," + "SUPER, H, movefocus, l" + "SUPER, J, movefocus, d" + "SUPER, K, movefocus, u" + "SUPER, L, movefocus, r" # "SUPER, Ö," # "SUPER, Ä," # "SUPER, #," @@ -413,9 +416,9 @@ lib.mkIf (user != "tv") "SUPER, Y, submap, scrR" "SUPER, X, exec, pkill wlogout || wlogout --protocol layer-shell -b 3" # "SUPER, C, exec, /home/nx2/scripts/quickconfig/quickconfig.sh " - "SUPER, C, exec, codium," + "SUPER, C, exec, chatterino" "SUPER, V, togglefloating, " - "SUPER, B, exec, bitwarden-desktop" + "SUPER, B, exec, bitwarden" "SUPER, N, togglesplit" # "SUPER, M, exec, /home/nx2/scripts/meme-full-screen/meme-full-screen.sh " # "SUPER, comma, exec, /home/nx2/scripts/change-language.sh" diff --git a/home-modules/mako.nix b/home-modules/mako.nix index f44ebfd..6249999 100755 --- a/home-modules/mako.nix +++ b/home-modules/mako.nix @@ -1,16 +1,20 @@ -{ config, pkgs, rice, lib, user, ... }: +{ pkgs, rice, lib, user, ... }: lib.mkIf (user != "tv") { home.packages = [ pkgs.mako pkgs.libnotify ]; - services.mako = { + services.mako = with rice; { enable = true; - defaultTimeout = 10000; # in ms - backgroundColor = "#${rice.color.background}"; - textColor = "#${rice.color.foreground}"; - borderColor = "#${rice.color.border}"; - font = rice.font.code.name2; + defaultTimeout = 5000; # in ms + backgroundColor = color.background; + textColor = color.foreground; + borderColor = color.border; + borderSize = border-width; + font = font.code.name2; + borderRadius = rounding; + anchor = "bottom-right"; + margin = builtins.toString (gap-size * 2) ; }; } diff --git a/home-modules/programming/c.nix b/home-modules/programming/c.nix new file mode 100644 index 0000000..b14243b --- /dev/null +++ b/home-modules/programming/c.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + home = { + packages = with pkgs; [ + libclang + glibc + # clang-tools + ]; + sessionVariables = { + LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; + C_INCLUDE_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; + }; + }; +} diff --git a/home-modules/programming/gleam.nix b/home-modules/programming/gleam.nix new file mode 100644 index 0000000..8d6ba8f --- /dev/null +++ b/home-modules/programming/gleam.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + gleam + erlang + ]; +} diff --git a/home-modules/sent.nix b/home-modules/sent.nix new file mode 100644 index 0000000..6281105 --- /dev/null +++ b/home-modules/sent.nix @@ -0,0 +1,35 @@ +{ pkgs, rice, user, ... }: +let + my-sent = pkgs.sent.override { + patches = [ + ./sent.patch + # /home/${user}/.local/share/sent.patch + # (builtins.toFile "/home/${user}/ + ]; + }; +in +{ + home = { + packages = [ + # pkgs.sent + my-sent + ]; + file.".local/share/sent.patch".text = '' + diff --git a/config.def.h b/config.def.h + index 60eb376..64e7f05 100644 + --- a/config.def.h + +++ b/config.def.h + @@ -9,8 +9,8 @@ static char *fontfallbacks[] = { + #define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */ + + static const char *colors[] = { + - "#000000", /* foreground color */ + - "#FFFFFF", /* background color */ + + "${rice.color.foreground}", /* foreground color */ + + "${rice.color.background}", /* background color */ + }; + + static const float linespacing = 1.4; + ''; + }; +} diff --git a/home-modules/sent.patch b/home-modules/sent.patch new file mode 100644 index 0000000..daf6939 --- /dev/null +++ b/home-modules/sent.patch @@ -0,0 +1,71 @@ +From 3a348cc15a97df8e8784b129800293dcfba28f3f Mon Sep 17 00:00:00 2001 +From: Sunur Efe Vural +Date: Wed, 13 Feb 2019 14:28:17 -0500 +Subject: [PATCH] Commandline Options + +A simple patch that adds extra commandline options to sent. +--- + sent.1 | 11 +++++++++++ + sent.c | 11 ++++++++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/sent.1 b/sent.1 +index fabc614..5d55bf4 100644 +--- a/sent.1 ++++ b/sent.1 +@@ -5,6 +5,9 @@ + .Nd simple plaintext presentation tool + .Sh SYNOPSIS + .Nm ++.Op Fl f Ar font ++.Op Fl c Ar fgcolor ++.Op Fl b Ar bgcolor + .Op Fl v + .Op Ar file + .Sh DESCRIPTION +@@ -21,6 +24,14 @@ few minutes. + .Bl -tag -width Ds + .It Fl v + Print version information to stdout and exit. ++.It Fl f Ar font ++Defines the ++.Ar font ++when sent is run. ++.It Fl c Ar fgcolor ++Defines the foreground color when sent is run. ++.It Fl b Ar bgcolor ++Defines the background color when sent is run. + .El + .Sh USAGE + .Bl -tag -width Ds +diff --git a/sent.c b/sent.c +index c50a572..0b36e32 100644 +--- a/sent.c ++++ b/sent.c +@@ -675,7 +675,7 @@ configure(XEvent *e) + void + usage() + { +- die("usage: %s [file]", argv0); ++ die("usage: %s [-c fgcolor] [-b bgcolor] [-f font] [file]", argv0); + } + + int +@@ -687,6 +687,15 @@ main(int argc, char *argv[]) + case 'v': + fprintf(stderr, "sent-"VERSION"\n"); + return 0; ++ case 'f': ++ fontfallbacks[0] = EARGF(usage()); ++ break; ++ case 'c': ++ colors[0] = EARGF(usage()); ++ break; ++ case 'b': ++ colors[1] = EARGF(usage()); ++ break; + default: + usage(); + } ARGEND +-- +2.20.1 diff --git a/home.nix b/home.nix index ca66919..0a3d90f 100755 --- a/home.nix +++ b/home.nix @@ -10,6 +10,7 @@ ./home-modules/virt-manager.nix ./home-modules/office.nix ./home-modules/obs.nix + ./home-modules/sent.nix ./home-modules/gestures.nix @@ -48,7 +49,9 @@ ./home-modules/pandoc.nix ./home-modules/programming/python.nix + ./home-modules/programming/c.nix ./home-modules/programming/node.nix + ./home-modules/programming/gleam.nix ./home-modules/color-pallete.nix ]; @@ -60,7 +63,6 @@ permittedInsecurePackages = allowed.inecure-packages; }; home.packages = with pkgs; [ - firefox chromium zathura @@ -88,8 +90,9 @@ gsettings-desktop-schemas wl-clipboard xclip + xournal ] ++ (with pkgs-unstable; [ - # firefox + firefox ]) ++ (if host != "NxACE" then (with pkgs; [ signal-desktop obsidian diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix new file mode 100644 index 0000000..7d32cd4 --- /dev/null +++ b/system-modules/fonts.nix @@ -0,0 +1,20 @@ +{ + pkgs, + # pkgs-unstable, + rice, + ... +}: +{ + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + newcomputermodern + atkinson-hyperlegible + (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + ] ++ (with rice.font; [ + base.package + code.package + # ]) ++ (with pkgs-unstable; [ + ]); +} diff --git a/system-modules/gpg.nix b/system-modules/gpg.nix index 2b0b108..a483e0b 100644 --- a/system-modules/gpg.nix +++ b/system-modules/gpg.nix @@ -3,6 +3,7 @@ environment.systemPackages = with pkgs; [ gnupg ]; + programs.gnupg = { dirmngr.enable = true; agent = {