Updated system, fixes, culled lots of old config
This commit is contained in:
Emmet
753
flake.lock
generated
753
flake.lock
generated
@ -20,11 +20,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729527199,
|
"lastModified": 1730968822,
|
||||||
"narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
|
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
|
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -102,11 +102,11 @@
|
|||||||
"blocklist-hosts": {
|
"blocklist-hosts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730406687,
|
"lastModified": 1731033962,
|
||||||
"narHash": "sha256-Tv85Ctg3P51UBAT6lIy5RfH335edeEKuaA5XUYcsXU8=",
|
"narHash": "sha256-1LO6MzklwZ3ry3gi8ET129L7P2aRsAWOj1XeiNM6qHM=",
|
||||||
"owner": "StevenBlack",
|
"owner": "StevenBlack",
|
||||||
"repo": "hosts",
|
"repo": "hosts",
|
||||||
"rev": "bbb43907e5ced864b3763005b0988e61104eba6a",
|
"rev": "a9296b0d324a66ae0a5cad3c1f3d2afcf3d09eb8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -115,199 +115,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"doom-emacs": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1662497747,
|
|
||||||
"narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=",
|
|
||||||
"owner": "doomemacs",
|
|
||||||
"repo": "doomemacs",
|
|
||||||
"rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "doomemacs",
|
|
||||||
"repo": "doomemacs",
|
|
||||||
"rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"doom-snippets": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1694887483,
|
|
||||||
"narHash": "sha256-KlKhruPSLPSKqUnr5/U65arm16VrY9ORzm+XKNZhpTQ=",
|
|
||||||
"owner": "doomemacs",
|
|
||||||
"repo": "snippets",
|
|
||||||
"rev": "f022984ee1318a4015d5d081b3c3dab5a60dc6ff",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "doomemacs",
|
|
||||||
"repo": "snippets",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"eaf": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728651925,
|
|
||||||
"narHash": "sha256-NQV4MXynuxjg4u9V7UGSCyavqx9DWxJCA7nm1GD0f3s=",
|
|
||||||
"owner": "emacs-eaf",
|
|
||||||
"repo": "emacs-application-framework",
|
|
||||||
"rev": "60466a72a8b0688ccded87bb25879348911f162b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "emacs-eaf",
|
|
||||||
"repo": "emacs-application-framework",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"eaf-browser": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715466525,
|
|
||||||
"narHash": "sha256-jcCn16lXqcq1UcekekJiTfRBjjgaY0Hkz69ycElSzuA=",
|
|
||||||
"owner": "emacs-eaf",
|
|
||||||
"repo": "eaf-browser",
|
|
||||||
"rev": "9761f7bd22aa69f144a0a032643b0834dde6cb60",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "emacs-eaf",
|
|
||||||
"repo": "eaf-browser",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"emacs-overlay": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1676366521,
|
|
||||||
"narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "emacs-overlay",
|
|
||||||
"rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "emacs-overlay",
|
|
||||||
"rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"emacs-pin-nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1711731143,
|
|
||||||
"narHash": "sha256-P3rID/C2N9+emVlCr4ta0X591usRvFxqk1wON/2j+Dg=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "f72123158996b8d4449de481897d855bc47c7bf6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"rev": "f72123158996b8d4449de481897d855bc47c7bf6",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"emacs-so-long": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1575031854,
|
|
||||||
"narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=",
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "emacs-so-long",
|
|
||||||
"rev": "ed666b0716f60e8988c455804de24b55919e71ca",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "emacs-so-long",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"evil-escape": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1588439096,
|
|
||||||
"narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=",
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "evil-escape",
|
|
||||||
"rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "evil-escape",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"evil-markdown": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1626852210,
|
|
||||||
"narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
|
|
||||||
"owner": "Somelauw",
|
|
||||||
"repo": "evil-markdown",
|
|
||||||
"rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Somelauw",
|
|
||||||
"repo": "evil-markdown",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"evil-org-mode": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1607203864,
|
|
||||||
"narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=",
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "evil-org-mode",
|
|
||||||
"rev": "a9706da260c45b98601bcd72b1d2c0a24a017700",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "evil-org-mode",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"evil-quick-diff": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1575189609,
|
|
||||||
"narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=",
|
|
||||||
"owner": "rgrinberg",
|
|
||||||
"repo": "evil-quick-diff",
|
|
||||||
"rev": "69c883720b30a892c63bc89f49d4f0e8b8028908",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rgrinberg",
|
|
||||||
"repo": "evil-quick-diff",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"explain-pause-mode": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1595842060,
|
|
||||||
"narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=",
|
|
||||||
"owner": "lastquestion",
|
|
||||||
"repo": "explain-pause-mode",
|
|
||||||
"rev": "2356c8c3639cbeeb9751744dbe737267849b4b51",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lastquestion",
|
|
||||||
"repo": "explain-pause-mode",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -324,22 +131,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1673956053,
|
|
||||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
@ -359,24 +150,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1694529238,
|
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_3": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": [
|
||||||
"stylix",
|
"stylix",
|
||||||
@ -412,23 +185,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"format-all": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1581716637,
|
|
||||||
"narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
|
|
||||||
"owner": "lassik",
|
|
||||||
"repo": "emacs-format-all-the-code",
|
|
||||||
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lassik",
|
|
||||||
"repo": "emacs-format-all-the-code",
|
|
||||||
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"fromYaml": {
|
"fromYaml": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -511,11 +267,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730490306,
|
"lastModified": 1730837930,
|
||||||
"narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
|
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1743615b61c7285976f85b303a36cdf88a556503",
|
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -756,7 +512,6 @@
|
|||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725203994,
|
"lastModified": 1725203994,
|
||||||
"narHash": "sha256-N7Kfq8tpOWjtRKBnH5RqcDtQFGZPZ5vXgmxbnZVPCuU=",
|
"narHash": "sha256-N7Kfq8tpOWjtRKBnH5RqcDtQFGZPZ5vXgmxbnZVPCuU=",
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763",
|
"rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763",
|
||||||
"revCount": 248,
|
"revCount": 248,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -843,21 +598,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"kdenlive-pin-nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709012981,
|
|
||||||
"narHash": "sha256-/D10ohogluwFIl5NXQxJx6ag6fuwA1KEAO8Ia5GDhhM=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "cfec6d9203a461d9d698d8a60ef003cac6d0da94",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"rev": "cfec6d9203a461d9d698d8a60ef003cac6d0da94",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -893,85 +633,6 @@
|
|||||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
|
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"magit-file-icons": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1719595750,
|
|
||||||
"narHash": "sha256-n/uXppejl6js/wrvEEIKmfmCh7ssbSBMMZWYrrvG1JQ=",
|
|
||||||
"owner": "librephoenix",
|
|
||||||
"repo": "magit-file-icons",
|
|
||||||
"rev": "6c90eb03eb8a382110d862ec792ae50556bffd6e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "librephoenix",
|
|
||||||
"ref": "abstract-icon-getters-compat",
|
|
||||||
"repo": "magit-file-icons",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mini-frame": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1685981796,
|
|
||||||
"narHash": "sha256-HsGEu37oq2uuQFfE2m++VH1SwyGC89ChnmrBVFC/WME=",
|
|
||||||
"owner": "muffinmad",
|
|
||||||
"repo": "emacs-mini-frame",
|
|
||||||
"rev": "f420020aa33a1b00407000addd995170a36e026e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "muffinmad",
|
|
||||||
"repo": "emacs-mini-frame",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-doom-emacs": {
|
|
||||||
"inputs": {
|
|
||||||
"doom-emacs": "doom-emacs",
|
|
||||||
"doom-snippets": "doom-snippets",
|
|
||||||
"emacs-overlay": "emacs-overlay",
|
|
||||||
"emacs-so-long": "emacs-so-long",
|
|
||||||
"evil-escape": "evil-escape",
|
|
||||||
"evil-markdown": "evil-markdown",
|
|
||||||
"evil-org-mode": "evil-org-mode",
|
|
||||||
"evil-quick-diff": "evil-quick-diff",
|
|
||||||
"explain-pause-mode": "explain-pause-mode",
|
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"format-all": "format-all",
|
|
||||||
"nix-straight": [
|
|
||||||
"nix-straight"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"emacs-pin-nixpkgs"
|
|
||||||
],
|
|
||||||
"nose": "nose",
|
|
||||||
"ob-racket": "ob-racket",
|
|
||||||
"org": "org",
|
|
||||||
"org-contrib": "org-contrib",
|
|
||||||
"org-yt": "org-yt",
|
|
||||||
"php-extras": "php-extras",
|
|
||||||
"revealjs": "revealjs",
|
|
||||||
"rotate-text": "rotate-text",
|
|
||||||
"sln-mode": "sln-mode",
|
|
||||||
"ts-fold": "ts-fold",
|
|
||||||
"ws-butler": "ws-butler"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1701264882,
|
|
||||||
"narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix-doom-emacs",
|
|
||||||
"rev": "f7413022370f24bb53cb450bfb2803233510113e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix-doom-emacs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-formatter-pack": {
|
"nix-formatter-pack": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -1026,30 +687,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-straight": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1692033740,
|
|
||||||
"narHash": "sha256-oCd0yJiMArPr20nYVz/HGU1bmZnmiS30n9Z4MKZUHj0=",
|
|
||||||
"owner": "librephoenix",
|
|
||||||
"repo": "nix-straight.el",
|
|
||||||
"rev": "1e4a1375b04acb8a88d123a91585734410192d42",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "librephoenix",
|
|
||||||
"ref": "pgtk-patch",
|
|
||||||
"repo": "nix-straight.el",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730200266,
|
"lastModified": 1730785428,
|
||||||
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1092,11 +736,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730327045,
|
"lastModified": 1730883749,
|
||||||
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1175,22 +819,6 @@
|
|||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nose": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1400604510,
|
|
||||||
"narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=",
|
|
||||||
"owner": "emacsattic",
|
|
||||||
"repo": "nose",
|
|
||||||
"rev": "f8528297519eba911696c4e68fa88892de9a7b72",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "emacsattic",
|
|
||||||
"repo": "nose",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nvchad": {
|
"nvchad": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -1207,306 +835,34 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nwg-dock-hyprland-pin-nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716385560,
|
|
||||||
"narHash": "sha256-xuFXyvvrDXx5A56uo8D+YmHqsmPscsjBh279P44Z5bE=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ob-racket": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1584656173,
|
|
||||||
"narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=",
|
|
||||||
"owner": "xchrishawk",
|
|
||||||
"repo": "ob-racket",
|
|
||||||
"rev": "83457ec9e1e96a29fd2086ed19432b9d75787673",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "xchrishawk",
|
|
||||||
"repo": "ob-racket",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1695726851,
|
|
||||||
"narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=",
|
|
||||||
"owner": "emacs-straight",
|
|
||||||
"repo": "org-mode",
|
|
||||||
"rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "emacs-straight",
|
|
||||||
"repo": "org-mode",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-contrib": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1694946041,
|
|
||||||
"narHash": "sha256-X/HFG6NZe5BY00KvGbcsIuf9R6Lg8x7Uhd0Y5+Q3qZU=",
|
|
||||||
"owner": "emacsmirror",
|
|
||||||
"repo": "org-contrib",
|
|
||||||
"rev": "5eabbf22bdd4523c922a30787e98ee66c24221aa",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "emacsmirror",
|
|
||||||
"repo": "org-contrib",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-krita": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1713038273,
|
|
||||||
"narHash": "sha256-ZoigcRMetn2ZY9uvcR3iLnPsf9ys2rHuUD9yv3+u7KM=",
|
|
||||||
"owner": "librephoenix",
|
|
||||||
"repo": "org-krita",
|
|
||||||
"rev": "9a1d917d2ee0fb7d2403186a0e6a15e23089c9fb",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "librephoenix",
|
|
||||||
"repo": "org-krita",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-nursery": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714726259,
|
|
||||||
"narHash": "sha256-x+/TTSdHzQ+GKHV6jgvoQrwZCH4cZQfQGKDIBzFbJRw=",
|
|
||||||
"owner": "chrisbarrett",
|
|
||||||
"repo": "nursery",
|
|
||||||
"rev": "00a169c75b934a2eb42ea8620e8eebf34577d4ca",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "chrisbarrett",
|
|
||||||
"repo": "nursery",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-side-tree": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717236106,
|
|
||||||
"narHash": "sha256-b30Yl378DaRQl8DAsAaeyf+WYz0y7L5h0EsbBQGvdjE=",
|
|
||||||
"owner": "localauthor",
|
|
||||||
"repo": "org-side-tree",
|
|
||||||
"rev": "e8da5217ce23440a62f4a46ef60e2082b6284b28",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "localauthor",
|
|
||||||
"repo": "org-side-tree",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-sliced-images": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1719203338,
|
|
||||||
"narHash": "sha256-wi8G6AHWWbAFBPGsZSSOVIOBqrzfdOhzgTfUNe4fAEc=",
|
|
||||||
"owner": "jcfk",
|
|
||||||
"repo": "org-sliced-images",
|
|
||||||
"rev": "b98b88a55eff07e998e7789e0bf7307dd71db050",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "jcfk",
|
|
||||||
"repo": "org-sliced-images",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-timeblock": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730016337,
|
|
||||||
"narHash": "sha256-NOc45zpfvia61YpLiggP/YgJeLttNAd/Cdeh1CfxGdw=",
|
|
||||||
"owner": "ichernyshovvv",
|
|
||||||
"repo": "org-timeblock",
|
|
||||||
"rev": "e61e5734b49f933ed178029f804a0499f3308e1e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "ichernyshovvv",
|
|
||||||
"repo": "org-timeblock",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-xournalpp": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1625233179,
|
|
||||||
"narHash": "sha256-c0AYWMkBb7wdl7SWTffjWSXwXbq1PGov2vT8A1pdqpQ=",
|
|
||||||
"owner": "vherrmann",
|
|
||||||
"repo": "org-xournalpp",
|
|
||||||
"rev": "c09bd8b99d36c355d632b85ecbffb3b275802381",
|
|
||||||
"type": "gitlab"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "vherrmann",
|
|
||||||
"repo": "org-xournalpp",
|
|
||||||
"type": "gitlab"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-yaap": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1711640914,
|
|
||||||
"narHash": "sha256-eWoRaE10QPOPeE0TnHBn3o+Hz6fX0yDZnfrqVlj1De8=",
|
|
||||||
"owner": "tygrdev",
|
|
||||||
"repo": "org-yaap",
|
|
||||||
"rev": "fcf675382d914f369591052ddb8440cfc714ce74",
|
|
||||||
"type": "gitlab"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tygrdev",
|
|
||||||
"repo": "org-yaap",
|
|
||||||
"type": "gitlab"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"org-yt": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1527381913,
|
|
||||||
"narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=",
|
|
||||||
"owner": "TobiasZawada",
|
|
||||||
"repo": "org-yt",
|
|
||||||
"rev": "40cc1ac76d741055cbefa13860d9f070a7ade001",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "TobiasZawada",
|
|
||||||
"repo": "org-yt",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"php-extras": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1573312690,
|
|
||||||
"narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=",
|
|
||||||
"owner": "arnested",
|
|
||||||
"repo": "php-extras",
|
|
||||||
"rev": "d410c5af663c30c01d461ac476d1cbfbacb49367",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "arnested",
|
|
||||||
"repo": "php-extras",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"phscroll": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1697087101,
|
|
||||||
"narHash": "sha256-LklBCgDYnC1SF2MD5LDI/CoQVSWlmrG83JGa155z4DI=",
|
|
||||||
"owner": "misohena",
|
|
||||||
"repo": "phscroll",
|
|
||||||
"rev": "582abedb4cf6aba216cdb5fe7217d612a1d68d5a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "misohena",
|
|
||||||
"repo": "phscroll",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"revealjs": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1695738029,
|
|
||||||
"narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=",
|
|
||||||
"owner": "hakimel",
|
|
||||||
"repo": "reveal.js",
|
|
||||||
"rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hakimel",
|
|
||||||
"repo": "reveal.js",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"blocklist-hosts": "blocklist-hosts",
|
"blocklist-hosts": "blocklist-hosts",
|
||||||
"eaf": "eaf",
|
|
||||||
"eaf-browser": "eaf-browser",
|
|
||||||
"emacs-pin-nixpkgs": "emacs-pin-nixpkgs",
|
|
||||||
"home-manager-stable": "home-manager-stable",
|
"home-manager-stable": "home-manager-stable",
|
||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
"hyprgrass": "hyprgrass",
|
"hyprgrass": "hyprgrass",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprland-plugins": "hyprland-plugins",
|
"hyprland-plugins": "hyprland-plugins",
|
||||||
"hyprlock": "hyprlock",
|
"hyprlock": "hyprlock",
|
||||||
"kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
|
|
||||||
"lix-module": "lix-module",
|
"lix-module": "lix-module",
|
||||||
"magit-file-icons": "magit-file-icons",
|
|
||||||
"mini-frame": "mini-frame",
|
|
||||||
"nix-doom-emacs": "nix-doom-emacs",
|
|
||||||
"nix-on-droid": "nix-on-droid",
|
"nix-on-droid": "nix-on-droid",
|
||||||
"nix-straight": "nix-straight",
|
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nvchad": "nvchad",
|
"nvchad": "nvchad",
|
||||||
"nwg-dock-hyprland-pin-nixpkgs": "nwg-dock-hyprland-pin-nixpkgs",
|
|
||||||
"org-krita": "org-krita",
|
|
||||||
"org-nursery": "org-nursery",
|
|
||||||
"org-side-tree": "org-side-tree",
|
|
||||||
"org-sliced-images": "org-sliced-images",
|
|
||||||
"org-timeblock": "org-timeblock",
|
|
||||||
"org-xournalpp": "org-xournalpp",
|
|
||||||
"org-yaap": "org-yaap",
|
|
||||||
"phscroll": "phscroll",
|
|
||||||
"rust-overlay": "rust-overlay",
|
"rust-overlay": "rust-overlay",
|
||||||
"stylix": "stylix"
|
"stylix": "stylix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rotate-text": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1322962747,
|
|
||||||
"narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=",
|
|
||||||
"owner": "debug-ito",
|
|
||||||
"repo": "rotate-text.el",
|
|
||||||
"rev": "48f193697db996855aee1ad2bc99b38c6646fe76",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "debug-ito",
|
|
||||||
"repo": "rotate-text.el",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730428392,
|
"lastModified": 1731032894,
|
||||||
"narHash": "sha256-2aRfq1P0usr+TlW9LUCoefqqpPum873ac0TgZzXYHKI=",
|
"narHash": "sha256-dQSyYPmrQiPr+PGEd+K8038rubFGz7G/dNXVeaGWE0w=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "17eda17f5596a84e92ba94160139eb70f3c3e734",
|
"rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1531,44 +887,28 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sln-mode": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1423727528,
|
|
||||||
"narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=",
|
|
||||||
"owner": "sensorflo",
|
|
||||||
"repo": "sln-mode",
|
|
||||||
"rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "sensorflo",
|
|
||||||
"repo": "sln-mode",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"stylix": {
|
"stylix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"base16": "base16",
|
"base16": "base16",
|
||||||
"base16-fish": "base16-fish",
|
"base16-fish": "base16-fish",
|
||||||
"base16-helix": "base16-helix",
|
"base16-helix": "base16-helix",
|
||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_2",
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"systems": "systems_5",
|
"systems": "systems_4",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-tmux": "tinted-tmux"
|
"tinted-tmux": "tinted-tmux"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729963473,
|
"lastModified": 1731002033,
|
||||||
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
|
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
|
"rev": "f71c2effed1ce4f9fbeefe402e4e431428ffe93a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1637,21 +977,6 @@
|
|||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-foot": {
|
"tinted-foot": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -1701,38 +1026,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ts-fold": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1695278494,
|
|
||||||
"narHash": "sha256-O4NcUC1u08W8ZslqoA/i+iTaLotKwheURXQWBxLLMFc=",
|
|
||||||
"owner": "jcs-elpa",
|
|
||||||
"repo": "ts-fold",
|
|
||||||
"rev": "70b2c79ff4daa7351d4e2917b0343b9a18d4d4f2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "jcs-elpa",
|
|
||||||
"repo": "ts-fold",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ws-butler": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1634511126,
|
|
||||||
"narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=",
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "ws-butler",
|
|
||||||
"rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hlissner",
|
|
||||||
"repo": "ws-butler",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"xdph": {
|
"xdph": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland-protocols": "hyprland-protocols_2",
|
"hyprland-protocols": "hyprland-protocols_2",
|
||||||
|
|||||||
79
flake.nix
79
flake.nix
@ -56,9 +56,7 @@
|
|||||||
(import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches {
|
(import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches {
|
||||||
name = "nixpkgs-patched";
|
name = "nixpkgs-patched";
|
||||||
src = inputs.nixpkgs;
|
src = inputs.nixpkgs;
|
||||||
patches = [ #./patches/emacs-no-version-check.patch
|
patches = [ ./patches/nixpkgs-354095.patch ];
|
||||||
#./patches/nixpkgs-348697.patch
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# configure pkgs
|
# configure pkgs
|
||||||
@ -94,18 +92,6 @@
|
|||||||
overlays = [ inputs.rust-overlay.overlays.default ];
|
overlays = [ inputs.rust-overlay.overlays.default ];
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgs-emacs = import inputs.emacs-pin-nixpkgs {
|
|
||||||
system = systemSettings.system;
|
|
||||||
};
|
|
||||||
|
|
||||||
pkgs-kdenlive = import inputs.kdenlive-pin-nixpkgs {
|
|
||||||
system = systemSettings.system;
|
|
||||||
};
|
|
||||||
|
|
||||||
pkgs-nwg-dock-hyprland = import inputs.nwg-dock-hyprland-pin-nixpkgs {
|
|
||||||
system = systemSettings.system;
|
|
||||||
};
|
|
||||||
|
|
||||||
# configure lib
|
# configure lib
|
||||||
# use nixpkgs if running a server (homelab or worklab profile)
|
# use nixpkgs if running a server (homelab or worklab profile)
|
||||||
# otherwise use patched nixos-unstable nixpkgs
|
# otherwise use patched nixos-unstable nixpkgs
|
||||||
@ -143,9 +129,6 @@
|
|||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
# pass config variables from above
|
# pass config variables from above
|
||||||
inherit pkgs-stable;
|
inherit pkgs-stable;
|
||||||
inherit pkgs-emacs;
|
|
||||||
inherit pkgs-kdenlive;
|
|
||||||
inherit pkgs-nwg-dock-hyprland;
|
|
||||||
inherit systemSettings;
|
inherit systemSettings;
|
||||||
inherit userSettings;
|
inherit userSettings;
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
@ -177,7 +160,6 @@
|
|||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
# pass config variables from above
|
# pass config variables from above
|
||||||
inherit pkgs-stable;
|
inherit pkgs-stable;
|
||||||
inherit pkgs-emacs;
|
|
||||||
inherit systemSettings;
|
inherit systemSettings;
|
||||||
inherit userSettings;
|
inherit userSettings;
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
@ -213,9 +195,6 @@
|
|||||||
};
|
};
|
||||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "nixpkgs/nixos-24.05";
|
nixpkgs-stable.url = "nixpkgs/nixos-24.05";
|
||||||
emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6";
|
|
||||||
kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94";
|
|
||||||
nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15";
|
|
||||||
|
|
||||||
home-manager-unstable.url = "github:nix-community/home-manager/master";
|
home-manager-unstable.url = "github:nix-community/home-manager/master";
|
||||||
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -248,67 +227,11 @@
|
|||||||
hyprgrass.url = "github:horriblename/hyprgrass/427690aec574fec75f5b7b800ac4a0b4c8e4b1d5";
|
hyprgrass.url = "github:horriblename/hyprgrass/427690aec574fec75f5b7b800ac4a0b4c8e4b1d5";
|
||||||
hyprgrass.inputs.hyprland.follows = "hyprland";
|
hyprgrass.inputs.hyprland.follows = "hyprland";
|
||||||
|
|
||||||
nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
|
|
||||||
nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs";
|
|
||||||
|
|
||||||
nix-straight.url = "github:librephoenix/nix-straight.el/pgtk-patch";
|
|
||||||
nix-straight.flake = false;
|
|
||||||
nix-doom-emacs.inputs.nix-straight.follows = "nix-straight";
|
|
||||||
|
|
||||||
nvchad = {
|
nvchad = {
|
||||||
url = "github:NvChad/starter";
|
url = "github:NvChad/starter";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
eaf = {
|
|
||||||
url = "github:emacs-eaf/emacs-application-framework";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
eaf-browser = {
|
|
||||||
url = "github:emacs-eaf/eaf-browser";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-nursery = {
|
|
||||||
url = "github:chrisbarrett/nursery";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-yaap = {
|
|
||||||
url = "gitlab:tygrdev/org-yaap";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-side-tree = {
|
|
||||||
url = "github:localauthor/org-side-tree";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-timeblock = {
|
|
||||||
url = "github:ichernyshovvv/org-timeblock";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-krita = {
|
|
||||||
url = "github:librephoenix/org-krita";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-xournalpp = {
|
|
||||||
url = "gitlab:vherrmann/org-xournalpp";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
org-sliced-images = {
|
|
||||||
url = "github:jcfk/org-sliced-images";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
magit-file-icons = {
|
|
||||||
url = "github:librephoenix/magit-file-icons/abstract-icon-getters-compat";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
phscroll = {
|
|
||||||
url = "github:misohena/phscroll";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
mini-frame = {
|
|
||||||
url = "github:muffinmad/emacs-mini-frame";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
stylix.url = "github:danth/stylix";
|
stylix.url = "github:danth/stylix";
|
||||||
|
|
||||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
|
|
||||||
index 3ff10ee86..56d03b6e6 100644
|
|
||||||
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
|
|
||||||
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
|
|
||||||
@@ -25,7 +25,8 @@ in
|
|
||||||
|
|
||||||
libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
|
|
||||||
|
|
||||||
-{ buildInputs ? []
|
|
||||||
+{ version ? null
|
|
||||||
+, buildInputs ? []
|
|
||||||
, nativeBuildInputs ? []
|
|
||||||
, packageRequires ? []
|
|
||||||
, propagatedBuildInputs ? []
|
|
||||||
@@ -38,7 +39,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
|
|
||||||
}@args:
|
|
||||||
|
|
||||||
{
|
|
||||||
- name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}";
|
|
||||||
+ name = args.name or "emacs-${finalAttrs.pname}${lib.optionalString (version != null) "-${version}"}";
|
|
||||||
|
|
||||||
unpackCmd = args.unpackCmd or ''
|
|
||||||
case "$curSrc" in
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
|
|
||||||
index 9f031347d354e..6356eeb9637f0 100644
|
|
||||||
--- a/pkgs/development/python-modules/pyqt/6.x.nix
|
|
||||||
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
|
|
||||||
@@ -25,17 +25,15 @@
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "pyqt6";
|
|
||||||
- version = "6.7.0.dev2404081550";
|
|
||||||
+ version = "6.8.0.dev2410141303";
|
|
||||||
format = "pyproject";
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
|
||||||
|
|
||||||
+ # This is dangerous, how can we get web archive to archive the URL?
|
|
||||||
src = fetchurl {
|
|
||||||
- urls = [
|
|
||||||
- "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
|
|
||||||
- "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
|
|
||||||
- ];
|
|
||||||
- hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ=";
|
|
||||||
+ url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz";
|
|
||||||
+ hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4=";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
@@ -55,8 +53,11 @@ buildPythonPackage rec {
|
|
||||||
verbose = true
|
|
||||||
EOF
|
|
||||||
|
|
||||||
+ # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK
|
|
||||||
substituteInPlace pyproject.toml \
|
|
||||||
- --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"'
|
|
||||||
+ --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \
|
|
||||||
+ --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \
|
|
||||||
+ --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2"
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
|
|
||||||
index 8a398654b08ce..8fd6240e4a512 100644
|
|
||||||
--- a/pkgs/development/python-modules/sip/default.nix
|
|
||||||
+++ b/pkgs/development/python-modules/sip/default.nix
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
fetchPypi,
|
|
||||||
pythonOlder,
|
|
||||||
setuptools,
|
|
||||||
+ setuptools-scm,
|
|
||||||
packaging,
|
|
||||||
tomli,
|
|
||||||
|
|
||||||
@@ -15,17 +16,20 @@
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "sip";
|
|
||||||
- version = "6.8.3";
|
|
||||||
+ version = "6.8.6";
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
- hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw=";
|
|
||||||
+ hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
- nativeBuildInputs = [ setuptools ];
|
|
||||||
+ build-system = [
|
|
||||||
+ setuptools
|
|
||||||
+ setuptools-scm
|
|
||||||
+ ];
|
|
||||||
|
|
||||||
- propagatedBuildInputs = [
|
|
||||||
+ dependencies = [
|
|
||||||
packaging
|
|
||||||
setuptools
|
|
||||||
] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
|
|
||||||
87
patches/nixpkgs-354095.patch
Normal file
87
patches/nixpkgs-354095.patch
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
From 13af81da96c4b706e3262f1424d1d26b3db315d1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Marshall <andrew@johnandrewmarshall.com>
|
||||||
|
Date: Wed, 6 Nov 2024 17:24:11 -0500
|
||||||
|
Subject: [PATCH 1/2] openvdb_11: init at 11.0.0
|
||||||
|
|
||||||
|
There are many breaking changes in v12, which some consumers are not
|
||||||
|
ready for and would require complex changes. This is expected to go away
|
||||||
|
once it becomes unused in nixpkgs.
|
||||||
|
---
|
||||||
|
pkgs/development/libraries/openvdb/11.nix | 19 +++++++++++++++++++
|
||||||
|
pkgs/top-level/all-packages.nix | 1 +
|
||||||
|
2 files changed, 20 insertions(+)
|
||||||
|
create mode 100644 pkgs/development/libraries/openvdb/11.nix
|
||||||
|
|
||||||
|
diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000..a65bb286ae2e2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/development/libraries/openvdb/11.nix
|
||||||
|
@@ -0,0 +1,19 @@
|
||||||
|
+{
|
||||||
|
+ lib,
|
||||||
|
+ fetchFromGitHub,
|
||||||
|
+ openvdb,
|
||||||
|
+}:
|
||||||
|
+
|
||||||
|
+openvdb.overrideAttrs (old: rec {
|
||||||
|
+ name = "${old.pname}-${version}";
|
||||||
|
+ version = "11.0.0";
|
||||||
|
+ src = fetchFromGitHub {
|
||||||
|
+ owner = "AcademySoftwareFoundation";
|
||||||
|
+ repo = "openvdb";
|
||||||
|
+ rev = "v${version}";
|
||||||
|
+ sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
|
||||||
|
+ };
|
||||||
|
+ meta = old.meta // {
|
||||||
|
+ license = lib.licenses.mpl20;
|
||||||
|
+ };
|
||||||
|
+})
|
||||||
|
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||||
|
index 55968eed13554..428a42210da40 100644
|
||||||
|
--- a/pkgs/top-level/all-packages.nix
|
||||||
|
+++ b/pkgs/top-level/all-packages.nix
|
||||||
|
@@ -22214,6 +22214,7 @@ with pkgs;
|
||||||
|
zunclient = with python311Packages; toPythonApplication python-zunclient;
|
||||||
|
|
||||||
|
openvdb = callPackage ../development/libraries/openvdb { };
|
||||||
|
+ openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { };
|
||||||
|
|
||||||
|
openvr = callPackage ../by-name/op/openvr/package.nix {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
|
||||||
|
|
||||||
|
From 33e09c6eea89ae1d1145f2f4527f98fd7b87865b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Marshall <andrew@johnandrewmarshall.com>
|
||||||
|
Date: Wed, 6 Nov 2024 17:25:29 -0500
|
||||||
|
Subject: [PATCH 2/2] blender: fix build by using openvdb_11
|
||||||
|
|
||||||
|
openvdb is now v12, and has many breaking API changes. Upstream has not
|
||||||
|
yet adapted to them yet, so there is no patch to backport. Further,
|
||||||
|
OpenVDB 12 is not currently part of the anticipated upstream library
|
||||||
|
updates for Blender 4.3 or 4.4.
|
||||||
|
---
|
||||||
|
pkgs/applications/misc/blender/default.nix | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
|
||||||
|
index 7d89339da1026..e2af0b3f93384 100644
|
||||||
|
--- a/pkgs/applications/misc/blender/default.nix
|
||||||
|
+++ b/pkgs/applications/misc/blender/default.nix
|
||||||
|
@@ -64,7 +64,7 @@
|
||||||
|
openjpeg,
|
||||||
|
openpgl,
|
||||||
|
opensubdiv,
|
||||||
|
- openvdb,
|
||||||
|
+ openvdb_11,
|
||||||
|
openxr-loader,
|
||||||
|
pkg-config,
|
||||||
|
potrace,
|
||||||
|
@@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
openjpeg
|
||||||
|
openpgl
|
||||||
|
(opensubdiv.override { inherit cudaSupport; })
|
||||||
|
- openvdb
|
||||||
|
+ openvdb_11
|
||||||
|
potrace
|
||||||
|
pugixml
|
||||||
|
python3
|
||||||
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, pkgs-stable, pkgs-emacs, systemSettings, userSettings, inputs, ... }:
|
{ config, lib, pkgs, pkgs-stable, systemSettings, userSettings, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Simply install just the packages
|
# Simply install just the packages
|
||||||
@ -51,7 +51,6 @@
|
|||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
# pass config variables from above
|
# pass config variables from above
|
||||||
inherit pkgs-stable;
|
inherit pkgs-stable;
|
||||||
inherit pkgs-emacs;
|
|
||||||
inherit systemSettings;
|
inherit systemSettings;
|
||||||
inherit userSettings;
|
inherit userSettings;
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
|
|||||||
@ -6,7 +6,6 @@
|
|||||||
imports = [
|
imports = [
|
||||||
../../user/shell/sh.nix # My zsh and bash config
|
../../user/shell/sh.nix # My zsh and bash config
|
||||||
../../user/shell/cli-collection.nix # Useful CLI apps
|
../../user/shell/cli-collection.nix # Useful CLI apps
|
||||||
../../user/app/doom-emacs/doom.nix # My doom emacs config
|
|
||||||
../../user/app/ranger/ranger.nix # My ranger file manager config
|
../../user/app/ranger/ranger.nix # My ranger file manager config
|
||||||
../../user/app/git/git.nix # My git config
|
../../user/app/git/git.nix # My git config
|
||||||
../../user/style/stylix.nix # Styling and themes for my apps
|
../../user/style/stylix.nix # Styling and themes for my apps
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, pkgs-stable, pkgs-kdenlive, userSettings, ... }:
|
{ config, pkgs, pkgs-stable, userSettings, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Home Manager needs a bit of information about you and the paths it should
|
# Home Manager needs a bit of information about you and the paths it should
|
||||||
@ -12,9 +12,7 @@
|
|||||||
(./. + "../../../user/wm"+("/"+userSettings.wm+"/"+userSettings.wm)+".nix") # My window manager selected from flake
|
(./. + "../../../user/wm"+("/"+userSettings.wm+"/"+userSettings.wm)+".nix") # My window manager selected from flake
|
||||||
../../user/shell/sh.nix # My zsh and bash config
|
../../user/shell/sh.nix # My zsh and bash config
|
||||||
../../user/shell/cli-collection.nix # Useful CLI apps
|
../../user/shell/cli-collection.nix # Useful CLI apps
|
||||||
#../../user/app/doom-emacs/doom.nix # My doom emacs config
|
|
||||||
../../user/app/nvim/nvim.nix # My doom emacs config
|
../../user/app/nvim/nvim.nix # My doom emacs config
|
||||||
#../../user/app/emacsng # Me experimenting with emacsng and a vanilla config
|
|
||||||
../../user/app/ranger/ranger.nix # My ranger file manager config
|
../../user/app/ranger/ranger.nix # My ranger file manager config
|
||||||
../../user/app/git/git.nix # My git config
|
../../user/app/git/git.nix # My git config
|
||||||
../../user/app/keepass/keepass.nix # My password manager
|
../../user/app/keepass/keepass.nix # My password manager
|
||||||
@ -24,7 +22,6 @@
|
|||||||
../../user/style/stylix.nix # Styling and themes for my apps
|
../../user/style/stylix.nix # Styling and themes for my apps
|
||||||
../../user/lang/cc/cc.nix # C and C++ tools
|
../../user/lang/cc/cc.nix # C and C++ tools
|
||||||
../../user/lang/godot/godot.nix # Game development
|
../../user/lang/godot/godot.nix # Game development
|
||||||
#../../user/pkgs/blockbench.nix # Blockbench ## marked as insecure
|
|
||||||
../../user/hardware/bluetooth.nix # Bluetooth
|
../../user/hardware/bluetooth.nix # Bluetooth
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -42,6 +42,6 @@ I use this to pass a few attribute sets:
|
|||||||
- =userSettings= - Settings for the normal user (see [[../flake.nix][flake.nix]] for more details)
|
- =userSettings= - Settings for the normal user (see [[../flake.nix][flake.nix]] for more details)
|
||||||
- =systemSettings= - Settings for the system (see [[../flake.nix][flake.nix]] for more details)
|
- =systemSettings= - Settings for the system (see [[../flake.nix][flake.nix]] for more details)
|
||||||
- =inputs= - Flake inputs (see [[../flake.nix][flake.nix]] for more details)
|
- =inputs= - Flake inputs (see [[../flake.nix][flake.nix]] for more details)
|
||||||
|
- =pkgs= - Set to unstable for client devices and stable for server devices
|
||||||
- =pkgs-stable= - Allows me to include stable versions of packages along with (my default) unstable versions of packages
|
- =pkgs-stable= - Allows me to include stable versions of packages along with (my default) unstable versions of packages
|
||||||
- =pkgs-emacs= - Pinned version of nixpkgs I use for Emacs and its dependencies
|
- =pkgs-unstable= - Allows me to force unstable versions of packages on server devices
|
||||||
- =pkgs-kdenlive= - Pinned version of nixpkgs I use for kdenlive
|
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
#+title: Doom Emacs
|
|
||||||
|
|
||||||
* What is Doom Emacs?
|
|
||||||
[[https://github.com/doomemacs/doomemacs][Doom Emacs]] is a distribution of the [[https://www.gnu.org/software/emacs/][Emacs Text Editor]] designed for [[https://www.vim.org/][Vim]] users. I like to use Emacs due to its extensibility and extra features it is capable of (besides text editing). Some of these extra features include:
|
|
||||||
- [[https://orgmode.org/][Org Mode]] (Hierarchical text-based document format)
|
|
||||||
- [[https://www.orgroam.com/][Org Roam]] (A second brain / personal wiki)
|
|
||||||
- [[https://orgmode.org/][Org Agenda]] (Calendar and todo list)
|
|
||||||
- [[https://magit.vc/][magit]] (Git Client)
|
|
||||||
|
|
||||||
[[https://raw.githubusercontent.com/librephoenix/nixos-config-screenshots/main/app/doom.png]]
|
|
||||||
|
|
||||||
I have found Emacs to be incredibly efficient, and transferring my workflow to fit inside of Emacs has allowed me to get much more work done. I primarily use Emacs for writing, note-taking, task/project management and organizing information.
|
|
||||||
|
|
||||||
* My Config
|
|
||||||
This directory includes my Doom Emacs configuration, which consists of:
|
|
||||||
- [[./config.el][config.el]] - Main configuration
|
|
||||||
- [[./init.el][init.el]] - Doom modules (easy sets of packages curated by Doom)
|
|
||||||
- [[./packages.el][packages.el]] - Additional packages from Melpa (Emacs package manager).
|
|
||||||
- [[./themes/doom-stylix-theme.el.mustache][doom-stylix-theme.el.mustache]] - Mustache Doom Emacs template to be used with stylix, requires my [[../../style/stylix.nix][stylix.nix module]] as well
|
|
||||||
- [[./doom.nix][doom.nix]] - Loads Nix Doom Emacs and my configuration into my flake when imported
|
|
||||||
- A few other [[./scripts][random scripts]]
|
|
||||||
|
|
||||||
My full config is a [[./doom.org][literate org document (doom.org)]].
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,148 +0,0 @@
|
|||||||
{ config, lib, pkgs, pkgs-emacs, pkgs-stable, inputs, userSettings, systemSettings, ... }:
|
|
||||||
let
|
|
||||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
|
||||||
dashboardLogo = ./. + "/nix-" + themePolarity + ".webp";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
inputs.nix-doom-emacs.hmModule
|
|
||||||
../git/git.nix
|
|
||||||
../../shell/sh.nix
|
|
||||||
../../shell/cli-collection.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.doom-emacs = {
|
|
||||||
enable = true;
|
|
||||||
emacsPackage = pkgs-emacs.emacs29-pgtk;
|
|
||||||
doomPrivateDir = ./.;
|
|
||||||
# This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
|
|
||||||
# Only init/packages so we only rebuild when those change.
|
|
||||||
doomPackageDir = let
|
|
||||||
filteredPath = builtins.path {
|
|
||||||
path = ./.;
|
|
||||||
name = "doom-private-dir-filtered";
|
|
||||||
filter = path: type:
|
|
||||||
builtins.elem (baseNameOf path) [ "init.el" "packages.el" ];
|
|
||||||
};
|
|
||||||
in pkgs-emacs.linkFarm "doom-packages-dir" [
|
|
||||||
{
|
|
||||||
name = "init.el";
|
|
||||||
path = "${filteredPath}/init.el";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "packages.el";
|
|
||||||
path = "${filteredPath}/packages.el";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "config.el";
|
|
||||||
path = pkgs-emacs.emptyFile;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
# End block
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
|
|
||||||
template = builtins.readFile ./themes/doom-stylix-theme.el.mustache;
|
|
||||||
extension = ".el";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = (with pkgs-emacs; [
|
|
||||||
emacs-lsp-booster
|
|
||||||
file
|
|
||||||
wmctrl
|
|
||||||
jshon
|
|
||||||
aria
|
|
||||||
hledger
|
|
||||||
hunspell hunspellDicts.en_US-large
|
|
||||||
(pkgs-emacs.mu.override { emacs = emacs29-pgtk; })
|
|
||||||
(pkgs.callPackage ./pkgs/org-analyzer.nix {})
|
|
||||||
emacsPackages.mu4e
|
|
||||||
isync
|
|
||||||
msmtp
|
|
||||||
(python3.withPackages (p: with p; [
|
|
||||||
pandas
|
|
||||||
requests
|
|
||||||
epc lxml
|
|
||||||
pysocks
|
|
||||||
pymupdf
|
|
||||||
markdown
|
|
||||||
]))
|
|
||||||
]) ++ (with pkgs-stable; [
|
|
||||||
nodejs
|
|
||||||
nodePackages.mermaid-cli
|
|
||||||
]) ++ (with pkgs; [
|
|
||||||
openssl
|
|
||||||
stunnel
|
|
||||||
]);
|
|
||||||
|
|
||||||
services.mbsync = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs-stable.isync;
|
|
||||||
frequency = "*:0/5";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-yaap" = {
|
|
||||||
source = "${inputs.org-yaap}";
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-side-tree" = {
|
|
||||||
source = "${inputs.org-side-tree}";
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-timeblock" = {
|
|
||||||
source = "${inputs.org-timeblock}";
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-nursery" = {
|
|
||||||
source = "${inputs.org-nursery}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-krita" = {
|
|
||||||
source = "${inputs.org-krita}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-xournalpp" = {
|
|
||||||
source = "${inputs.org-xournalpp}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/org-sliced-images" = {
|
|
||||||
source = "${inputs.org-sliced-images}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/magit-file-icons" = {
|
|
||||||
source = "${inputs.magit-file-icons}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/dashboard-logo.webp".source = dashboardLogo;
|
|
||||||
home.file.".emacs.d/scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh" = {
|
|
||||||
source = ./scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh;
|
|
||||||
executable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/phscroll" = {
|
|
||||||
source = "${inputs.phscroll}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/mini-frame" = {
|
|
||||||
source = "${inputs.mini-frame}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".emacs.d/system-vars.el".text = ''
|
|
||||||
;;; ~/.emacs.d/config.el -*- lexical-binding: t; -*-
|
|
||||||
|
|
||||||
;; Import relevant variables from flake into emacs
|
|
||||||
|
|
||||||
(setq user-full-name "''+userSettings.name+''") ; name
|
|
||||||
(setq user-username "''+userSettings.username+''") ; username
|
|
||||||
(setq user-mail-address "''+userSettings.email+''") ; email
|
|
||||||
(setq user-home-directory "/home/''+userSettings.username+''") ; absolute path to home directory as string
|
|
||||||
(setq user-default-roam-dir "''+userSettings.defaultRoamDir+''") ; absolute path to home directory as string
|
|
||||||
(setq system-nix-profile "''+systemSettings.profile+''") ; what profile am I using?
|
|
||||||
(setq system-wm-type "''+userSettings.wmType+''") ; wayland or x11?
|
|
||||||
(setq doom-font (font-spec :family "''+userSettings.font+''" :size 20)) ; import font
|
|
||||||
(setq dotfiles-dir "''+userSettings.dotfilesDir+''") ; import location of dotfiles directory
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,175 +0,0 @@
|
|||||||
(doom! :input
|
|
||||||
;;chinese
|
|
||||||
;;japanese
|
|
||||||
;;layout ; auie,ctsrnm is the superior home row
|
|
||||||
|
|
||||||
:completion
|
|
||||||
company ; the ultimate code completion backend
|
|
||||||
;;helm ; the *other* search engine for love and life
|
|
||||||
;;ido ; the other *other* search engine...
|
|
||||||
;;ivy ; a search engine for love and life
|
|
||||||
vertico ; the search engine of the future
|
|
||||||
|
|
||||||
:ui
|
|
||||||
;;deft ; notational velocity for Emacs
|
|
||||||
doom ; what makes DOOM look the way it does
|
|
||||||
;;doom-dashboard ; a nifty splash screen for Emacs
|
|
||||||
doom-quit ; DOOM quit-message prompts when you quit Emacs
|
|
||||||
(emoji +unicode) ; 🙂
|
|
||||||
hl-todo ; highlight todo/fixme/note/deprecated/hack/review
|
|
||||||
;;hydra
|
|
||||||
;;indent-guides ; highlighted indent columns
|
|
||||||
;;ligatures ; ligatures and symbols to make your code pretty again
|
|
||||||
;;minimap ; show a map of the code on the side
|
|
||||||
modeline ; snazzy, Atom-inspired modeline, plus API
|
|
||||||
nav-flash ; blink cursor line after big motions
|
|
||||||
neotree ; a project drawer, like NERDTree for vim
|
|
||||||
ophints ; highlight the region an operation acts on
|
|
||||||
(popup +defaults) ; tame sudden yet inevitable temporary windows
|
|
||||||
;;tabs ; a tab bar for Emacs
|
|
||||||
treemacs ; a project drawer, like neotree but cooler
|
|
||||||
unicode ; extended unicode support for various languages
|
|
||||||
vc-gutter ; vcs diff in the fringe
|
|
||||||
;;vi-tilde-fringe ; fringe tildes to mark beyond EOB
|
|
||||||
window-select ; visually switch windows
|
|
||||||
workspaces ; tab emulation, persistence & separate workspaces
|
|
||||||
;;zen ; distraction-free coding or writing
|
|
||||||
|
|
||||||
:editor
|
|
||||||
(evil +everywhere); come to the dark side, we have cookies
|
|
||||||
file-templates ; auto-snippets for empty files
|
|
||||||
fold ; (nigh) universal code folding
|
|
||||||
(format +onsave) ; automated prettiness
|
|
||||||
;;god ; run Emacs commands without modifier keys
|
|
||||||
;;lispy ; vim for lisp, for people who don't like vim
|
|
||||||
multiple-cursors ; editing in many places at once
|
|
||||||
;;objed ; text object editing for the innocent
|
|
||||||
;;parinfer ; turn lisp into python, sort of
|
|
||||||
;;rotate-text ; cycle region at point between text candidates
|
|
||||||
snippets ; my elves. They type so I don't have to
|
|
||||||
word-wrap ; soft wrapping with language-aware indent
|
|
||||||
|
|
||||||
:emacs
|
|
||||||
(dired +ranger) ; making dired pretty [functional]
|
|
||||||
electric ; smarter, keyword-based electric-indent
|
|
||||||
ibuffer ; interactive buffer management
|
|
||||||
undo ; persistent, smarter undo for your inevitable mistakes
|
|
||||||
vc ; version-control and Emacs, sitting in a tree
|
|
||||||
|
|
||||||
:term
|
|
||||||
eshell ; the elisp shell that works everywhere
|
|
||||||
;;shell ; simple shell REPL for Emacs
|
|
||||||
;;term ; basic terminal emulator for Emacs
|
|
||||||
vterm ; the best terminal emulation in Emacs
|
|
||||||
|
|
||||||
:checkers
|
|
||||||
syntax ; tasing you for every semicolon you forget
|
|
||||||
(spell +flyspell) ; tasing you for misspelling mispelling
|
|
||||||
;;grammar ; tasing grammar mistake every you make
|
|
||||||
|
|
||||||
:tools
|
|
||||||
;;ansible
|
|
||||||
;;biblio ; Writes a PhD for you (citation needed)
|
|
||||||
;;debugger ; stepping through code, to help you add bugs
|
|
||||||
;;direnv
|
|
||||||
docker
|
|
||||||
;;editorconfig ; let someone else argue about tabs vs spaces
|
|
||||||
;;ein ; tame Jupyter notebooks with emacs
|
|
||||||
(eval +overlay) ; run code, run (also, repls)
|
|
||||||
;;gist ; interacting with github gists
|
|
||||||
lookup ; navigate your code and its documentation
|
|
||||||
(lsp) ; M-x vscode
|
|
||||||
magit ; a git porcelain for Emacs
|
|
||||||
;;make ; run make tasks from Emacs
|
|
||||||
;;pass ; password manager for nerds
|
|
||||||
;;pdf ; pdf enhancements
|
|
||||||
;;prodigy ; managing external services & code builders
|
|
||||||
rgb ; creating color strings
|
|
||||||
;;taskrunner ; taskrunner for all your projects
|
|
||||||
;;terraform ; infrastructure as code
|
|
||||||
;;tmux ; an API for interacting with tmux
|
|
||||||
;;upload ; map local to remote projects via ssh/ftp
|
|
||||||
|
|
||||||
:os
|
|
||||||
;;(:if IS-MAC macos) ; improve compatibility with macOS
|
|
||||||
tty ; improve the terminal Emacs experience
|
|
||||||
|
|
||||||
:lang
|
|
||||||
;;agda ; types of types of types of types...
|
|
||||||
;;beancount ; mind the GAAP
|
|
||||||
;;cc ; C > C++ == 1
|
|
||||||
;;clojure ; java with a lisp
|
|
||||||
common-lisp ; if you've seen one lisp, you've seen them all
|
|
||||||
;;coq ; proofs-as-programs
|
|
||||||
;;crystal ; ruby at the speed of c
|
|
||||||
;;csharp ; unity, .NET, and mono shenanigans
|
|
||||||
data ; config/data formats
|
|
||||||
;;(dart +flutter) ; paint ui and not much else
|
|
||||||
;;dhall
|
|
||||||
;;elixir ; erlang done right
|
|
||||||
;;elm ; care for a cup of TEA?
|
|
||||||
emacs-lisp ; drown in parentheses
|
|
||||||
;;erlang ; an elegant language for a more civilized age
|
|
||||||
;;ess ; emacs speaks statistics
|
|
||||||
;;factor
|
|
||||||
;;faust ; dsp, but you get to keep your soul
|
|
||||||
;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER)
|
|
||||||
;;fsharp ; ML stands for Microsoft's Language
|
|
||||||
;;fstar ; (dependent) types and (monadic) effects and Z3
|
|
||||||
(gdscript +lsp) ; the language you waited for
|
|
||||||
;;(go +lsp) ; the hipster dialect
|
|
||||||
(haskell +lsp) ; a language that's lazier than I am
|
|
||||||
;;hy ; readability of scheme w/ speed of python
|
|
||||||
;;idris ; a language you can depend on
|
|
||||||
json ; At least it ain't XML
|
|
||||||
(java +lsp) ; the poster child for carpal tunnel syndrome
|
|
||||||
javascript ; all(hope(abandon(ye(who(enter(here))))))
|
|
||||||
;;julia ; a better, faster MATLAB
|
|
||||||
(kotlin +lsp) ; a better, slicker Java(Script)
|
|
||||||
latex ; writing papers in Emacs has never been so fun
|
|
||||||
;;lean ; for folks with too much to prove
|
|
||||||
;;ledger ; be audit you can be
|
|
||||||
lua ; one-based indices? one-based indices
|
|
||||||
markdown ; writing docs for people to ignore
|
|
||||||
;;nim ; python + lisp at the speed of c
|
|
||||||
(nix +lsp) ; I hereby declare "nix geht mehr!"
|
|
||||||
;;ocaml ; an objective camel
|
|
||||||
(org +roam2) ; organize your plain life in plain text
|
|
||||||
;;php ; perl's insecure younger brother
|
|
||||||
;;plantuml ; diagrams for confusing people more
|
|
||||||
;;purescript ; javascript, but functional
|
|
||||||
python ; beautiful is better than ugly
|
|
||||||
;;qt ; the 'cutest' gui framework ever
|
|
||||||
;;racket ; a DSL for DSLs
|
|
||||||
;;raku ; the artist formerly known as perl6
|
|
||||||
;;rest ; Emacs as a REST client
|
|
||||||
;;rst ; ReST in peace
|
|
||||||
;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
|
|
||||||
;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
|
|
||||||
;;scala ; java, but good
|
|
||||||
;;(scheme +guile) ; a fully conniving family of lisps
|
|
||||||
sh ; she sells {ba,z,fi}sh shells on the C xor
|
|
||||||
;;sml
|
|
||||||
;;solidity ; do you need a blockchain? No.
|
|
||||||
;;swift ; who asked for emoji variables?
|
|
||||||
;;terra ; Earth and Moon in alignment for performance.
|
|
||||||
web ; the tubes
|
|
||||||
yaml ; JSON, but readable
|
|
||||||
;;zig ; C, but simpler
|
|
||||||
|
|
||||||
:email
|
|
||||||
(mu4e +org)
|
|
||||||
;;notmuch
|
|
||||||
;;(wanderlust +gmail)
|
|
||||||
|
|
||||||
:app
|
|
||||||
calendar
|
|
||||||
;;emms
|
|
||||||
;;everywhere ; *leave* Emacs!? You must be joking
|
|
||||||
;;irc ; how neckbeards socialize
|
|
||||||
rss ; emacs as an RSS reader
|
|
||||||
;;twitter ; twitter client https://twitter.com/vnought
|
|
||||||
|
|
||||||
:config
|
|
||||||
;;literate
|
|
||||||
(default +bindings +smartparens))
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
@ -1,38 +0,0 @@
|
|||||||
(package! org-analyzer :pin "0908eea")
|
|
||||||
(package! embark :pin "0908eea")
|
|
||||||
(package! dashboard)
|
|
||||||
(package! direnv)
|
|
||||||
(package! org :pin "5bdfc02c6fa1b9ad4f075ac1ad1e4086ead310db")
|
|
||||||
(package! org-modern)
|
|
||||||
(package! org-super-agenda)
|
|
||||||
(package! emacsql :pin "c1a4407")
|
|
||||||
(package! org-roam-ui)
|
|
||||||
(package! org-transclusion)
|
|
||||||
(package! org-download)
|
|
||||||
(package! org-yt)
|
|
||||||
(package! toc-org)
|
|
||||||
(package! lister)
|
|
||||||
(package! all-the-icons-ibuffer)
|
|
||||||
(package! all-the-icons-dired)
|
|
||||||
(package! all-the-icons-completion)
|
|
||||||
(package! ox-reveal)
|
|
||||||
(package! magit-todos)
|
|
||||||
(package! hledger-mode)
|
|
||||||
(package! rainbow-mode)
|
|
||||||
(package! crdt)
|
|
||||||
(package! ess)
|
|
||||||
(package! openwith)
|
|
||||||
(package! ob-mermaid)
|
|
||||||
(package! focus)
|
|
||||||
(package! olivetti)
|
|
||||||
(package! async)
|
|
||||||
(package! centered-cursor-mode)
|
|
||||||
(package! elfeed)
|
|
||||||
(package! elfeed-protocol)
|
|
||||||
(package! docker-tramp :disable t)
|
|
||||||
(package! org-ql)
|
|
||||||
(package! persist)
|
|
||||||
(package! sudo-edit)
|
|
||||||
(package! solaire-mode :disable t)
|
|
||||||
(package! el-patch)
|
|
||||||
(package! devdocs)
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
{ stdenv, fetchFromGitHub, pkgs, ... }:
|
|
||||||
let name = "clj-org-analyzer";
|
|
||||||
version = "1.0.2";
|
|
||||||
in stdenv.mkDerivation
|
|
||||||
{
|
|
||||||
inherit name version;
|
|
||||||
|
|
||||||
src = builtins.fetchurl {
|
|
||||||
url = "https://github.com/rksm/clj-org-analyzer/releases/download/1.0.2/org-analyzer-1.0.2.jar";
|
|
||||||
sha256 = "sha256:1j5c688yg6f5y6n86rf6vkwd1csn1y4dc716d5bczmyr2sgi9c67";
|
|
||||||
};
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir $out $out/bin;
|
|
||||||
cp $src $out/bin/org-analyzer.jar;
|
|
||||||
echo "#!/bin/sh
|
|
||||||
${pkgs.jdk}/bin/java -jar $out/bin/org-analyzer.jar $@" > $out/bin/org-analyzer
|
|
||||||
chmod +x $out/bin/org-analyzer.jar
|
|
||||||
chmod +x $out/bin/org-analyzer
|
|
||||||
'';
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
if [ $(echo $XDG_SESSION_TYPE) == "wayland" ]; then
|
|
||||||
FILENAME="$(wl-paste)"
|
|
||||||
FILTEREDFILENAME=$(echo "$FILENAME" | sed "s+file:+./+")
|
|
||||||
echo "$FILTEREDFILENAME"
|
|
||||||
if [[ -f "$FILTEREDFILENAME" ]]; then
|
|
||||||
wl-copy < "$FILTEREDFILENAME"
|
|
||||||
fi
|
|
||||||
elif [ $(echo $XDG_SESSION_TYPE) == "x11" ]; then
|
|
||||||
FILENAME="$(xclip -o)"
|
|
||||||
FILTEREDFILENAME=$(echo "$FILENAME" | sed "s+file:+./+")
|
|
||||||
if [[ -f "$FILTEREDFILENAME" ]]; then
|
|
||||||
TYPE=$(file -b --mime-type "$FILTEREDFILENAME")
|
|
||||||
xclip -selection clipboard -t "$TYPE" -i "$FILTEREDFILENAME"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
exit
|
|
||||||
@ -1,177 +0,0 @@
|
|||||||
;;; doom-stylix-theme.el --- stylix template created from doom-one -*- lexical-binding: t; no-byte-compile: t; -*-
|
|
||||||
;;
|
|
||||||
;; Author: Emmet K <https://gitlab.com/librephoenix>
|
|
||||||
;; Maintainer: Emmet K <https://gitlab.com/librephoenix>
|
|
||||||
;; Source: https://github.com/doomemacs/themes
|
|
||||||
;;
|
|
||||||
;;; Commentary:
|
|
||||||
;;
|
|
||||||
;; Stylix template for Doom Emacs.
|
|
||||||
;;
|
|
||||||
;;; Code:
|
|
||||||
|
|
||||||
(require 'doom-themes)
|
|
||||||
|
|
||||||
;;
|
|
||||||
;;; Variables
|
|
||||||
|
|
||||||
(defgroup doom-stylix-theme nil
|
|
||||||
"Options for the `doom-one' theme."
|
|
||||||
:group 'doom-themes)
|
|
||||||
|
|
||||||
(defcustom doom-stylix-brighter-modeline nil
|
|
||||||
"If non-nil, more vivid colors will be used to style the mode-line."
|
|
||||||
:group 'doom-stylix-theme
|
|
||||||
:type 'boolean)
|
|
||||||
|
|
||||||
(defcustom doom-stylix-brighter-comments nil
|
|
||||||
"If non-nil, comments will be highlighted in more vivid colors."
|
|
||||||
:group 'doom-stylix-theme
|
|
||||||
:type 'boolean)
|
|
||||||
|
|
||||||
(defcustom doom-stylix-padded-modeline doom-themes-padded-modeline
|
|
||||||
"If non-nil, adds a 4px padding to the mode-line.
|
|
||||||
Can be an integer to determine the exact padding."
|
|
||||||
:group 'doom-stylix-theme
|
|
||||||
:type '(choice integer boolean))
|
|
||||||
|
|
||||||
|
|
||||||
;;
|
|
||||||
;;; Theme definition
|
|
||||||
|
|
||||||
(def-doom-theme doom-stylix
|
|
||||||
"A theme generated from current stylix theme."
|
|
||||||
|
|
||||||
;; name default 256 16
|
|
||||||
((bg '("#{{base00-hex}}" "black" "black" ))
|
|
||||||
(fg '("#{{base05-hex}}" "#bfbfbf" "brightwhite" ))
|
|
||||||
|
|
||||||
;; These are off-color variants of bg/fg, used primarily for `solaire-mode',
|
|
||||||
;; but can also be useful as a basis for subtle highlights (e.g. for hl-line
|
|
||||||
;; or region), especially when paired with the `doom-darken', `doom-lighten',
|
|
||||||
;; and `doom-blend' helper functions.
|
|
||||||
(bg-alt '("#{{base01-hex}}" "black" "black" ))
|
|
||||||
(fg-alt '("#{{base07-hex}}" "#2d2d2d" "white" ))
|
|
||||||
|
|
||||||
;; These should represent a spectrum from bg to fg, where base0 is a starker
|
|
||||||
;; bg and base8 is a starker fg. For example, if bg is light grey and fg is
|
|
||||||
;; dark grey, base0 should be white and base8 should be black.
|
|
||||||
(base0 '("#{{base00-hex}}" "black" "black" ))
|
|
||||||
(base1 '("#{{base01-hex}}" "#1e1e1e" "brightblack" ))
|
|
||||||
(base2 '("#{{base01-hex}}" "#2e2e2e" "brightblack" ))
|
|
||||||
(base3 '("#{{base02-hex}}" "#262626" "brightblack" ))
|
|
||||||
(base4 '("#{{base03-hex}}" "#3f3f3f" "brightblack" ))
|
|
||||||
(base5 '("#{{base04-hex}}" "#525252" "brightblack" ))
|
|
||||||
(base6 '("#{{base05-hex}}" "#6b6b6b" "brightblack" ))
|
|
||||||
(base7 '("#{{base06-hex}}" "#979797" "brightblack" ))
|
|
||||||
(base8 '("#{{base07-hex}}" "#dfdfdf" "white" ))
|
|
||||||
|
|
||||||
(grey base4)
|
|
||||||
(red '("#{{base08-hex}}" "#ff6655" "red" ))
|
|
||||||
(orange '("#{{base09-hex}}" "#dd8844" "brightred" ))
|
|
||||||
(green '("#{{base0B-hex}}" "#99bb66" "green" ))
|
|
||||||
(teal '("#{{base0C-hex}}" "#44b9b1" "brightgreen" ))
|
|
||||||
(yellow '("#{{base0A-hex}}" "#ECBE7B" "yellow" ))
|
|
||||||
(blue '("#{{base0E-hex}}" "#51afef" "brightblue" ))
|
|
||||||
(dark-blue '("#{{base0E-hex}}" "#2257A0" "blue" ))
|
|
||||||
(magenta '("#{{base0F-hex}}" "#c678dd" "brightmagenta"))
|
|
||||||
(violet '("#{{base0F-hex}}" "#a9a1e1" "magenta" ))
|
|
||||||
(cyan '("#{{base0D-hex}}" "#46D9FF" "brightcyan" ))
|
|
||||||
(dark-cyan '("#{{base0C-hex}}" "#5699AF" "cyan" ))
|
|
||||||
|
|
||||||
;; These are the "universal syntax classes" that doom-themes establishes.
|
|
||||||
;; These *must* be included in every doom themes, or your theme will throw an
|
|
||||||
;; error, as they are used in the base theme defined in doom-themes-base.
|
|
||||||
(highlight blue)
|
|
||||||
(vertical-bar (doom-darken base1 0.1))
|
|
||||||
(selection dark-blue)
|
|
||||||
(builtin magenta)
|
|
||||||
(comments (if doom-stylix-brighter-comments dark-cyan base5))
|
|
||||||
(doc-comments (doom-lighten (if doom-stylix-brighter-comments dark-cyan base5) 0.25))
|
|
||||||
(constants violet)
|
|
||||||
(functions magenta)
|
|
||||||
(keywords blue)
|
|
||||||
(methods cyan)
|
|
||||||
(operators blue)
|
|
||||||
(type yellow)
|
|
||||||
(strings green)
|
|
||||||
(variables (doom-lighten magenta 0.4))
|
|
||||||
(numbers orange)
|
|
||||||
(region `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35)))
|
|
||||||
(error red)
|
|
||||||
(warning yellow)
|
|
||||||
(success green)
|
|
||||||
(vc-modified orange)
|
|
||||||
(vc-added green)
|
|
||||||
(vc-deleted red)
|
|
||||||
|
|
||||||
;; These are extra color variables used only in this theme; i.e. they aren't
|
|
||||||
;; mandatory for derived themes.
|
|
||||||
(modeline-fg fg)
|
|
||||||
(modeline-fg-alt base5)
|
|
||||||
(modeline-bg (if doom-stylix-brighter-modeline
|
|
||||||
(doom-darken blue 0.45)
|
|
||||||
(doom-darken bg-alt 0.1)))
|
|
||||||
(modeline-bg-alt (if doom-stylix-brighter-modeline
|
|
||||||
(doom-darken blue 0.475)
|
|
||||||
`(,(doom-darken (car bg-alt) 0.15) ,@(cdr bg))))
|
|
||||||
(modeline-bg-inactive `(,(car bg-alt) ,@(cdr base1)))
|
|
||||||
(modeline-bg-inactive-alt `(,(doom-darken (car bg-alt) 0.1) ,@(cdr bg)))
|
|
||||||
|
|
||||||
(-modeline-pad
|
|
||||||
(when doom-stylix-padded-modeline
|
|
||||||
(if (integerp doom-stylix-padded-modeline) doom-stylix-padded-modeline 4))))
|
|
||||||
|
|
||||||
|
|
||||||
;;;; Base theme face overrides
|
|
||||||
(((line-number &override) :foreground base4)
|
|
||||||
((line-number-current-line &override) :foreground fg)
|
|
||||||
((font-lock-comment-face &override)
|
|
||||||
:background (if doom-stylix-brighter-comments (doom-lighten bg 0.05)))
|
|
||||||
(mode-line
|
|
||||||
:background modeline-bg :foreground modeline-fg
|
|
||||||
:box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
|
|
||||||
(mode-line-inactive
|
|
||||||
:background modeline-bg-inactive :foreground modeline-fg-alt
|
|
||||||
:box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
|
|
||||||
(mode-line-emphasis :foreground (if doom-stylix-brighter-modeline base8 highlight))
|
|
||||||
|
|
||||||
;;;; css-mode <built-in> / scss-mode
|
|
||||||
(css-proprietary-property :foreground orange)
|
|
||||||
(css-property :foreground green)
|
|
||||||
(css-selector :foreground blue)
|
|
||||||
;;;; doom-modeline
|
|
||||||
(doom-modeline-bar :background (if doom-stylix-brighter-modeline modeline-bg highlight))
|
|
||||||
(doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
|
|
||||||
(doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold)
|
|
||||||
(doom-modeline-buffer-project-root :foreground green :weight 'bold)
|
|
||||||
;;;; elscreen
|
|
||||||
(elscreen-tab-other-screen-face :background "#{{base01-hex}}" :foreground "#{{base06-hex}}")
|
|
||||||
;;;; ivy
|
|
||||||
(ivy-current-match :background dark-blue :distant-foreground base0 :weight 'normal)
|
|
||||||
;;;; LaTeX-mode
|
|
||||||
(font-latex-math-face :foreground green)
|
|
||||||
;;;; markdown-mode
|
|
||||||
(markdown-markup-face :foreground base5)
|
|
||||||
(markdown-header-face :inherit 'bold :foreground red)
|
|
||||||
((markdown-code-face &override) :background (doom-lighten base3 0.05))
|
|
||||||
;;;; org-mode
|
|
||||||
(org-block :background (doom-darken bg 0.05 ) :extend t)
|
|
||||||
(org-code :background (doom-darken bg 0.05 ) :extend t)
|
|
||||||
;;;; rjsx-mode
|
|
||||||
(rjsx-tag :foreground red)
|
|
||||||
(rjsx-attr :foreground orange)
|
|
||||||
;;;; solaire-mode
|
|
||||||
(solaire-mode-line-face
|
|
||||||
:inherit 'mode-line
|
|
||||||
:background modeline-bg-alt
|
|
||||||
:box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
|
|
||||||
(solaire-mode-line-inactive-face
|
|
||||||
:inherit 'mode-line-inactive
|
|
||||||
:background modeline-bg-inactive-alt
|
|
||||||
:box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt))))
|
|
||||||
|
|
||||||
;;;; Base theme variable overrides-
|
|
||||||
())
|
|
||||||
|
|
||||||
;;; doom-stylix-theme.el ends here
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
home.packages = [
|
|
||||||
inputs.emacsng.packages.${pkgs.system}.emacsngWRPgtk
|
|
||||||
pkgs.source-code-pro
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
# THIS DOES NOT WORK YET!
|
|
||||||
{ stdenv, pkgs, ... }:
|
|
||||||
|
|
||||||
let name = "rogauracore";
|
|
||||||
owner = "wroberts";
|
|
||||||
version = "1.6";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
inherit name owner version;
|
|
||||||
src = fetchTarball {
|
|
||||||
url = "https://github.com/"+owner+"/"+name+"/releases/download/"+version+"/rogauracore-"+version+".tar.gz";
|
|
||||||
sha256 = "0vpypcq71yv0v8vbgpkn8xy77j22g55aw6i83s30mpbpjjna2lm9";
|
|
||||||
};
|
|
||||||
buildInputs = [ pkgs.udev
|
|
||||||
pkgs.libusb
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
{ inputs, config, lib, pkgs, userSettings, systemSettings, pkgs-nwg-dock-hyprland, ... }: let
|
{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }: let
|
||||||
pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@ -109,7 +109,6 @@ in
|
|||||||
bind=SUPERSHIFT,T,exec,screenshot-ocr
|
bind=SUPERSHIFT,T,exec,screenshot-ocr
|
||||||
bind=CTRLALT,Delete,exec,hyprctl kill
|
bind=CTRLALT,Delete,exec,hyprctl kill
|
||||||
bind=SUPERSHIFT,K,exec,hyprctl kill
|
bind=SUPERSHIFT,K,exec,hyprctl kill
|
||||||
bind=SUPER,W,exec,nwg-dock-wrapper
|
|
||||||
|
|
||||||
bind=,code:172,exec,lollypop -t
|
bind=,code:172,exec,lollypop -t
|
||||||
bind=,code:208,exec,lollypop -t
|
bind=,code:208,exec,lollypop -t
|
||||||
@ -420,24 +419,23 @@ in
|
|||||||
rustPlatform = oldAttrs.rustPlatform // {
|
rustPlatform = oldAttrs.rustPlatform // {
|
||||||
buildRustPackage = args: oldAttrs.rustPlatform.buildRustPackage (args // {
|
buildRustPackage = args: oldAttrs.rustPlatform.buildRustPackage (args // {
|
||||||
pname = "hyprnome";
|
pname = "hyprnome";
|
||||||
version = "unstable-2024-05-06";
|
version = "0.3.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "donovanglover";
|
owner = "donovanglover";
|
||||||
repo = "hyprnome";
|
repo = "hyprnome";
|
||||||
rev = "f185e6dbd7cfcb3ecc11471fab7d2be374bd5b28";
|
rev = "a4597387e777fde8f8a79090cce418843e5b85d1";
|
||||||
hash = "sha256-tmko/bnGdYOMTIGljJ6T8d76NPLkHAfae6P6G2Aa2Qo=";
|
hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM=";
|
||||||
};
|
};
|
||||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs: rec {
|
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs: rec {
|
||||||
name = "${pname}-vendor.tar.gz";
|
name = "${pname}-vendor.tar.gz";
|
||||||
inherit src;
|
inherit src;
|
||||||
outputHash = "sha256-cQwAGNKTfJTnXDI3IMJQ2583NEIZE7GScW7TsgnKrKs=";
|
outputHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10=";
|
||||||
});
|
});
|
||||||
cargoHash = "sha256-cQwAGNKTfJTnXDI3IMJQ2583NEIZE7GScW7TsgnKrKs=";
|
cargoHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10=";
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
gnome.zenity
|
|
||||||
wlr-randr
|
wlr-randr
|
||||||
wtype
|
wtype
|
||||||
ydotool
|
ydotool
|
||||||
@ -472,15 +470,6 @@ in
|
|||||||
tesseract $imgname $txtname;
|
tesseract $imgname $txtname;
|
||||||
wl-copy -n < $txtfname
|
wl-copy -n < $txtfname
|
||||||
'')
|
'')
|
||||||
(pkgs.writeScriptBin "nwg-dock-wrapper" ''
|
|
||||||
#!/bin/sh
|
|
||||||
if pgrep -x ".nwg-dock-hyprl" > /dev/null
|
|
||||||
then
|
|
||||||
nwg-dock-hyprland
|
|
||||||
else
|
|
||||||
nwg-dock-hyprland -f -x -i 64 -nolauncher -a start -ml 8 -mr 8 -mb 8
|
|
||||||
fi
|
|
||||||
'')
|
|
||||||
(pkgs.writeScriptBin "sct" ''
|
(pkgs.writeScriptBin "sct" ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
killall wlsunset &> /dev/null;
|
killall wlsunset &> /dev/null;
|
||||||
@ -509,74 +498,12 @@ in
|
|||||||
if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null;
|
if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null;
|
||||||
then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi
|
then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi
|
||||||
'')
|
'')
|
||||||
])
|
|
||||||
++
|
|
||||||
(with pkgs-hyprland; [ ])
|
|
||||||
++ (with pkgs-nwg-dock-hyprland; [
|
|
||||||
(nwg-dock-hyprland.overrideAttrs (oldAttrs: {
|
|
||||||
patches = ./patches/noactiveclients.patch;
|
|
||||||
}))
|
|
||||||
]);
|
]);
|
||||||
home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source =
|
home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source =
|
||||||
config.lib.stylix.colors {
|
config.lib.stylix.colors {
|
||||||
template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache;
|
template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache;
|
||||||
extension = "svg";
|
extension = "svg";
|
||||||
};
|
};
|
||||||
home.file.".config/nwg-dock-hyprland/style.css".text = ''
|
|
||||||
window {
|
|
||||||
background: rgba(''+config.lib.stylix.colors.base00-rgb-r+'',''+config.lib.stylix.colors.base00-rgb-g+'',''+config.lib.stylix.colors.base00-rgb-b+'',0.0);
|
|
||||||
border-radius: 20px;
|
|
||||||
padding: 4px;
|
|
||||||
margin-left: 4px;
|
|
||||||
margin-right: 4px;
|
|
||||||
border-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#box {
|
|
||||||
/* Define attributes of the box surrounding icons here */
|
|
||||||
padding: 10px;
|
|
||||||
background: rgba(''+config.lib.stylix.colors.base00-rgb-r+'',''+config.lib.stylix.colors.base00-rgb-g+'',''+config.lib.stylix.colors.base00-rgb-b+'',0.55);
|
|
||||||
border-radius: 20px;
|
|
||||||
padding: 4px;
|
|
||||||
margin-left: 4px;
|
|
||||||
margin-right: 4px;
|
|
||||||
border-style: none;
|
|
||||||
}
|
|
||||||
button {
|
|
||||||
border-radius: 10px;
|
|
||||||
padding: 4px;
|
|
||||||
margin-left: 4px;
|
|
||||||
margin-right: 4px;
|
|
||||||
background: rgba(''+config.lib.stylix.colors.base03-rgb-r+'',''+config.lib.stylix.colors.base03-rgb-g+'',''+config.lib.stylix.colors.base03-rgb-b+'',0.55);
|
|
||||||
color: #''+config.lib.stylix.colors.base07+'';
|
|
||||||
font-size: 12px
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
|
||||||
background: rgba(''+config.lib.stylix.colors.base04-rgb-r+'',''+config.lib.stylix.colors.base04-rgb-g+'',''+config.lib.stylix.colors.base04-rgb-b+'',0.55);
|
|
||||||
}
|
|
||||||
|
|
||||||
'';
|
|
||||||
home.file.".config/nwg-dock-pinned".text = ''
|
|
||||||
nwggrid
|
|
||||||
Alacritty
|
|
||||||
neovide
|
|
||||||
qutebrowser
|
|
||||||
brave-browser
|
|
||||||
writer
|
|
||||||
impress
|
|
||||||
calc
|
|
||||||
draw
|
|
||||||
krita
|
|
||||||
xournalpp
|
|
||||||
obs
|
|
||||||
kdenlive
|
|
||||||
flstudio
|
|
||||||
blender
|
|
||||||
openscad
|
|
||||||
Cura
|
|
||||||
virt-manager
|
|
||||||
'';
|
|
||||||
home.file.".config/hypr/hypridle.conf".text = ''
|
home.file.".config/hypr/hypridle.conf".text = ''
|
||||||
general {
|
general {
|
||||||
lock_cmd = pgrep hyprlock || hyprlock
|
lock_cmd = pgrep hyprlock || hyprlock
|
||||||
|
|||||||
Reference in New Issue
Block a user