diff --git a/flake.lock b/flake.lock index 1ee6a83..fb3aa09 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1694057476, - "narHash": "sha256-x3DpM4FCAjONAJboEjMDf9Q2diXwV/I/+Qny8HAy1u0=", + "lastModified": 1694574651, + "narHash": "sha256-D+pBiAEMsCRO9WP8Jn5oPsisr+ftFz7fgZOaix6MYUM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e91d53d2fa6595fb241187971a7c344420ea1d32", + "rev": "844afe34cbe49d83e7ae016564db4f72237a0bfa", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1693972774, - "narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=", + "lastModified": 1694585439, + "narHash": "sha256-70BlfEsdURx5f8sioj8JuM+R4/SZFyE8UYrULMknxlI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c", + "rev": "a0ddf43b6268f1717afcda54133dea30435eb178", "type": "github" }, "original": { @@ -236,11 +236,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1694074808, - "narHash": "sha256-gFHAGWaGh5ZM144wPSYJ6EXam3xmyS2wLwjLhjd7OKU=", + "lastModified": 1694703353, + "narHash": "sha256-4zE6asZoWo7V0HRUNDDE+kX/RT/ofkvK/NXq/rwqCr8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0be6b03ee972fcc4921984f3b68469a2ee121511", + "rev": "f8008e4b3beb4aae2365973879a46fe0f15c79b4", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1694079736, - "narHash": "sha256-rg1LXnVyF7XiO/KrEadWgUZsH06iZHcMAFdBvZnaiUw=", + "lastModified": 1694678361, + "narHash": "sha256-EtSbY3HgfXrmxAMph/QPy6evnzf3Tgowu7UiImQn6Yk=", "owner": "outfoxxed", "repo": "hy3", - "rev": "1376a4f3d02fc17987c18dea1814a7aa90bf92c3", + "rev": "b935aafa32a0e99d40d99a8f561edaff2733cc38", "type": "github" }, "original": { @@ -314,6 +314,21 @@ "type": "github" } }, + "impermanence": { + "locked": { + "lastModified": 1690797372, + "narHash": "sha256-GImz19e33SeVcIvBB7NnhbJSbTpFFmNtWLh7Z85Y188=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "e3a7acd113903269a1b5c8b527e84ce7ee859851", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "type": "github" + } + }, "impurity": { "locked": { "lastModified": 1689836741, @@ -341,11 +356,11 @@ ] }, "locked": { - "lastModified": 1693950209, - "narHash": "sha256-bj2ymclcQdsBwcgrF7Rlte+rr+K9amGNdvzGyWVtHJg=", + "lastModified": 1694465674, + "narHash": "sha256-kexYxU1OKIyzHctRLmYuetSrR3lbbwJp9Qp3rdaMoUo=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "4e67b73a83be038914407210a19ce5a38da23e99", + "rev": "71ea185a65e8a05509edee63ab862f3761116c8c", "type": "github" }, "original": { @@ -381,11 +396,11 @@ ] }, "locked": { - "lastModified": 1694054794, - "narHash": "sha256-hbQTuZ81n5daWxp8Hfb+3x4JkkrJ+erT0DXOqmDnBGk=", + "lastModified": 1694192131, + "narHash": "sha256-nt5ypVXKh65lQFqKqWgytEzI841yUhpl6E291Briu+g=", "owner": "nixpak", "repo": "nixpak", - "rev": "119af38d3d56a86d6f20dbf54f59352decc773f0", + "rev": "16bd2860238c53bb7a31f745693d7d3c33a1490c", "type": "github" }, "original": { @@ -410,11 +425,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1693953029, - "narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=", + "lastModified": 1694426803, + "narHash": "sha256-osusXQo0zkEqs502SNMffsKp1O9evpDM54A37MuyT2Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4077a0e4ac3356222bc1f0a070af7939c3098535", + "rev": "9a74ffb2ca1fc91c6ccc48bd3f8cbc1501bf7b8a", "type": "github" }, "original": { @@ -442,11 +457,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { @@ -457,11 +487,11 @@ }, "nur": { "locked": { - "lastModified": 1694078736, - "narHash": "sha256-f0u8g8SOx3i0Gy6gcleEvCpO6LefK0PVUtJUXai3Fw4=", + "lastModified": 1694589145, + "narHash": "sha256-zmmWfCQvs3cltM3a18GV39ur0fanjknNJCI8zlAiby8=", "owner": "nix-community", "repo": "NUR", - "rev": "2fc4b5686f999a7f44389a9ae0939843dce0d5de", + "rev": "f939facb676b8552d11db25a70dd89d48cd8409f", "type": "github" }, "original": { @@ -484,7 +514,8 @@ "nixpkgs": "nixpkgs_3", "nur": "nur", "rust-overlay": "rust-overlay_2", - "stable": "stable" + "stable": "stable", + "vps-testing": "vps-testing" } }, "rust-overlay": { @@ -524,11 +555,11 @@ ] }, "locked": { - "lastModified": 1694052649, - "narHash": "sha256-+eBEU3dw3/fCfi8ZHFNutINxehMazGkQxqNcpeNbTo4=", + "lastModified": 1694571081, + "narHash": "sha256-VRA+gxhe4aciWTQ5uCKVY2ubOclk18h2aRlLzPbLqMw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a795148ffbcc77f2b592d50ceebe36147e623a77", + "rev": "0282ed291f0e25f30770df5d3f1ca33908ce44a4", "type": "github" }, "original": { @@ -539,11 +570,11 @@ }, "stable": { "locked": { - "lastModified": 1693953029, - "narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=", + "lastModified": 1694499547, + "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4077a0e4ac3356222bc1f0a070af7939c3098535", + "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", "type": "github" }, "original": { @@ -597,22 +628,38 @@ "type": "github" } }, + "vps-testing": { + "inputs": { + "impermanence": "impermanence", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1694424958, + "narHash": "sha256-Kj340FuJ9Rw694a/uJ/ZCDMLp5aviEmGosoVnRPvOSE=", + "path": "/home/admin/vpsnew", + "type": "path" + }, + "original": { + "path": "/home/admin/vpsnew", + "type": "path" + } + }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1692976565, - "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", + "lastModified": 1694302348, + "narHash": "sha256-S9NOc88L/1jpNKJqBu2Hihvn0V1HHCK2hXE4bNBAStg=", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", "type": "gitlab" } }, @@ -632,11 +679,11 @@ ] }, "locked": { - "lastModified": 1694025408, - "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", + "lastModified": 1694363988, + "narHash": "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "022469529c8bc95acf222dc5a62389b04c8b1205", + "rev": "aca51609d4c415b30e88b96c6f49f0142cbcdae7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 99d015e..c7ce064 100755 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,11 @@ impurity.url = "github:outfoxxed/impurity.nix"; + nixpak = { + url = "github:nixpak/nixpak"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + emacs-overlay = { url = "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -46,6 +51,8 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; + + vps-testing.url = "path:/home/admin/vpsnew"; }; outputs = inputs @ { self, nixpkgs, ... }: { @@ -61,6 +68,7 @@ ./modules/system.nix ./modules/hyprland ./systems/msi + (inputs.vps-testing.nixosConfigurations.localHostModule) ]; }; diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index a2be32d..f0f0428 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -137,6 +137,8 @@ bind = ,XF86AudioStop, exec, playerctl -a stop bind = ,XF86AudioNext, exec, playerctl next bind = ,XF86AudioPrev, exec, playerctl previous +bind = $mod+SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy + bind = $mod, h, hy3:movefocus, l bind = $mod, j, hy3:movefocus, d bind = $mod, k, hy3:movefocus, u