Compare commits

..

No commits in common. "7a71af71e7241bf598d2eabbe3d0250ea90c86dc" and "27f3ea6a9af3d682388ca35dba584c25addad286" have entirely different histories.

5 changed files with 181 additions and 125 deletions

View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968822, "lastModified": 1728902391,
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,12 +50,18 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1727974419, "lastModified": 1709610799,
"narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "rev": "81c393c776d5379c030607866afef6406ca1be57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,15 +93,16 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1731229046, "lastModified": 1729390258,
"narHash": "sha256-YhI4SCUrc/Kp2BZolTvPk/KToSlnVXmXBd026HW9lvA=", "narHash": "sha256-z4Hg8k6iXIV55lA8HUntfJBdBzxOuG8M4ftWoJhrVqU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "95821bb1f52bac1f268a77898cc863ebdf3249b8", "rev": "89860b1c343648e8d71b6820e9311b98353ff14e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,11 +240,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1727826117,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,7 +273,25 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -307,18 +332,18 @@
"helix": { "helix": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1730790589, "lastModified": 1729331287,
"narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=", "narHash": "sha256-CiQsoNEOGHkSfG/0JJMegHfwXUAI0PwAIVj3i3FmGao=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e", "rev": "be2884d80061493ab1999d73ffa51dfb4f59639d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +360,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731235328, "lastModified": 1729321331,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10", "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,11 +380,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730743354, "lastModified": 1729224425,
"narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=", "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2", "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,15 +434,15 @@
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2", "systems": "systems_3",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1731172465, "lastModified": 1729378105,
"narHash": "sha256-2O4cE+H3Q6AOiyY+qVXhXKjHBjdld+CUuGAd9rXJFRk=", "narHash": "sha256-rDOABbycdmMH57XyN/9xEDuKIpnsw5vjSrJJWgVQvKI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a8ff3a452c1c445d24bdd9e7e4fcd66c8ef2a147", "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,11 +517,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731163338, "lastModified": 1728941256,
"narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "60d3dece30f98e8ad85131829c8529950630d6bc", "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,6 +555,26 @@
"type": "github" "type": "github"
} }
}, },
"iceshrimp": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1718289195,
"narHash": "sha256-xmkExjsTztXW4/AYb3d3Er6Wwg4r7AVwq7rv9E93+Ec=",
"ref": "refs/heads/dev",
"rev": "746c6319d3425ccfacc906535c67951e161996d9",
"revCount": 47,
"type": "git",
"url": "https://iceshrimp.dev/iceshrimp/packaging"
},
"original": {
"type": "git",
"url": "https://iceshrimp.dev/iceshrimp/packaging"
}
},
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
@ -564,11 +609,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1731223294, "lastModified": 1729334880,
"narHash": "sha256-zAvxDcdDWVtwC8i1Gmpu+q0EmEejs01tHrY22AwGbH0=", "narHash": "sha256-HUdIqrv4/s0bohHYtCHl44bJwyL1TMN1kzk+93oSAm8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "9e29ac7eb7eee84506ff9c991c07d43283aa0b44", "rev": "28881a002ab986bd107c06cdc4b5df98bad29f7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +642,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731221223, "lastModified": 1729330424,
"narHash": "sha256-E9lhNv83Z4R+c2H+ymLgybHZ+KylU0QHzO7sh5IHD/E=", "narHash": "sha256-fEev4uBYKTdFACj3zGmMniNV8IbzfoJ+LqZz2eWQWcw=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "010a2368823bc3959c1468609cd05367e5b6d0b6", "rev": "10f04fd19de3bc2951d42411c237c8b963e6c816",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -652,11 +697,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731209121, "lastModified": 1729394935,
"narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,17 +714,17 @@
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1729872799, "lastModified": 1728596811,
"narHash": "sha256-kauH6OSVVff38AIIAG2Oc+I0FF5+PfZY+j1eoB0ip20=", "narHash": "sha256-Eeq8s0uYxtI1Hoe6NQR4h9slj46pzCaztmo5nd/7Klo=",
"ref": "refs/heads/trunk", "ref": "refs/heads/trunk",
"rev": "bf3c2aa7721045176f8383dfba4fa691dd120476", "rev": "120c37cc9e475cea218f1173901e3bbba3a4e157",
"revCount": 124, "revCount": 123,
"type": "git", "type": "git",
"url": "https://git.envs.net/binarycat/nix-inst" "url": "https://git.envs.net/binarycat/nix-inst"
}, },
@ -697,11 +742,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1730517716, "lastModified": 1714856183,
"narHash": "sha256-hq3jlW5lyT2RkWhJ2/Oo+dt9FXtJ47zDDBBk8A8abMo=", "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=",
"owner": "vlinkz", "owner": "vlinkz",
"repo": "nix-software-center", "repo": "nix-software-center",
"rev": "216eb549f1ec222c2877d2194f2987527954f2c4", "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -738,11 +783,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1730919458, "lastModified": 1729333370,
"narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -753,11 +798,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1729256560,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -802,23 +847,23 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1730504152, "lastModified": 1727825735,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
} }
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1731242223, "lastModified": 1729403505,
"narHash": "sha256-ASCKkiPc9lJ9AcIL+dcLzgQzGyUvdtRiIkSWh1EEhLs=", "narHash": "sha256-1ILT9fxCbNQuToPWBhxC3N+hblIWW3WlEHnwcdoCBHE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8213a8a557f80086dac25ae2c613794ce9f0b4eb", "rev": "88d3f02d308cb29a07942d24539f960721a20fe0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -830,11 +875,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1730963269, "lastModified": 1729181673,
"narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -846,11 +891,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1720386169,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -862,11 +907,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1730963269, "lastModified": 1729181673,
"narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -878,11 +923,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1729256560,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -894,11 +939,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1729256560,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -919,11 +964,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1730814269, "lastModified": 1728778939,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2", "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -941,6 +986,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hypr-contrib": "hypr-contrib", "hypr-contrib": "hypr-contrib",
"hyprland": "hyprland", "hyprland": "hyprland",
"iceshrimp": "iceshrimp",
"mailserver": "mailserver", "mailserver": "mailserver",
"niri": "niri", "niri": "niri",
"nix-but-gigachad": "nix-but-gigachad", "nix-but-gigachad": "nix-but-gigachad",
@ -975,17 +1021,21 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [
"helix",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1728268235, "lastModified": 1709604635,
"narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1010,21 +1060,6 @@
} }
}, },
"systems_2": { "systems_2": {
"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_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1039,6 +1074,21 @@
"type": "github" "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": { "systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1054,9 +1104,24 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1689068808,
@ -1100,11 +1165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730743262, "lastModified": 1728166987,
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1116,16 +1181,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730166465, "lastModified": 1718165778,
"narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.5", "ref": "v0.4",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -1133,11 +1198,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731123454, "lastModified": 1729139001,
"narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", "narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", "rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -57,10 +57,10 @@
niri = { niri = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
}; };
#iceshrimp = { iceshrimp = {
# url = "git+https://iceshrimp.dev/iceshrimp/packaging"; url = "git+https://iceshrimp.dev/iceshrimp/packaging";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
#}; };
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: { outputs = { self, nixpkgs, home-manager, ... }@inputs: {

View file

@ -119,7 +119,6 @@ in {
"wheel" "wheel"
"libvirtd" "libvirtd"
"dialout" "dialout"
"input"
]; ];
packages = with pkgs; [ packages = with pkgs; [
# wezterm # wezterm
@ -165,7 +164,7 @@ in {
# wget # wget
gnomeExtensions.pop-shell gnomeExtensions.pop-shell
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
gnomeExtensions.rounded-window-corners-reborn gnomeExtensions.rounded-window-corners
# gnomeExtensions.prime-indicator # gnomeExtensions.prime-indicator
gnomeExtensions.clipboard-indicator gnomeExtensions.clipboard-indicator
gnomeExtensions.gsconnect gnomeExtensions.gsconnect

View file

@ -48,7 +48,6 @@
(keymap-global-set "M-s M-b" #'consult-buffer) (keymap-global-set "M-s M-b" #'consult-buffer)
(keymap-global-set "M-s M-m" #'consult-man) (keymap-global-set "M-s M-m" #'consult-man)
(setq-default cursor-type 'bar)
(setq corfu-cycle t) (setq corfu-cycle t)
(setq corfu-auto t) (setq corfu-auto t)
@ -144,20 +143,16 @@
(require 'doom-themes) (require 'doom-themes)
(load-theme 'doom-tokyo-night) (load-theme 'doom-tokyo-night)
(use-package kakoune (use-package kakoune
; :bind (("C-;" . ryo-modal-mode) :bind (("C-;" . ryo-modal-mode)
; ("C-z" . ryo-modal-mode) ("C-z" . ryo-modal-mode)
; ("<escape>" . ryo-modal-mode))
:bind (("C-z" . ryo-modal-mode)
("<escape>" . ryo-modal-mode)) ("<escape>" . ryo-modal-mode))
:hook (after-init . my/kakoune-setup) :hook (after-init . my/kakoune-setup)
:init (require 'bind-key)
:config :config
(defun ryo-enter () "Enter normal mode" (interactive) (ryo-modal-mode 1)) (defun ryo-enter () "Enter normal mode" (interactive) (ryo-modal-mode 1))
(defun my/kakoune-setup () (defun my/kakoune-setup ()
"Call kakoune-setup-keybinds then add some personal config." "Call kakoune-setup-keybinds then add some personal config."
(kakoune-setup-keybinds) (kakoune-setup-keybinds)
(setq ryo-modal-cursor-type 'box) (setq ryo-modal-cursor-type 'line)
(setq ryo-modal-cursor-color "#dadeff")
(add-hook 'prog-mode-hook #'ryo-enter) (add-hook 'prog-mode-hook #'ryo-enter)
(define-key ryo-modal-mode-map (kbd "SPC h") 'help-command) (define-key ryo-modal-mode-map (kbd "SPC h") 'help-command)
;; Access all C-x bindings easily ;; Access all C-x bindings easily
@ -172,7 +167,6 @@
("M-m" mc/edit-lines) ("M-m" mc/edit-lines)
("*" mc/mark-all-like-this) ("*" mc/mark-all-like-this)
("v" er/expand-region) ("v" er/expand-region)
("/" phi-search)
("C-v" set-rectangular-region-anchor) ("C-v" set-rectangular-region-anchor)
("M-s" mc/split-region) ("M-s" mc/split-region)
(";" (("q" delete-window) (";" (("q" delete-window)
@ -195,7 +189,6 @@
;; Emacs incremental search doesn't work with multiple cursors, but this fixes that ;; Emacs incremental search doesn't work with multiple cursors, but this fixes that
(use-package phi-search (use-package phi-search
:init (require 'bind-key)
:bind (("C-s" . phi-search) :bind (("C-s" . phi-search)
("C-r" . phi-search-backward))) ("C-r" . phi-search-backward)))

View file

@ -79,7 +79,6 @@ let
visual-regexp visual-regexp
phi-search phi-search
undo-tree undo-tree
counsel
]; ];
}); });
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
@ -266,7 +265,7 @@ in {
f1viewer f1viewer
vlc vlc
wineWowPackages.wayland wineWowPackages.wayland
# blender blender
vesktop vesktop
ktailctl ktailctl
caddy caddy