diff --git a/flake.lock b/flake.lock index 0ee1428..1b808a6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,44 @@ { "nodes": { + "ags": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1699817941, + "narHash": "sha256-Yos4QFOaUOdjUu21Aira7RhllLkSiE1u2yNn/PcyBqI=", + "owner": "Aylur", + "repo": "ags", + "rev": "54fd9cf50c428bc8760ef20f05f6daffcb821896", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, + "anyrun": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696926085, + "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=", + "owner": "Kirottu", + "repo": "anyrun", + "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216", + "type": "github" + }, + "original": { + "owner": "Kirottu", + "repo": "anyrun", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -76,6 +115,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "anyrun", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -93,7 +153,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -111,6 +171,24 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -176,11 +254,11 @@ ] }, "locked": { - "lastModified": 1699748018, - "narHash": "sha256-28rwXnxgscLkeII6wj44cuP6RuiynhzZSa424ZwGt/s=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "50e582b9f91e409ffd2e134017445d376659b32e", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -192,17 +270,17 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1699726486, - "narHash": "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4=", + "lastModified": 1699991507, + "narHash": "sha256-cX9QJkulEtvwgCgpOV3gCFrb7AT8yRr03nXenPIIVeI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9afdd61adeaf413afbe853dbc5fdf6853c8bde21", + "rev": "e8469f8b1bb184a08351ee3cc3fcc4d0638eb90b", "type": "github" }, "original": { @@ -211,6 +289,26 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1699829380, + "narHash": "sha256-KSLTqvOIzv12IDJHPBKsrKd4eWOEKQBLEQr15PATMjE=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "9ad145a1021ea48beec65f234137d23e05c30918", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -246,11 +344,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1699376527, - "narHash": "sha256-ODtyJTPFPKrkXLdsgsD/mWDO6Eajw3pSMJKDnmtZ8+k=", + "lastModified": 1699903489, + "narHash": "sha256-j/qZoN22170Kc0I2I4xcJXtDgBdiUECZmxjF71LrY/8=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "0d9e4545aa827a204d6fad17f52d14dff2d40231", + "rev": "422edb315298b3e408b8d38ba3a73c5dca960869", "type": "github" }, "original": { @@ -262,11 +360,11 @@ "libnbtplusplus": { "flake": false, "locked": { - "lastModified": 1690036783, - "narHash": "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=", + "lastModified": 1699286814, + "narHash": "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=", "owner": "PrismLauncher", "repo": "libnbtplusplus", - "rev": "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f", + "rev": "23b955121b8217c1c348a9ed2483167a6f3ff4ad", "type": "github" }, "original": { @@ -277,7 +375,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1698420672, @@ -295,7 +393,7 @@ }, "nh": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" @@ -345,6 +443,25 @@ "type": "github" } }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1700010845, + "narHash": "sha256-Zpd6vdDBsL8phO9QlIPX/h01v2LCOPlsrJQreOSenoQ=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "92d6637940bf86746a4f5efa7b86e1d94090b351", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -367,11 +484,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { @@ -417,13 +534,31 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-lib_3": { "locked": { - "lastModified": 1699110214, - "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=", + "dir": "lib", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1699756042, + "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "type": "github" }, "original": { @@ -434,6 +569,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1698553279, "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", @@ -447,13 +598,29 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1699781429, + "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "type": "github" }, "original": { @@ -463,13 +630,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { - "lastModified": 1699094435, - "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { @@ -497,11 +664,11 @@ ] }, "locked": { - "lastModified": 1698852633, - "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=", + "lastModified": 1699271226, + "narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0", + "rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", "type": "github" }, "original": { @@ -513,18 +680,18 @@ "prismlauncher": { "inputs": { "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "libnbtplusplus": "libnbtplusplus", "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1699724093, - "narHash": "sha256-oB8kJ2ExM+WCPUMsM3DIDg25ZHop2G01AZJsY6DwkuI=", + "lastModified": 1699860753, + "narHash": "sha256-bCZYkt7VyOfF0yRPjQhM6BT2DYWKMzkJDYHDSHHdDS4=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "e7b2dbdd003c2da55bb3e45b42bd9d6b158d9338", + "rev": "a3445cbbdd023c7948468edcddd540dd7f7dfd68", "type": "github" }, "original": { @@ -535,13 +702,17 @@ }, "root": { "inputs": { + "ags": "ags", + "anyrun": "anyrun", "deploy-rs": "deploy-rs", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "ironbar": "ironbar", "nh": "nh", + "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "prismlauncher": "prismlauncher", "sops-nix": "sops-nix" } @@ -576,11 +747,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699311858, - "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", + "lastModified": 1699951338, + "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "664187539871f63857bda2d498f452792457b998", + "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 610f701..c5e5aaf 100755 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,12 @@ }; hyprland.url = "github:hyprwm/Hyprland"; prismlauncher.url = "github:PrismLauncher/PrismLauncher"; + ags.url = "github:Aylur/ags"; + nix-gaming.url = "github:fufexan/nix-gaming"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -31,6 +37,10 @@ url = "github:viperML/nh"; inputs.nixpkgs.follows = "nixpkgs"; }; + anyrun = { + url = "github:Kirottu/anyrun"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {nixpkgs, ...} @ inputs: let system = "x86_64-linux"; @@ -45,6 +55,7 @@ sops alejandra yaml-language-server + lua-language-server ]; }; formatter.${system} = pkgs.alejandra; diff --git a/home/anyrun/default.nix b/home/anyrun/default.nix new file mode 100644 index 0000000..81a0e31 --- /dev/null +++ b/home/anyrun/default.nix @@ -0,0 +1,58 @@ +{ + inputs, + pkgs, + lib, + ... +}: let + compileSCSS = name: source: "${pkgs.runCommandLocal name {} '' + mkdir -p $out + ${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css + ''}/${name}.css"; +in { + programs.anyrun = { + enable = true; + config = { + plugins = with inputs.anyrun.packages.${pkgs.system}; [ + applications + dictionary + websearch + ]; + width = {fraction = 0.3;}; + hideIcons = false; + ignoreExclusiveZones = false; + layer = "overlay"; + hidePluginInfo = false; + closeOnClick = false; + showResultsImmediately = false; + }; + extraCss = builtins.readFile (compileSCSS "style" ./style.scss); + extraConfigFiles = { + "dictionary.ron".text = '' + Config( + prefix: ":def", + ) + ''; + "applications.ron".text = '' + Config( + desktop_actions: true, + max_entries: 10, + ) + ''; + "websearch.ron".text = '' + Config( + prefix: "?", + engines: [ + Custom( + name: "SearXNG", + url: "100.121.201.47:8100/search?q={}", + ), + Custom( + name: "nix packages", + url: "search.nixos.org/packages?query={}&channel=unstable", + ), + ], + ) + ''; + }; + }; +} diff --git a/home/anyrun/style.scss b/home/anyrun/style.scss new file mode 100644 index 0000000..e69de29 diff --git a/home/gtk/default.nix b/home/gtk/default.nix index 1662804..795396b 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -14,12 +14,8 @@ package = pkgs.jost; }; theme = { - name = "Catppuccin-Mocha-Standard-Pink-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = ["pink"]; - size = "standard"; - variant = "mocha"; - }; + name = "Tokyonight-Dark-BL"; + package = pkgs.tokyo-night-gtk; }; }; } diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix index 1f51c03..0543bec 100644 --- a/home/wayland/hyprland/config.nix +++ b/home/wayland/hyprland/config.nix @@ -19,7 +19,7 @@ _: { gaps_in = 10 gaps_out = 20 border_size = 4 - col.active_border = rgb(f5c2e7) + col.active_border = rgb(f7768e) rgb(2ac3de) col.inactive_border = rgb(6c7086) layout = dwindle @@ -48,12 +48,17 @@ _: { enabled = yes bezier = fastBezier, 0.05, 1.1, 0.2, 1.0 + bezier = linear, 0.0, 0.0, 1.0, 1.0 + bezier = liner, 1, 1, 1, 1 animation = windows, 1, 7, fastBezier, slide animation = windowsOut, 1, 7, fastBezier, slide animation = border, 1, 10, fastBezier animation = fade, 1, 7, fastBezier animation = workspaces, 1, 6, fastBezier + animation = border, 1, 1, liner + animation = borderangle, 1, 40, liner, loop + animation = borderangle, 1, 100, linear, loop } dwindle { @@ -73,6 +78,10 @@ _: { sensitivity = -0.5 } + misc { + disable_hyprland_logo = true + } + exec-once = swww init exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP @@ -91,6 +100,7 @@ _: { windowrulev2 = float, title:^(RuneLite)$ windowrulev2 = move 850 360, title:^(RuneLite)$ windowrulev2 = size 830 600, title:^(RuneLite)$ + windowrulev2 = fullscreen, title:^(cs2)$ #binds $mainMod = SUPER @@ -98,7 +108,7 @@ _: { bind = $mainMod, Return, exec, wezterm bind = $mainMod, Q, killactive, bind = $mainMod, V, togglefloating, - bind = $mainMod, R, exec, rofi -modi run -show drun + bind = $mainMod, R, exec, anyrun bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle bind =, Print, exec, grim -g "$(slurp)" - | swappy -f - diff --git a/home/wayland/river/wallpapers/sk1yekt9ps3b1.jpg b/home/wayland/river/wallpapers/sk1yekt9ps3b1.jpg deleted file mode 100644 index 6ead35b..0000000 Binary files a/home/wayland/river/wallpapers/sk1yekt9ps3b1.jpg and /dev/null differ diff --git a/home/wayland/river/waybar/default.nix b/home/wayland/river/waybar/default.nix deleted file mode 100644 index 03762ad..0000000 --- a/home/wayland/river/waybar/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - pkgs, - lib, - ... -}: let - compileSCSS = name: source: "${pkgs.runCommandLocal name {} '' - mkdir -p $out - ${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css - ''}/${name}.css"; -in { - programs.waybar = { - enable = true; - systemd.enable = true; - settings = { - bar = { - layer = "top"; - position = "top"; - height = 30; - modules-left = ["river/tags"]; - modules-center = ["river/window"]; - modules-right = ["cpu" "memory" "clock" "battery" "tray"]; - }; - "river/tags" = { - num-tags = 5; - tag-labels = ["" "" "" "" ""]; - }; - "river/window" = { - format = "{}"; - }; - "cpu" = { - interval = 10; - format = "{}%"; - max-length = 10; - tooltip = false; - }; - "memory" = { - interval = 10; - format = "{}%"; - max-length = 10; - tooltip = false; - }; - "battery" = { - format = "{capacity}%"; - interval = 60; - tooltip = false; - }; - "clock" = { - interval = 60; - format = "{:%H:%M}"; - max-length = 25; - tooltip = false; - }; - "tray" = { - icon-size = 21; - spacing = 5; - }; - }; - style = builtins.readFile (compileSCSS "style" ./style.scss); - }; -} diff --git a/home/wayland/river/waybar/style.scss b/home/wayland/river/waybar/style.scss deleted file mode 100644 index f8fdaf4..0000000 --- a/home/wayland/river/waybar/style.scss +++ /dev/null @@ -1,68 +0,0 @@ - -$rosewater: #f5e0dc; -$flamingo: #f2cdcd; -$pink: #f5c2e7; -$mauve: #cba6f7; -$red: #f38ba8; -$maroon: #eba0ac; -$peach: #fab387; -$yellow: #f9e2af; -$green: #a6e3a1; -$teal: #94e2d5; -$sky: #89dceb; -$sapphire: #74c7ec; -$blue: #89b4fa; -$lavender: #b4befe; - -$text: #cdd6f4; -$subtext1: #bac2de; -$subtext0: #a6adc8; -$overlay2: #9399b2; -$overlay1: #7f849c; -$overlay0: #6c7086; - -$surface2: #585b70; -$surface1: #45475a; -$surface0: #313244; - -$base: #1e1e2e; -$mantle: #181825; -$crust: #11111b; - -@mixin module-spacing { - padding: 0 0.5rem 0 0.5rem; -} - -* { - all: unset; - font-family: JetBrainsMono Nerd Font; - font-size: 13px; - color: $text; -} - -window#waybar { - background-color: $base; -} - -#tags { - button { - padding: 0.5rem; - } - button.focused { - border-radius: 3px; - border: 1px solid; - border-color: $red; - } - button.urgent { - border-radius: 3px; - background-color: $red; - } -} - -#cpu, -#memory, -#clock, -#battery, -#tray { - @include module-spacing; -} \ No newline at end of file diff --git a/home/wezterm/config.lua b/home/wezterm/config.lua new file mode 100644 index 0000000..d9ca0bd --- /dev/null +++ b/home/wezterm/config.lua @@ -0,0 +1,19 @@ +local wezterm = require 'wezterm' + +return { + front_end = "WebGpu", + webgpu_preferred_adapter = { + backend = "Vulkan", + device_type = "DiscreteGpu", + name = "NVIDIA GeForce GTX 1070 Ti" + }, + enable_wayland = false, + font = wezterm.font 'Monaspace Krypton', + font_size = 12.0, + window_background_opacity = 0.6, + text_background_opacity = 1.0, + enable_tab_bar = false, + color_scheme = 'tokyonight', + + window_padding = { top = 0, bottom = 0, left = 0, right = 0 } +} diff --git a/home/wezterm/default.nix b/home/wezterm/default.nix index e976593..e0a8a78 100644 --- a/home/wezterm/default.nix +++ b/home/wezterm/default.nix @@ -1,31 +1,6 @@ _: { programs.wezterm = { enable = true; - extraConfig = '' - local wezterm = require 'wezterm' - - return { - front_end = "WebGpu", - webgpu_preferred_adapter = { - backend="Vulkan", - device_type="DiscreteGpu", - name="NVIDIA GeForce GTX 1070 Ti" - }, - enable_wayland = false, - font = wezterm.font 'Comic Code Ligatures', - font_size = 12.0, - window_background_opacity = 0.6, - text_background_opacity = 1.0, - enable_tab_bar = false, - color_scheme = 'Catppuccin Mocha', - - window_padding = { - top = 0, - bottom = 0, - left = 0, - right = 0, - } - } - ''; + extraConfig = builtins.readFile ./config.lua; }; } diff --git a/home/zathura/default.nix b/home/zathura/default.nix index 7f0a882..1898678 100644 --- a/home/zathura/default.nix +++ b/home/zathura/default.nix @@ -2,44 +2,35 @@ _: { programs.zathura = { enable = true; extraConfig = '' - set default-fg "#CDD6F4" - set default-bg "#1E1E2E" - - set completion-bg "#313244" - set completion-fg "#CDD6F4" - set completion-highlight-bg "#575268" - set completion-highlight-fg "#CDD6F4" - set completion-group-bg "#313244" - set completion-group-fg "#89B4FA" - - set statusbar-fg "#CDD6F4" - set statusbar-bg "#313244" - - set notification-bg "#313244" - set notification-fg "#CDD6F4" - set notification-error-bg "#313244" - set notification-error-fg "#F38BA8" - set notification-warning-bg "#313244" - set notification-warning-fg "#FAE3B0" - - set inputbar-fg "#CDD6F4" - set inputbar-bg "#313244" - - set recolor-lightcolor "#1E1E2E" - set recolor-darkcolor "#CDD6F4" - - set index-fg "#CDD6F4" - set index-bg "#1E1E2E" - set index-active-fg "#CDD6F4" - set index-active-bg "#313244" - - set render-loading-bg "#1E1E2E" - set render-loading-fg "#CDD6F4" - - set highlight-color "#575268" - set highlight-fg "#F5C2E7" - set highlight-active-color "#F5C2E7" - + set notification-error-bg "#f7768e" + set notification-error-fg "#c0caf5" + set notification-warning-bg "#e0af68" + set notification-warning-fg "#414868" + set notification-bg "#1a1b26" + set notification-fg "#c0caf5" + set completion-bg "#1a1b26" + set completion-fg "#a9b1d6" + set completion-group-bg "#1a1b26" + set completion-group-fg "#a9b1d6" + set completion-highlight-bg "#414868" + set completion-highlight-fg "#c0caf5" + set index-bg "#1a1b26" + set index-fg "#c0caf5" + set index-active-bg "#414868" + set index-active-fg "#c0caf5" + set inputbar-bg "#1a1b26" + set inputbar-fg "#c0caf5" + set statusbar-bg "#1a1b26" + set statusbar-fg "#c0caf5" + set highlight-color "#e0af68" + set highlight-active-color "#9ece6a" + set default-bg "#1a1b26" + set default-fg "#c0caf5" + set render-loading true + set render-loading-fg "#1a1b26" + set render-loading-bg "#c0caf5" + set recolor-lightcolor "#1a1b26" + set recolor-darkcolor "#c0caf5" ''; }; } diff --git a/hosts/arashi/default.nix b/hosts/arashi/default.nix index 079c367..9f124d4 100644 --- a/hosts/arashi/default.nix +++ b/hosts/arashi/default.nix @@ -3,6 +3,7 @@ ./hardware-configuration.nix ./services ../../modules + ../../modules/prometheus/exporters/postgres.nix ]; boot.loader = { diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 44f4120..1057add 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -1,9 +1,12 @@ { + inputs, config, pkgs, ... }: { imports = [ + inputs.nix-gaming.nixosModules.steamCompat + inputs.nix-gaming.nixosModules.pipewireLowLatency ./hardware-configuration.nix ./services ../../home/wayland/hyprland/wayland.nix @@ -52,17 +55,6 @@ }; }; - environment.etc = { - "pipewire/pipewire.conf.d/92-low-latency.conf".text = '' - context.properties = { - default.clock.rate = 48000 - default.clock.quantum = 1024 - default.clock.min-quantum = 16 - default.clock.max-quantum = 2048 - } - ''; - }; - services.pcscd.enable = true; services.davfs2.enable = true; @@ -75,10 +67,18 @@ alsa.support32Bit = true; pulse.enable = true; wireplumber.enable = true; + lowLatency = { + enable = true; + quantum = 64; + rate = 48000; + }; }; programs.steam = { enable = true; + extraCompatPackages = [ + inputs.nix-gaming.packages.${pkgs.system}.proton-ge + ]; }; security.polkit.enable = true; @@ -92,7 +92,7 @@ nvidia = { powerManagement.enable = true; modesetting.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.production; }; opengl = { enable = true; diff --git a/hosts/tsuki/home.nix b/hosts/tsuki/home.nix index 43d06d5..fa127d0 100755 --- a/hosts/tsuki/home.nix +++ b/hosts/tsuki/home.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { imports = [ ../../home ../../home/wezterm @@ -44,9 +48,9 @@ gamemode mangohud bottles - osu-lazer-bin runelite prismlauncher + inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin (libsForQt5.callPackage ../../pkgs/chatterino7 {}) (callPackage ../../pkgs/jellyfin-rpc {}) ]; diff --git a/modules/fonts.nix b/modules/fonts.nix index afdf3f7..ca37026 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -4,6 +4,7 @@ fontDir.enable = true; packages = with pkgs; [ corefonts + monaspace jost jetbrains-mono nerdfonts diff --git a/modules/nix.nix b/modules/nix.nix index c4dade6..395111e 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -29,12 +29,16 @@ "https://cache.nixos.org" "https://jakestanger.cachix.org" "https://cache.garnix.io" + "https://nix-gaming.cachix.org" + "https://anyrun.cachix.org" ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" ]; }; };