diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9ca7cb0..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2025 atagen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/common/terminal.nix b/common/terminal.nix index f4401ca..b15b6b0 100644 --- a/common/terminal.nix +++ b/common/terminal.nix @@ -25,8 +25,6 @@ in "gl" = "git pull"; "ga" = "git add"; "gcam" = "git commit -am"; - "gcl" = "git clone"; - "gcd" = "git clone --depth 1"; }; shellAliases = { "l" = "eza -lg --icons=always --colour=always $argv | culr"; diff --git a/flake.lock b/flake.lock index 2eac3a8..fc5440d 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1752904518, - "narHash": "sha256-ZlkXcU2VcMc/Za2EyGEOcaixehlWSrGqDJwXSLE5CCo=", + "lastModified": 1752250807, + "narHash": "sha256-zXZNU7xsPDcAEfvWwhyU1LD35egz1zfpEyDwcPuBKnQ=", "owner": "linyinfeng", "repo": "angrr", - "rev": "ab5d8b56bf41910fb808e491f2f340c84132a5f1", + "rev": "f72481311f614f2a56eed3400b8fb923fd0011da", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "arbys": { "locked": { - "lastModified": 1753316914, - "narHash": "sha256-HVT2JNM8op5hfDBSrIarL9GaKxQjkeQr2gf7CB6hQqk=", + "lastModified": 1753022411, + "narHash": "sha256-m4pEYNwUZh64FyRIM1TSmRn1n4A85WEzVu5Gk2VHvAY=", "ref": "refs/heads/meats", - "rev": "ef34e2314b84b732618274c1940423ae19ebdf5e", - "revCount": 3, + "rev": "e7fa12d6f3f5b723bce413acdfa5461fbaa3ec97", + "revCount": 1, "type": "git", "url": "https://git.atagen.co/atagen/arbys" }, @@ -55,11 +55,11 @@ }, "crane": { "locked": { - "lastModified": 1752859226, - "narHash": "sha256-Vk9qUd0pCkyJZiSDRxJBEDkxEr8CNcwBtuFuZr/HYNc=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "126943a6f7b7c6535c0348fe3ba472c3b19f0e20", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753376980, - "narHash": "sha256-h7Say1U7r1ke3mfg3yvbzYnk3izmJ2g1zXzX5APNA8Q=", + "lastModified": 1752015948, + "narHash": "sha256-PRtz78Je1kD9PiVaJD8qeIEjWWmfaqJ77Z92e9g4TA8=", "owner": "helix-editor", "repo": "helix", - "rev": "4281228da35b02b0dcca3b4772b93d48d79ce046", + "rev": "16d06643a4444ee297058e608c1de1a5bd8db083", "type": "github" }, "original": { @@ -307,11 +307,11 @@ "smfh": "smfh" }, "locked": { - "lastModified": 1752303056, - "narHash": "sha256-LzojKFWAAreWyH56aupj/MLwuPPnnyzplw/xdbavC9c=", + "lastModified": 1751728847, + "narHash": "sha256-KU2NiDsR067mCOrkR/29fX7E4PmjfmXIETTicx3CfwA=", "owner": "feel-co", "repo": "hjem", - "rev": "3093a74542b30f8155954d585d0ae2401e3adbe5", + "rev": "a1a2680af8038c4b85c6078e44fc3e422c81e04b", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1753387274, - "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", + "lastModified": 1751990210, + "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", + "rev": "218da00bfa73f2a61682417efe74549416c16ba6", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1753282444, - "narHash": "sha256-QGeWgozKiGBTJrLYnXd9xwOY9HKsm4cFHsU8fopGVnU=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62975b8e23c4e39599b3303f6e76faa280a02c63", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1753257349, - "narHash": "sha256-Zb4528e94DwdUC0rKIX1+EFtkoelggWQakZ/YKemqJ4=", + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e89a3203fbb3a833d7b7777efc13697b6a962cfd", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753372565, - "narHash": "sha256-C6hTlYrguEZzc02JDAsht0i/wxAxgqvv2MGhJrHzNbw=", - "rev": "e88a85bd928afe02adaaea254eecde44d59c769d", + "lastModified": 1751931138, + "narHash": "sha256-Q0pIV16Vx9PZQRVXc1GS/IcKYlmcVMdkSGPdBsiLyKU=", + "rev": "fc3261c3405b122c8c2e5bdc3da6c4fb7ffa80a9", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e88a85bd928afe02adaaea254eecde44d59c769d.tar.gz?rev=e88a85bd928afe02adaaea254eecde44d59c769d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fc3261c3405b122c8c2e5bdc3da6c4fb7ffa80a9.tar.gz?rev=fc3261c3405b122c8c2e5bdc3da6c4fb7ffa80a9" }, "original": { "type": "tarball", @@ -518,11 +518,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1752799399, - "narHash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=", + "lastModified": 1751341694, + "narHash": "sha256-zXag1+8iZC3H5yVFP7KhIi4ps9z8xKrFIkyaeXlZ7Uo=", "owner": "oxalica", "repo": "nil", - "rev": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f", + "rev": "b043bfe1f3f4c4be4b688e24c5ae96e81f525805", "type": "github" }, "original": { @@ -541,11 +541,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753374784, - "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", + "lastModified": 1752057206, + "narHash": "sha256-f8fNAag3K3WAq+lJr2EEu2f3xVSFLPddLgJKZRzXa3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", + "rev": "90c2edcf32d0fcb511fee9a0b8c580a18178c109", "type": "github" }, "original": { @@ -635,11 +635,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1750791124, + "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "type": "github" }, "original": { @@ -692,11 +692,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -760,11 +760,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -821,11 +821,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { @@ -917,11 +917,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -964,11 +964,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -980,11 +980,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -996,11 +996,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "lastModified": 1751949589, + "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "rev": "9b008d60392981ad674e04016d25619281550a9d", "type": "github" }, "original": { @@ -1108,11 +1108,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -1131,11 +1131,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1753363396, - "narHash": "sha256-orjQhGQK2Q41pDk0wltZW+FT0a5zufxSqsT95A8lwYI=", + "lastModified": 1751984126, + "narHash": "sha256-PrNg+sypyNMU0dHLbfVFQx58NEnS59DUIu0SZSq3DSk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a37600ce98428a6c364a08c62be3333840e50041", + "rev": "8feb220c99c94c4957d37253eff6100cc33d7e8a", "type": "github" }, "original": { @@ -1152,11 +1152,11 @@ ] }, "locked": { - "lastModified": 1753402503, - "narHash": "sha256-cc1seYNwhhk9f74NpJSFRmQFjDzXInq66/dSVs2eK4Y=", + "lastModified": 1752007746, + "narHash": "sha256-iFgYM6lYfEJrCHaqvXjr+tbrUQHxptXomi+nMKe7SJk=", "ref": "refs/heads/master", - "rev": "4dad44757085a42423f758bf0177cebcd07b4a4a", - "revCount": 656, + "rev": "3d594e16dd3850973336c70014a948dc97837d39", + "revCount": 608, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1753238793, - "narHash": "sha256-jmQeEpgX+++MEgrcikcwoSiI7vDZWLP0gci7XiWb9uQ=", + "lastModified": 1751856221, + "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0ad7ab4ca8e83febf147197e65c006dff60623ab", + "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", "type": "github" }, "original": { @@ -1428,11 +1428,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1752338000, - "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", + "lastModified": 1751228685, + "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ba78881a68182ce338041846164cbfed0d70935c", + "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", "type": "github" }, "original": { diff --git a/graphical/binds.nix b/graphical/binds.nix index eec57ca..ed72e78 100644 --- a/graphical/binds.nix +++ b/graphical/binds.nix @@ -68,8 +68,8 @@ in ]; "Mod+F".action.spawn = "firefox"; "Mod+E".action.spawn = "nautilus"; - "Mod+Return".action.spawn = "ghostty"; - "Mod+Shift+E".action.spawn = "wlogout"; + "Mod+Return".action.spawn = "kitty"; + "Mod+Shift+E".action.spawn = "wleave"; "Mod+Equal".action.spawn = "bitwarden"; "Mod+Shift+Q".action = actions.close-window; "Mod+Shift+S".action = actions.screenshot; diff --git a/graphical/chat.nix b/graphical/chat.nix index 8df8a77..60663ca 100644 --- a/graphical/chat.nix +++ b/graphical/chat.nix @@ -14,8 +14,5 @@ icon = ../assets/fb_msg.png; }; }; - hm.home.packages = [ - pkgs.cinny-desktop - pkgs.zoom-us - ]; + hm.home.packages = [ pkgs.cinny-desktop ]; } diff --git a/graphical/logout.nix b/graphical/logout.nix index 2078b70..9d82548 100644 --- a/graphical/logout.nix +++ b/graphical/logout.nix @@ -6,12 +6,11 @@ let inherit (config) rice; pal = rice.palette.hex; - pkg = pkgs.wlogout; in { hm.programs.wlogout = { enable = true; - package = pkg; + package = pkgs.wleave; layout = builtins.fromJSON (builtins.readFile ./logout/layout); style = with pal; @@ -26,8 +25,8 @@ in "#WINLOGO" ] [ - "${pkg}/share/wlogout" - "${pkg}/etc/wlogout" + "${pkgs.wlogout}/share/wlogout" + "${pkgs.wlogout}/etc/wlogout" util.bg bright.yellow util.bg @@ -42,5 +41,5 @@ in ); }; - hm.home.packages = [ pkg ]; + hm.home.packages = [ pkgs.wleave ]; } diff --git a/graphical/network.nix b/graphical/network.nix index a81f6eb..20d18de 100644 --- a/graphical/network.nix +++ b/graphical/network.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { networking.networkmanager.enable = true; systemd.services.NetworkManager-wait-online.enable = true; @@ -12,9 +12,4 @@ dnssec = "false"; }; services.mullvad-vpn.enable = true; - - environment.systemPackages = [ pkgs.ciscoPacketTracer8 ]; - nixpkgs.config.permittedInsecurePackages = [ - "libxml2-2.13.8" - ]; } diff --git a/graphical/rice.nix b/graphical/rice.nix index 1ab0d63..d5ddaba 100644 --- a/graphical/rice.nix +++ b/graphical/rice.nix @@ -30,7 +30,7 @@ }; monospace = { name = "Fira Code"; - size = 11; + size = 10; package = pkgs.fira-code; }; emoji = { diff --git a/graphical/shell/quickshell/assets/wallpaper.jpg b/graphical/rice/wallpaper.jpg similarity index 100% rename from graphical/shell/quickshell/assets/wallpaper.jpg rename to graphical/rice/wallpaper.jpg diff --git a/graphical/shell.nix b/graphical/shell.nix index ea7b186..86bc217 100644 --- a/graphical/shell.nix +++ b/graphical/shell.nix @@ -41,6 +41,7 @@ in hm.quickServices = { "swaync" = "${getExe pkgs.swaynotificationcenter}"; + "swaybg" = "${getExe pkgs.swaybg} -m fill -i ${rice.bg.src}"; "swayidle" = let niri = inputs.niri.packages.${pkgs.system}.niri-unstable; diff --git a/graphical/shell/quickshell/shell.qml b/graphical/shell/quickshell/shell.qml index 43fb44e..a577dac 100644 --- a/graphical/shell/quickshell/shell.qml +++ b/graphical/shell/quickshell/shell.qml @@ -11,30 +11,6 @@ import QtQuick import QtQuick.Controls ShellRoot { - - // bg - Variants { - model: Quickshell.screens.filter(s => s.name == "DP-2") - delegate: PanelWindow { - id: bg - anchors { - top: true - bottom: true - left: true - right: true - } - exclusionMode: ExclusionMode.Ignore - WlrLayershell.layer: WlrLayer.Bottom - - Image { - asynchronous: true - width: 2560 - height: 1440 - source: "assets/wallpaper.jpg" - } - } - } - // rhs main Variants { model: Quickshell.screens.filter(s => s.name == "DP-2") diff --git a/graphical/terminal.nix b/graphical/terminal.nix index 86603f6..272ecb8 100644 --- a/graphical/terminal.nix +++ b/graphical/terminal.nix @@ -1,92 +1,41 @@ { config, ... }: { - # hm.programs.kitty = - # let - # inherit (config) rice; - # in - # { - # enable = true; - # font = { - # inherit (rice.fonts.monospace) name size; - # }; - # settings = with rice.palette.hex; { - # foreground = util.fg; - # background = util.bg; - # inherit (util) cursor; - # cursor_text = util.bg; - # selection_foreground = util.fg_sel; - # selection_background = util.bg_sel; - # color0 = normal.black; - # color1 = normal.red; - # color2 = normal.green; - # color3 = normal.yellow; - # color4 = normal.blue; - # color5 = normal.magenta; - # color6 = normal.cyan; - # color7 = normal.white; - # color8 = bright.black; - # color9 = bright.red; - # color10 = bright.green; - # color11 = bright.yellow; - # color12 = bright.blue; - # color13 = bright.magenta; - # color14 = bright.cyan; - # color15 = bright.white; - # sync_to_monitor = "yes"; - # shell = "fish"; - # cursor_trail = 100; - # }; - # }; - - hm.programs.ghostty = + hm.programs.kitty = let inherit (config) rice; in { enable = true; - installBatSyntax = true; - enableFishIntegration = true; - clearDefaultKeybinds = false; - - themes.rice = - let - inherit (rice.palette.shortHex) util; - inherit (rice.palette.hex) normal bright; - in - { - foreground = util.fg; - background = util.bg; - cursor-color = util.cursor; - palette = [ - "0=${normal.black}" - "1=${normal.red}" - "2=${normal.green}" - "3=${normal.yellow}" - "4=${normal.blue}" - "5=${normal.magenta}" - "6=${normal.cyan}" - "7=${normal.white}" - "8=${bright.black}" - "9=${bright.red}" - "10=${bright.green}" - "11=${bright.yellow}" - "12=${bright.blue}" - "13=${bright.magenta}" - "14=${bright.cyan}" - "15=${bright.white}" - ]; - selection-foreground = util.fg_sel; - selection-background = util.bg_sel; - }; - settings = { - theme = "rice"; - font-size = rice.fonts.monospace.size; - font-family = rice.fonts.monospace.name; - window-decoration = "server"; - gtk-titlebar = false; - gtk-single-instance = true; - linux-cgroup = "always"; - gtk-wide-tabs = false; + font = { + inherit (rice.fonts.monospace) name size; + }; + settings = with rice.palette.hex; { + foreground = util.fg; + background = util.bg; + inherit (util) cursor; + cursor_text = util.bg; + selection_foreground = util.fg_sel; + selection_background = util.bg_sel; + color0 = normal.black; + color1 = normal.red; + color2 = normal.green; + color3 = normal.yellow; + color4 = normal.blue; + color5 = normal.magenta; + color6 = normal.cyan; + color7 = normal.white; + color8 = bright.black; + color9 = bright.red; + color10 = bright.green; + color11 = bright.yellow; + color12 = bright.blue; + color13 = bright.magenta; + color14 = bright.cyan; + color15 = bright.white; + sync_to_monitor = "yes"; + shell = "fish"; + cursor_trail = 100; }; }; + } diff --git a/graphical/wm.nix b/graphical/wm.nix index 7f85d14..8a29c04 100644 --- a/graphical/wm.nix +++ b/graphical/wm.nix @@ -1,6 +1,5 @@ { pkgs, - lib, mainUser, inputs, config, @@ -63,10 +62,6 @@ in clip-to-geometry = true; } ]; - xwayland-satellite = { - enable = true; - path = lib.getExe inputs.niri.packages.${pkgs.system}.xwayland-satellite-unstable; - }; }; services.greetd = {