diff --git a/flake.lock b/flake.lock index b632349..fbcb727 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1719105131, - "narHash": "sha256-2qLJbvQCFbbBCuGb3nP8kVrGHm4prxHkAkfibhqoa1s=", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "ba7885b261b4ced3fb032175d58cfecad43fd63f", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { @@ -162,7 +162,7 @@ "niri", "crate2nix" ], - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": [ "niri", "crate2nix" @@ -183,43 +183,7 @@ "type": "github" } }, - "copilot-mode-src": { - "flake": false, - "locked": { - "lastModified": 1714572852, - "narHash": "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=", - "owner": "zerolfx", - "repo": "copilot.el", - "rev": "733bff26450255e092c10873580e9abfed8a81b8", - "type": "github" - }, - "original": { - "owner": "zerolfx", - "repo": "copilot.el", - "type": "github" - } - }, "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719249093, - "narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=", - "owner": "ipetkov", - "repo": "crane", - "rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "helix", @@ -245,10 +209,10 @@ "cachix": "cachix", "crate2nix_stable": "crate2nix_stable", "devshell": "devshell", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", "nix-test-runner": "nix-test-runner", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -267,7 +231,7 @@ }, "crate2nix_stable": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1702842982, @@ -286,7 +250,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "niri", "crate2nix", @@ -307,27 +271,11 @@ "type": "github" } }, - "doom-emacs": { - "flake": false, - "locked": { - "lastModified": 1719358611, - "narHash": "sha256-sO0qWh3gt2hsEnvKjfojIv4EH9yeEQ4beIQPh20HpPY=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "cc7a509e10785dba94f899a0d428d01e6b8bb078", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "type": "github" - } - }, "emacs": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_3" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1714614481, @@ -343,52 +291,6 @@ "type": "github" } }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1719393085, - "narHash": "sha256-Ft0yuaMlo6aKHltFzfjgKSLiYOAri597YSDXgWvmZOI=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "4ffecf56a5faa4cf163da6da9690752365376e99", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "eww": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1714997157, - "narHash": "sha256-deabn4fdNmJsDxkT6bgCbwB354sUHvkuq+DcdWBU6B8=", - "owner": "elkowar", - "repo": "eww", - "rev": "d1fde927d2799211f791e7ea01cffb667c4f2b60", - "type": "github" - }, - "original": { - "owner": "elkowar", - "repo": "eww", - "type": "github" - } - }, "ez-configs": { "inputs": { "flake-parts": [ @@ -436,22 +338,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1687265871, @@ -467,39 +353,7 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -513,7 +367,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_6": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -550,48 +404,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "niri", @@ -617,24 +429,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1709126324, "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", @@ -649,9 +443,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -667,9 +461,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -685,9 +479,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, @@ -703,9 +497,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -721,9 +515,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -739,7 +533,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -765,431 +559,124 @@ "type": "github" }, "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "fromYaml_2": { - "flake": false, - "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "niri", - "crate2nix", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "46.1", - "repo": "gnome-shell", - "type": "github" - } - }, - "helix": { - "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1719325340, - "narHash": "sha256-dhH2HekIpjU4nWTZvAN6QUvoB2D2eRH+Gkjz92IMSWA=", - "owner": "helix-editor", - "repo": "helix", - "rev": "b05ed9bf8518be662490fa669bf8b51b0c683fe9", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718018037, - "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719385710, - "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718450675, - "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1719350558, - "narHash": "sha256-xZqPfxOvvBWPTfJnxoyUVewVQjQssxETYbxZ+fySFhg=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "e4d09aa3a9de9a9e71c10bf4b6800585b3db9a4c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": [ - "xdg-desktop-portal-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", + "owner": "SenchoPens", + "repo": "fromYaml", "type": "github" } }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, + "fromYaml_2": { + "flake": false, "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprlang", + "owner": "SenchoPens", + "repo": "fromYaml", "type": "github" } }, - "hyprlang_2": { + "gitignore": { "inputs": { - "hyprutils": "hyprutils_2", "nixpkgs": [ - "xdg-desktop-portal-hyprland", + "niri", + "crate2nix", + "pre-commit-hooks", "nixpkgs" - ], - "systems": "systems_9" + ] }, "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprlang", + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, + "gnome-shell": { + "flake": false, "locked": { - "lastModified": 1719316102, - "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprutils", + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", "type": "github" } }, - "hyprutils_2": { + "helix": { "inputs": { + "crane": "crane", + "flake-utils": "flake-utils", "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "hyprlang", "nixpkgs" ], - "systems": [ - "xdg-desktop-portal-hyprland", - "hyprlang", - "systems" - ] + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1717881334, - "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "lastModified": 1719435901, + "narHash": "sha256-ZZ9AZls8Whht0zo72EdMOxDv9U86SEV8bCut7GllBno=", + "owner": "helix-editor", + "repo": "helix", + "rev": "b4811f7d2e117532f7e4b60e8cf1088d283c37f5", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprutils", + "owner": "helix-editor", + "repo": "helix", "type": "github" } }, - "hyprwayland-scanner": { + "home-manager": { "inputs": { "nixpkgs": [ - "hyprland", "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" ] }, "locked": { - "lastModified": 1719067853, - "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "914f083741e694092ee60a39d31f693d0a6dc734", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "owner": "nix-community", + "repo": "home-manager", "type": "github" } }, "kleur": { "inputs": { "base16": "base16", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1717697949, - "narHash": "sha256-0udmIW9tlMXYWP0zmcrW3mk2VbQUbhmlpFHhRE5rtF0=", + "lastModified": 1719418783, + "narHash": "sha256-oN/ZWGmsoUhcWTNODaOzQQAh+AVv12wVo55TnmUk6cc=", "owner": "suyashtnt", "repo": "kleur", - "rev": "3ac2bd47e9ad3f97e26847c6d55a778781286a5d", + "rev": "6be80fab9cfa90273c7528019627cdf0c6fbfe7a", "type": "github" }, "original": { @@ -1198,61 +685,6 @@ "type": "github" } }, - "neovide-src": { - "flake": false, - "locked": { - "lastModified": 1718994216, - "narHash": "sha256-5F9U2sE2CUQGSraWJ5plxvYdH498EQbj9U7DK0chWRU=", - "owner": "neovide", - "repo": "neovide", - "rev": "24fcfc94c30775a6ff08277e76d266d2a1bde62c", - "type": "github" - }, - "original": { - "owner": "neovide", - "repo": "neovide", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1719211247, - "narHash": "sha256-GaEckCf2RaHzoEDj/j07BIV6eyDOT5wCFVSdbbkZ87U=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "820da0e6b6127df9ad05ef3af40d767577e21ba1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1719138008, - "narHash": "sha256-+rM0RjvuW6/vzxdJxEU6KvQEF159NXrgB+irtS044Cc=", - "owner": "neovim", - "repo": "neovim", - "rev": "be999e6a0e5b251b2b37500d06636d4167334c6e", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "niri": { "inputs": { "crate2nix": "crate2nix", @@ -1264,14 +696,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719393655, - "narHash": "sha256-J5eBJBdjFRdehUQCTqzgH/b2+h48fwbdQf5fGBWXY5o=", + "lastModified": 1719588406, + "narHash": "sha256-YFiqhy/x0xVSe2VYu5ZSIb6mqNYzo2Eq2IVJ431/0UM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4f0e0903aa55361f919f22f526c81fc2cf891811", + "rev": "c55023f5a8efcb943f7202590348b1bcb2d84ae2", "type": "github" }, "original": { @@ -1300,11 +732,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1719069675, - "narHash": "sha256-J64s77fxdaMl5qbnmoqAEBXr4ACRA56LGfJo07H5NjQ=", + "lastModified": 1719585864, + "narHash": "sha256-U+Jbll/6bSd9PK6/psiyuWjSy4vnmuO+42PQFcr8efs=", "owner": "YaLTeR", "repo": "niri", - "rev": "ebaf1b06205bbf6bae2697a7b025665d3c244478", + "rev": "bdf9894020f184643ac98fbbc74402689edfe3f4", "type": "github" }, "original": { @@ -1351,11 +783,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719391814, - "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", + "lastModified": 1719552654, + "narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", + "rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f", "type": "github" }, "original": { @@ -1366,16 +798,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1406,7 +838,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs-f2k", "nixpkgs" @@ -1445,22 +877,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1719122173, - "narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "906320ae02f769d13a646eb3605a9821df0d6ea2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1719234068, "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", @@ -1476,7 +892,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1714531828, "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", @@ -1492,7 +908,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1719099622, "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", @@ -1509,22 +925,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1712026416, "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", @@ -1538,7 +938,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1719254875, "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", @@ -1554,7 +954,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1714253743, "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", @@ -1570,22 +970,6 @@ "type": "github" } }, - "nyoom-src": { - "flake": false, - "locked": { - "lastModified": 1699211390, - "narHash": "sha256-XzQB4bZeS2xTCEsUvPNi66901ZSI1k576oEFjTA54nU=", - "owner": "nyoom-engineering", - "repo": "nyoom.nvim", - "rev": "f808500883ffc552b53a421139cc1915955759b7", - "type": "github" - }, - "original": { - "owner": "nyoom-engineering", - "repo": "nyoom.nvim", - "type": "github" - } - }, "parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -1611,8 +995,8 @@ "crate2nix", "flake-compat" ], - "flake-utils": "flake-utils_6", - "gitignore": "gitignore_2", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore", "nixpkgs": [ "niri", "crate2nix", @@ -1641,32 +1025,19 @@ "root": { "inputs": { "ags": "ags", - "copilot-mode-src": "copilot-mode-src", - "crane": "crane", - "doom-emacs": "doom-emacs", - "emacs-overlay": "emacs-overlay", - "eww": "eww", "ez-configs": "ez-configs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "helix": "helix", "home-manager": "home-manager", - "hyprland": "hyprland", "kleur": "kleur", - "neovide-src": "neovide-src", - "neovim-nightly-overlay": "neovim-nightly-overlay", "niri": "niri", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-f2k": "nixpkgs-f2k", - "nyoom-src": "nyoom-src", - "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix", - "spotify-player-src": "spotify-player-src", "stylix": "stylix", - "typst-mode-src": "typst-mode-src", - "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland", "zotero-nix": "zotero-nix" } }, @@ -1712,32 +1083,12 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719368303, - "narHash": "sha256-vhkKOUs9eOZgcPrA6wMw7a7J48pEjVuhzQfitVwVv1g=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "32415b22fd3b454e4a1385af64aa5cef9766ff4c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1719268571, @@ -1753,22 +1104,6 @@ "type": "github" } }, - "spotify-player-src": { - "flake": false, - "locked": { - "lastModified": 1719153475, - "narHash": "sha256-ni4JSTW0tRxBXjoVU+vO96Pw03oU+7Q52QXhuDncn1w=", - "owner": "aome510", - "repo": "spotify-player", - "rev": "bcba2e6cfa4ac989e003345b40c5809498805837", - "type": "github" - }, - "original": { - "owner": "aome510", - "repo": "spotify-player", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16_2", @@ -1778,7 +1113,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1788,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1719235398, - "narHash": "sha256-yccyHeuMUdbG/89Yi1ZSqx0XlpIKb0WQI+mAnTf/GJw=", + "lastModified": 1719525570, + "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "owner": "danth", "repo": "stylix", - "rev": "7cdbd128172d7c4ec63f5073d49da5d0e7d6396c", + "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "type": "github" }, "original": { @@ -1816,22 +1151,7 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_11": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1846,7 +1166,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1861,21 +1181,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1936,55 +1241,9 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "typst-mode-src": { - "flake": false, - "locked": { - "lastModified": 1695602386, - "narHash": "sha256-mqkcNDgx7lc6kUSFFwSATRT+UcOglkeu+orKLiU9Ldg=", - "owner": "Ziqi-Yang", - "repo": "typst-mode.el", - "rev": "5776fd4f3608350ff6a2b61b118d38165d342aa3", - "type": "github" - }, - "original": { - "owner": "Ziqi-Yang", - "repo": "typst-mode.el", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_11" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -1999,59 +1258,6 @@ "type": "indirect" } }, - "xdg-desktop-portal-hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_10" - }, - "locked": { - "lastModified": 1718619174, - "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718619174, - "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zotero-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 830ce56..0b9fc65 100644 --- a/flake.nix +++ b/flake.nix @@ -20,30 +20,30 @@ }; ags = { - url = "github:Aylur/ags"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:Aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; }; - copilot-mode-src = { - url = "github:zerolfx/copilot.el"; - flake = false; - }; + # copilot-mode-src = { + # url = "github:zerolfx/copilot.el"; + # flake = false; + # }; - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # crane = { + # url = "github:ipetkov/crane"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; - emacs-overlay = { - url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # emacs-overlay = { + # url = "github:nix-community/emacs-overlay"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; - eww = { - url = "github:elkowar/eww"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - }; + # eww = { + # url = "github:elkowar/eww"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.rust-overlay.follows = "rust-overlay"; + # }; ez-configs = { url = "github:ehllie/ez-configs"; @@ -59,27 +59,27 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # hyprland = { + # url = "github:hyprwm/Hyprland"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; kleur = { url = "github:suyashtnt/kleur"; inputs.nixpkgs.follows = "nixpkgs"; }; - neovide-src = { - url = "github:neovide/neovide"; - flake = false; - }; + # neovide-src = { + # url = "github:neovide/neovide"; + # flake = false; + # }; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + # neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - doom-emacs = { - url = "github:doomemacs/doomemacs"; - flake = false; - }; + # doom-emacs = { + # url = "github:doomemacs/doomemacs"; + # flake = false; + # }; niri = { url = "github:sodiboo/niri-flake"; @@ -102,25 +102,20 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nyoom-src = { - url = "github:nyoom-engineering/nyoom.nvim"; - flake = false; - }; - - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # rust-overlay = { + # url = "github:oxalica/rust-overlay"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - spotify-player-src = { - url = "github:aome510/spotify-player"; - flake = false; - }; + # spotify-player-src = { + # url = "github:aome510/spotify-player"; + # flake = false; + # }; stylix = { url = "github:danth/stylix"; @@ -128,15 +123,15 @@ inputs.home-manager.follows = "home-manager"; }; - typst-mode-src = { - url = "github:Ziqi-Yang/typst-mode.el"; - flake = false; - }; + # typst-mode-src = { + # url = "github:Ziqi-Yang/typst-mode.el"; + # flake = false; + # }; - xdg-desktop-portal-hyprland = { - url = "github:hyprwm/xdg-desktop-portal-hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # xdg-desktop-portal-hyprland = { + # url = "github:hyprwm/xdg-desktop-portal-hyprland"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; zotero-nix = { url = "github:camillemndn/zotero-nix"; diff --git a/systems/modules/core/nix.nix b/systems/modules/core/nix.nix index 635fa2a..5c97f60 100644 --- a/systems/modules/core/nix.nix +++ b/systems/modules/core/nix.nix @@ -15,18 +15,12 @@ nixpkgs.overlays = [ inputs.nixpkgs-f2k.overlays.terminal-emulators - inputs.xdg-desktop-portal-hyprland.overlays.default - inputs.neovim-nightly-overlay.overlays.default - inputs.rust-overlay.overlays.default - inputs.emacs-overlay.overlays.default - inputs.eww.overlays.default inputs.helix.overlays.default (final: super: rec { makeModulesClosure = x: super.makeModulesClosure (x // {allowMissing = true;}); - craneLib = inputs.crane.lib.${pkgs.system}; - inherit (packages.${pkgs.system}) fennel-ls firefox-pwa; + inherit (packages.${pkgs.system}) firefox-pwa; }) ]; diff --git a/systems/modules/hyprland.nix b/systems/modules/hyprland.nix index 5e80000..030aa68 100644 --- a/systems/modules/hyprland.nix +++ b/systems/modules/hyprland.nix @@ -1,3 +1,6 @@ {...}: { + nixpkgs.overlays = [ + inputs.xdg-desktop-portal-hyprland.overlays.default + ]; programs.hyprland.enable = true; } diff --git a/systems/modules/ld.nix b/systems/modules/ld.nix index 95a37c2..f6efd60 100644 --- a/systems/modules/ld.nix +++ b/systems/modules/ld.nix @@ -1,5 +1,5 @@ # taken from https://github.com/Mic92/dotfiles/blob/main/nixos/modules/nix-ld.nix -{pkgs, ...}: { +{pkgs, config, ...}: { # Enable nix ld programs.nix-ld.enable = true; diff --git a/users/modules/ags/config/powermode/right.js b/users/modules/ags/config/powermode/right.js index 6affa37..caa7d3e 100644 --- a/users/modules/ags/config/powermode/right.js +++ b/users/modules/ags/config/powermode/right.js @@ -6,19 +6,14 @@ import { GLib, Label, Mpris, - Revealer, - Scrollable, Slider, toCSS, Utils, - Variable, Vte, Widget, - Window, - disp + Window } from "../imports.js"; import { SetupRevealer } from "./index.js"; -import { ShowPowerMode } from "./variables.js"; /** @typedef {import("../types/service/mpris.js").MprisPlayer | null} MprisPlayer */ /** @typedef {import("../types/service.js").Binding} PlayerSignal */