diff options
| -rw-r--r-- | flake.lock | 430 | ||||
| -rw-r--r-- | flake.nix | 25 | ||||
| -rw-r--r-- | share/cfg/helix.nix | 1 | ||||
| -rw-r--r-- | share/home/gui-tools.nix | 64 | ||||
| -rw-r--r-- | share/system/client-common.nix | 2 |
5 files changed, 122 insertions, 400 deletions
@@ -1,25 +1,5 @@ { "nodes": { - "comin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755069910, - "narHash": "sha256-g/9W1Cn0gsawDCgaqz2j2ZASCf2Y2Fb/nMCdwgGVVb0=", - "owner": "nlewo", - "repo": "comin", - "rev": "ab7eb8963df9fcaaef427f55d1e755cffcc7c43e", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "comin", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -27,11 +7,11 @@ ] }, "locked": { - "lastModified": 1754971456, - "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -43,31 +23,10 @@ "emacs-overlay": { "inputs": { "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1755421757, - "narHash": "sha256-9zCONwZ4oJqwsVB+YL9O+AwaA3+mfCofAf6FBcFPZAE=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "8896fe8207ae222e0ca478d45a09625773ec8671", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "emacs-overlay_2": { - "inputs": { - "nixpkgs": [ "sorrepkgs", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1739610734, @@ -86,11 +45,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -125,11 +84,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -203,11 +162,11 @@ ] }, "locked": { - "lastModified": 1755397986, - "narHash": "sha256-qwrF5laj6eE3Zht0wKYTmH6QzL7bdOyE2f6jd3WCO8g=", + "lastModified": 1759573136, + "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b4ac149687e8520187a66f05e9d4eafebf96522", + "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", "type": "github" }, "original": { @@ -221,16 +180,16 @@ "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755424351, - "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", + "lastModified": 1759570525, + "narHash": "sha256-wQbq5QgzlG10u3TzZDEMjyQdOs8tVyMjKsdks+WKmZQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9aa137af01f05386e5bb5050e983750017007a66", + "rev": "069c3908df7e6caf4eae0eaeba9c1a70ec32ca27", "type": "github" }, "original": { @@ -242,16 +201,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -259,11 +218,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755419373, - "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -272,64 +231,13 @@ "type": "github" } }, - "nix-formatter-pack": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs" - ], - "nmd": "nmd", - "nmt": "nmt" - }, - "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, - "nix-on-droid": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-docs": "nixpkgs-docs", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd_2" - }, - "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", - "owner": "nix-community", - "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "nix-on-droid", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -339,73 +247,28 @@ "type": "github" } }, - "nixpkgs-docs": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1755274400, - "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", + "lastModified": 1759439645, + "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", + "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", "type": "github" }, "original": { @@ -415,7 +278,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1739357830, "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", @@ -433,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -449,11 +312,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -463,87 +326,17 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", - "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmd_2": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset" - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, - "no-style-please": { - "flake": false, - "locked": { - "lastModified": 1731873530, - "narHash": "sha256-67iX9Y0kSrPCyzFKDxBOL/GnorE6BKOQCj79tT3/AhY=", - "owner": "atgumx", - "repo": "no-style-please", - "rev": "30dd31fbc558597110f373b3ef1e0c75ea350f75", - "type": "gitlab" - }, - "original": { - "owner": "atgumx", - "repo": "no-style-please", - "type": "gitlab" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755439681, - "narHash": "sha256-o4kC1QNURVb63nh9wFl2hicpXMsJaZQJKq0yegmIs5M=", + "lastModified": 1759578289, + "narHash": "sha256-w6+mGGDG1x6SdUfp3g2n2wHDBQFKKd861Nr63BwE0nY=", "owner": "nix-community", "repo": "nur", - "rev": "3cf97a4e2861712a9b36386a78e14d63ff9bc4e4", + "rev": "fc81e15b9422a3457f8b0cb4d8c9a2fc2876fce6", "type": "github" }, "original": { @@ -562,11 +355,11 @@ ] }, "locked": { - "lastModified": 1737301351, - "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -575,81 +368,36 @@ "type": "github" } }, + "radion-theme": { + "flake": false, + "locked": { + "lastModified": 1759191307, + "narHash": "sha256-K6EJSD5fsBusgAtfpDhLnSJX3BXQaI2cqn2I07jDDrU=", + "owner": "micahkepe", + "repo": "radion", + "rev": "15b6545b788a3f1bd176cd86a5f4ad098629a51e", + "type": "github" + }, + "original": { + "owner": "micahkepe", + "repo": "radion", + "type": "github" + } + }, "root": { "inputs": { - "comin": "comin", "disko": "disko", - "emacs-overlay": "emacs-overlay", "futils": "futils", "home-manager": "home-manager", "niri-flake": "niri-flake", - "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs_2", "nur": "nur", - "rust-overlay": "rust-overlay", - "snippets-ls": "snippets-ls", "sops-nix": "sops-nix", "sorre-website": "sorre-website", "sorrepkgs": "sorrepkgs", "treefmt-nix": "treefmt-nix_2" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755398672, - "narHash": "sha256-vC/JDQFU7IKQYDA4nQeEjyIMihP1xvMg+wUdbUIN4ow=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8269616684bacf71cd71d33ec29514f9adb37b89", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } - }, - "snippets-ls": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718632593, - "narHash": "sha256-RxMA8ut1fsxhKRELodR4lHc+fl3e1y803GCW/kfDzSI=", - "owner": "quantonganh", - "repo": "snippets-ls", - "rev": "063ba0f72f6d80829e17c6e5de6c9ae0aa05a841", - "type": "github" - }, - "original": { - "owner": "quantonganh", - "repo": "snippets-ls", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -657,11 +405,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1759188042, + "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "type": "github" }, "original": { @@ -676,16 +424,16 @@ "nixpkgs": [ "nixpkgs" ], - "no-style-please": "no-style-please", "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "radion-theme": "radion-theme", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737454977, - "narHash": "sha256-3W0AceBC4lXt1mHvVLAiLpYP+jeua1Bz53XPMnkuY6I=", + "lastModified": 1759588161, + "narHash": "sha256-cGOxGZ4T042gZU9DqVKuXu+vknb0XdCGg8jilKPQQoY=", "ref": "refs/heads/main", - "rev": "408d3a49813bfa8f4397decd058cfa5a6110a859", - "revCount": 14, + "rev": "50f15f8b6234be058f7a1a87ca96e7d97198da11", + "revCount": 15, "type": "git", "url": "https://git.sorre.xyz/miranb/sorre-website.git" }, @@ -696,7 +444,7 @@ }, "sorrepkgs": { "inputs": { - "emacs-overlay": "emacs-overlay_2", + "emacs-overlay": "emacs-overlay", "futils": "futils_2", "nixpkgs": [ "nixpkgs" @@ -754,11 +502,11 @@ ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { @@ -774,11 +522,11 @@ ] }, "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { @@ -790,16 +538,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.7", "repo": "xwayland-satellite", "type": "github" } @@ -807,11 +555,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755219541, - "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", + "lastModified": 1759449168, + "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", + "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", "type": "github" }, "original": { @@ -20,32 +20,11 @@ url = "git+https://git.sorre.xyz/miranb/sorre-website.git"; inputs.nixpkgs.follows = "nixpkgs"; }; - snippets-ls = { - url = "github:quantonganh/snippets-ls"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; - comin = { - url = "github:nlewo/comin"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - emacs-overlay = { - url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nur.url = "github:nix-community/nur"; sorrepkgs = { url = "git+https://git.sorre.xyz/miranb/xpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; + nur.url = "github:nix-community/nur"; # no overrides because I the binary cache to work niri-flake.url = "github:sodiboo/niri-flake"; @@ -62,7 +41,6 @@ self, nixpkgs, futils, - nix-on-droid, treefmt-nix, ... }@inputs: @@ -97,7 +75,6 @@ home-manager.nixosModules.home-manager sops-nix.nixosModules.sops disko.nixosModules.disko - comin.nixosModules.comin ./share/system/common.nix # This directory has to exist and have a `default.nix` in it, see diff --git a/share/cfg/helix.nix b/share/cfg/helix.nix index 8565e3e..c10a5fc 100644 --- a/share/cfg/helix.nix +++ b/share/cfg/helix.nix @@ -66,7 +66,6 @@ language-servers = [ "vscode-html-language-server" "emmet-ls" - # "snippets-html" ]; } { diff --git a/share/home/gui-tools.nix b/share/home/gui-tools.nix index 986eaf6..d5e38fd 100644 --- a/share/home/gui-tools.nix +++ b/share/home/gui-tools.nix @@ -5,39 +5,39 @@ ./wayland-common.nix ]; - home.packages = - [ pkgs.kdePackages.kdenlive ] - ++ builtins.attrValues { - inherit (pkgs) - thunderbird # email client - nsxiv # image viewer - signal-desktop - whatsie - qbittorrent # bittorrent client - zathura # document reader - bitwarden - discord - gimp - libreoffice-qt6-fresh - blender - haruna - anki - calibre - mullvad-vpn - ente-desktop - spotify - obsidian - gnome-clocks - seer - wireshark + home.packages = [ + pkgs.kdePackages.kdenlive + ] + ++ builtins.attrValues { + inherit (pkgs) + thunderbird # email client + nsxiv # image viewer + signal-desktop + qbittorrent # bittorrent client + zathura # document reader + bitwarden + discord + gimp + libreoffice-qt6-fresh + blender + haruna + anki + calibre + mullvad-vpn + ente-desktop + spotify + obsidian + gnome-clocks + seer + wireshark - # Other - # It seems that not all gtk icon themes contain all icons? At least the - # Flat-Remix icon themes don't contain all the icons that Foliate uses, - # so I'm bringing in the adwaita icons as a fallback. - adwaita-icon-theme - ; - }; + # Other + # It seems that not all gtk icon themes contain all icons? At least the + # Flat-Remix icon themes don't contain all the icons that Foliate uses, + # so I'm bringing in the adwaita icons as a fallback. + adwaita-icon-theme + ; + }; programs.librewolf.enable = true; programs.foot.enable = true; diff --git a/share/system/client-common.nix b/share/system/client-common.nix index 0b81557..ecab98f 100644 --- a/share/system/client-common.nix +++ b/share/system/client-common.nix @@ -10,8 +10,6 @@ ]; nixpkgs = { overlays = [ - inputs.rust-overlay.overlays.default - inputs.emacs-overlay.overlays.default inputs.niri-flake.overlays.niri (final: prev: { nur = import inputs.nur { |