From 3b0491af533fe2b4e7ef7c6f896601cc1d6125b2 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 9 May 2025 17:09:06 +0530 Subject: [PATCH] feat: Added stuff --- flake.lock | 114 ++++++++++++++++++------------------ home/apps/bottles.nix | 9 +++ home/apps/default.nix | 2 + home/apps/hyprpicker.nix | 9 +++ home/linux/hyprland.nix | 24 +++++++- home/programs/nushell.nix | 2 +- neovim/default.nix | 36 ++++++++---- nixos/ryu/configuration.nix | 7 ++- 8 files changed, 130 insertions(+), 73 deletions(-) create mode 100644 home/apps/bottles.nix create mode 100644 home/apps/hyprpicker.nix diff --git a/flake.lock b/flake.lock index 255df08f..d000af17 100644 --- a/flake.lock +++ b/flake.lock @@ -361,11 +361,11 @@ "csshacks": { "flake": false, "locked": { - "lastModified": 1746006200, - "narHash": "sha256-VFzix2atMyPX4HPNKDa9FaF1k1/1a2PqOJVeXRVRBxo=", + "lastModified": 1746293254, + "narHash": "sha256-Rcu2WI5t5iv5dJEZ1hQ9S8/R+3Yv+fNkETLny6+BfZM=", "owner": "MrOtherGuy", "repo": "firefox-csshacks", - "rev": "7f4f4511badf6fc8b66c77ddda3244bf4363147b", + "rev": "c880ab119af62969cee51bf9043d354b90c015a1", "type": "github" }, "original": { @@ -991,11 +991,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1746118269, - "narHash": "sha256-nWCxF4Fl53yaJzxlHVDkDZNrWGsrYk9f5ondtMa+S04=", + "lastModified": 1746541180, + "narHash": "sha256-kMengGR7N2P/j2vJ08jUr033QFtz9uVizRzh42GU+nQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "e79bf71f2322fa5d54af07f2985f8460290f2085", + "rev": "3c405a591ae895280e5e617bd267fdfa8d3bfdce", "type": "github" }, "original": { @@ -1087,11 +1087,11 @@ ] }, "locked": { - "lastModified": 1746134275, - "narHash": "sha256-sxfY7TIP59o2hcueanoRAtg833PiNroZkQDwlKJxGvs=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "015f1913109d44c36e683b55f0e47e283b383caa", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1746136631, - "narHash": "sha256-qoSe6zrvBRCR6LmsBluH5e3eqZldSD6AcvwjWVIP5xg=", + "lastModified": 1746536008, + "narHash": "sha256-JCelAgqaJu8z5ESjxri7ogT/h3NhJWi1U7A1WEVLsKc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5b3e489108d8512fb5dfacf07b2aa3a71208e0f0", + "rev": "708a7c24ef2c137c04c2473ee6b3f841ed5a1d8b", "type": "github" }, "original": { @@ -1381,11 +1381,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1745997160, - "narHash": "sha256-gTFloyC0x68Uy4qLfGwZSu0YYR4ZeB/7YiBwoglkVOw=", + "lastModified": 1746481532, + "narHash": "sha256-45Tsu6N3STdGnOicgm5ZBfnTHH8WlsUSseKPn3VXMCs=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "0e3e7206bc248d154dbafb6f7acd7d6d3ad2ff93", + "rev": "fae1c4f6fe38f04ad1f3965713b9cafb139464da", "type": "github" }, "original": { @@ -1504,11 +1504,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1746090904, - "narHash": "sha256-1vn+YKs3QpgXWjIazJD9LR/Ghc/WdiyczWnZzERPz0U=", + "lastModified": 1746467255, + "narHash": "sha256-+MCeM4Wirro07AIaE0tTR1fGOhKdWUeZzb3drrjNxWc=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "5c2f290fb1a5cecb6c2e283b4bae5c080c2b77d3", + "rev": "95669fcf38300b38413c28436bcb1b57bda03d28", "type": "github" }, "original": { @@ -1704,11 +1704,11 @@ ] }, "locked": { - "lastModified": 1745816321, - "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=", + "lastModified": 1746254942, + "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01", + "rev": "760a11c87009155afa0140d55c40e7c336d62d7a", "type": "github" }, "original": { @@ -1806,11 +1806,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1746054057, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -1855,11 +1855,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1746138958, - "narHash": "sha256-ovilvaDqJM8CAWBOTGtVRbffG5ugUJGzAxZRYIpiPsQ=", + "lastModified": 1746547120, + "narHash": "sha256-P7kqNIPzk85zMfbIscSGc2eCCV0qsl7HjkJHZyLCq6Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c907b9be1d5012b1e7ee9a88a6ab9f91fcc9f161", + "rev": "9bbe2d2d387ca0cd46855589a09b0074fd2126cd", "type": "github" }, "original": { @@ -1887,11 +1887,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { @@ -1935,11 +1935,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -1951,11 +1951,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -1999,11 +1999,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -2022,11 +2022,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746101723, - "narHash": "sha256-loxT2bAglD3w8XDx+7huMXQHbg07yHHHCNiCiVWneqI=", + "lastModified": 1746536883, + "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", "owner": "nix-community", "repo": "nixvim", - "rev": "c91753bbe57781e08226829b9e354facd50caf1b", + "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", "type": "github" }, "original": { @@ -2047,11 +2047,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1746094739, - "narHash": "sha256-FqF0rvaXSq5/20LioNw3/ktjA1ZHCMBwEfV1LmHba90=", + "lastModified": 1746462192, + "narHash": "sha256-PpsMXrMU1hoOv7AOAjgynI5uE5gsYMkMRDR+VKX74xg=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "933be680b47c2b0aaef295035bbfc518ba7f54b0", + "rev": "4c1d47a52169aed0a35b35123365f8a5b432f94e", "type": "github" }, "original": { @@ -2108,11 +2108,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746136874, - "narHash": "sha256-PbXEgJIc+i4UwKnar2ASVkajJMp4GRrUriuGR73o4lA=", + "lastModified": 1746546700, + "narHash": "sha256-GAPavcg/ZQPtxbkDeP0hHEDuCbywqGayUatXOXqG2w0=", "owner": "nix-community", "repo": "nur", - "rev": "b8891689f8d692520497954d2fe3cc5e88e316a6", + "rev": "42dc4e4ac1a52de9001a32ef9497da0e571ac3af", "type": "github" }, "original": { @@ -2469,11 +2469,11 @@ ] }, "locked": { - "lastModified": 1746067100, - "narHash": "sha256-6JeEbboDvRjLwB9kzCnmWj+f+ZnMtKOe5c2F1VBpaTs=", + "lastModified": 1746498961, + "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "026e8fedefd6b167d92ed04b195c658d95ffc7a5", + "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", "type": "github" }, "original": { @@ -2531,11 +2531,11 @@ ] }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -3012,11 +3012,11 @@ "rust-overlay": "rust-overlay_9" }, "locked": { - "lastModified": 1746511194, - "narHash": "sha256-1Bo2FUIBIqWsRL384lNDOA3C0iAEHLcjTFwPNowt2qs=", + "lastModified": 1746544539, + "narHash": "sha256-OrpgTB+V0kXSlftaOtuecDtVAACTcTQsLuOzpbnwqWc=", "owner": "uttarayan21", "repo": "zeronsd", - "rev": "02b00d1ae243f0c5eeec6c120f9c0ee4c5c02754", + "rev": "4c018a50e9f353a1cbf64275bcf817b999eb0d68", "type": "github" }, "original": { diff --git a/home/apps/bottles.nix b/home/apps/bottles.nix new file mode 100644 index 00000000..ff0c775c --- /dev/null +++ b/home/apps/bottles.nix @@ -0,0 +1,9 @@ +{ + pkgs, + device, + ... +}: { + home.packages = [ + pkgs.bottles + ]; +} diff --git a/home/apps/default.nix b/home/apps/default.nix index 73f7ef6f..3d71a5ae 100644 --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -24,5 +24,7 @@ lib.optionalAttrs device.hasGui { ./thunderbird.nix ./neovide.nix ./openscad.nix + ./bottles.nix + ./hyprpicker.nix ]; } diff --git a/home/apps/hyprpicker.nix b/home/apps/hyprpicker.nix new file mode 100644 index 00000000..21a6d344 --- /dev/null +++ b/home/apps/hyprpicker.nix @@ -0,0 +1,9 @@ +{ + pkgs, + device, + ... +}: { + home.packages = [ + pkgs.hyprpicker + ]; +} diff --git a/home/linux/hyprland.nix b/home/linux/hyprland.nix index 03556e6c..50815c3c 100644 --- a/home/linux/hyprland.nix +++ b/home/linux/hyprland.nix @@ -7,6 +7,25 @@ ../../modules/hyprpaper.nix ]; + services.hyprpolkitagent.enable = true; + services.hypridle = { + enable = true; + settings = { + general = { + after_sleep_cmd = "hyprctl dispatch dpms on"; + }; + listener = [ + { + timeout = 900; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; + }; + }; + services.hyprsunset = { + enable = true; + }; programs.hyprpaper = let wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;}; in { @@ -26,12 +45,13 @@ }; wayland.windowManager.hyprland = { enable = device.hasGui && pkgs.stdenv.isLinux; + systemd.enable = false; settings = { source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; "render:explicit_sync" = true; monitor = [ - "${device.monitors.primary}, 2560x1440@360, 0x0, 1, transform, 0, cm, hdredid" + "${device.monitors.primary}, 2560x1440@360, 0x0, 1, transform, 0, cm, hdr" "${device.monitors.secondary}, 2560x1440@170, -1440x-1120, 1, transform, 1" "${device.monitors.tertiary}, 2560x1440@170, 2560x-1120, 1, transform, 3" ]; @@ -137,7 +157,7 @@ ]; exec-once = [ # "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1" - "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1" + # "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1" # "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" # "${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg" "${pkgs.ironbar}/bin/ironbar" diff --git a/home/programs/nushell.nix b/home/programs/nushell.nix index 80aa7354..9dbc5c20 100644 --- a/home/programs/nushell.nix +++ b/home/programs/nushell.nix @@ -14,7 +14,7 @@ plugins = with pkgs.nushellPlugins; [ formats polars - highlight + # highlight ]; extraConfig = '' ${pkgs.pfetch-rs}/bin/pfetch diff --git a/neovim/default.nix b/neovim/default.nix index 9defa0ba..eba88bea 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -168,6 +168,20 @@ in { }; }; codecompanion.enable = true; + copilot-lua = { + enable = true; + settings = { + panel = { + enabled = true; + }; + suggestion = { + enabled = true; + keymap = { + accept = ""; + }; + }; + }; + }; yazi = { enable = true; @@ -564,16 +578,16 @@ in { end end - require("copilot").setup({ - suggestion = { - enabled = true, - auto_trigger = true, - keymap = { - accept = "", - } - }, - panel = { enabled = true }, - }) + -- require("copilot").setup({ + -- suggestion = { + -- enabled = true, + -- auto_trigger = true, + -- keymap = { + -- accept = "", + -- } + -- }, + -- panel = { enabled = true }, + -- }) catcher(require('crates').setup) catcher(require('outline').setup) @@ -710,7 +724,7 @@ in { ''; extraPlugins = with pkgs.vimPlugins; [ FTerm-nvim - copilot-lua + # copilot-lua crates-nvim # d2 image-nvim diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index 87911a66..f7a03371 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -29,8 +29,11 @@ adb.enable = true; alvr.enable = true; alvr.openFirewall = true; - hyprland.enable = true; - hyprland.xwayland.enable = true; + hyprland = { + enable = true; + withUWSM = true; + xwayland.enable = true; + }; yubikey-touch-detector.enable = true; steam = { enable = true;