This commit is contained in:
zack 2024-10-16 15:40:35 -04:00
parent be89c2a2e0
commit 27699896bf
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
11 changed files with 467 additions and 167 deletions

452
flake.lock generated
View file

@ -165,6 +165,26 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1729013905,
"narHash": "sha256-0D95N5nsfvQAg4RjMgTgTdubMZMUQgodSqgc3KiLRo4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "e4a692efda41fb5afdfd961bf36cd9c73cbd5307",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -181,6 +201,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_10": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -277,6 +313,22 @@
} }
}, },
"flake-compat_8": { "flake-compat_8": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_9": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -436,7 +488,26 @@
}, },
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5" "flake-utils": "flake-utils_6"
},
"locked": {
"lastModified": 1715533576,
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
}
},
"flake-utils-plus_2": {
"inputs": {
"flake-utils": "flake-utils_7"
}, },
"locked": { "locked": {
"lastModified": 1715533576, "lastModified": 1715533576,
@ -455,43 +526,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_6"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_10"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
@ -507,9 +542,81 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_10"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_13" "systems": "systems_11"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"inputs": {
"systems": "systems_14"
},
"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_7": {
"inputs": {
"systems": "systems_15"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -668,16 +775,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1728903686,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -718,7 +825,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1727257269, "lastModified": 1727257269,
@ -742,9 +849,9 @@
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_7", "systems": "systems_8",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
@ -952,7 +1059,7 @@
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -976,7 +1083,7 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
@ -1000,14 +1107,14 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1728886882, "lastModified": 1728972634,
"narHash": "sha256-cdvOC7opKjAJyX9n1WZJei/j0RTuhVOJoJBfeWrHKWQ=", "narHash": "sha256-FrJPsAhfn3xRzzAgVrwriY0ROUIQ6pDsSy2U7nVkYFQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "19773b896a25b0bf9cc113bd9709c1783b94485b", "rev": "3454a11f09673a73649b5e8d9be5547f03320780",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1019,11 +1126,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728817913, "lastModified": 1728948853,
"narHash": "sha256-yPj2pPBLtKY/YqjY/iWC8fmU2LRdUBrIO5dcLpNPy6s=", "narHash": "sha256-IfCfZ4k8foOFOqSHxC0QW7NZx8bXDH2ruySZN4Gqqng=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "36890824c7edb7bc5458062c14efbfa0b1d280b5", "rev": "4846bf05dc639592c73135fb6f1a69f410c1c40f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1036,7 +1143,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_5",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_9",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@ -1155,6 +1262,22 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1728740863,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1720386169, "lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
@ -1170,7 +1293,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1678872516, "lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
@ -1207,14 +1330,14 @@
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs", "nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1728937293, "lastModified": 1729019070,
"narHash": "sha256-a3Q/x62NKMRb5gzyLV+ed1LUHNrI7KwGdt48NzpHvoM=", "narHash": "sha256-vObr6ejeV0zBFkhU3QhNPDLZ+f7PvQIw9Ebwwe5EzoA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "85bd1a4969ddee56ba1ddff7ebbd654754bd7e9d", "rev": "de826e69cd303aff6f8238624a5bf608784fa764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1224,6 +1347,22 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1712883908, "lastModified": 1712883908,
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
@ -1239,7 +1378,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_11": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1718428119, "lastModified": 1718428119,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
@ -1255,7 +1394,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1727348695, "lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@ -1304,6 +1443,22 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
@ -1319,7 +1474,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1706487304, "lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -1335,7 +1490,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1728538411, "lastModified": 1728538411,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
@ -1351,23 +1506,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1728740863, "lastModified": 1728888510,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1723221148,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
@ -1383,22 +1538,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pnpm2nix": { "pnpm2nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -1426,7 +1565,7 @@
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1728092656, "lastModified": 1728092656,
@ -1457,7 +1596,7 @@
"lanzaboote", "lanzaboote",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1681413034, "lastModified": 1681413034,
@ -1475,8 +1614,8 @@
}, },
"resume": { "resume": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_11",
"systems": "systems_11" "systems": "systems_12"
}, },
"locked": { "locked": {
"lastModified": 1728529264, "lastModified": 1728529264,
@ -1499,14 +1638,14 @@
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_3", "rust-overlay": "rust-overlay_3",
"systems": "systems_12" "systems": "systems_13"
}, },
"locked": { "locked": {
"lastModified": 1728812803, "lastModified": 1728990091,
"narHash": "sha256-KExQB86nQSnKRlXjSOjWm6LEsz80pruFDXjLkuiDBcY=", "narHash": "sha256-VXrLOh5VUDlOm6Eiyv+b4SD7vEYiwjYmpjXoyowyWVI=",
"owner": "raphamorim", "owner": "raphamorim",
"repo": "rio", "repo": "rio",
"rev": "634d9598adb4aa4142c667336ba525a8e872126e", "rev": "2231e255d82bbff8155594ba00f383070f292e7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1522,6 +1661,7 @@
"anyrun": "anyrun", "anyrun": "anyrun",
"blog": "blog", "blog": "blog",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"emacs-overlay": "emacs-overlay",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hypridle": "hypridle", "hypridle": "hypridle",
"hyprland": "hyprland", "hyprland": "hyprland",
@ -1529,22 +1669,23 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_8",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"resume": "resume", "resume": "resume",
"rio-term": "rio-term", "rio-term": "rio-term",
"snowfall-lib": "snowfall-lib", "snowfall-lib": "snowfall-lib",
"solaar": "solaar",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"systems": "systems_14", "systems": "systems_16",
"waybar": "waybar", "waybar": "waybar",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1709259239, "lastModified": 1709259239,
@ -1587,7 +1728,7 @@
}, },
"rust-overlay_3": { "rust-overlay_3": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1728700003, "lastModified": 1728700003,
@ -1625,19 +1766,66 @@
"type": "github" "type": "github"
} }
}, },
"spicetify-nix": { "snowfall-lib_2": {
"inputs": {
"flake-compat": "flake-compat_8",
"flake-utils-plus": "flake-utils-plus_2",
"nixpkgs": [
"solaar",
"nixpkgs"
]
},
"locked": {
"lastModified": 1718097323,
"narHash": "sha256-zCgs8Wp7rdt0tjNUHMUIvi6sIvDoprWIHwvTGq+LMK0=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "aa19b02b63025263cec041fcb7a0857c3cb98859",
"type": "github"
},
"original": {
"owner": "snowfallorg",
"ref": "v3.0.3",
"repo": "lib",
"type": "github"
}
},
"solaar": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"nixpkgs": [
"nixpkgs"
],
"snowfall-lib": "snowfall-lib_2"
},
"locked": {
"lastModified": 1727251262,
"narHash": "sha256-JRfiTyNEVaf1lpH23zLP6zy8UmNMkJP5+Bi05hmUdT0=",
"owner": "Svenum",
"repo": "Solaar-Flake",
"rev": "4fd4db68701d7c96f7b81f3606fe8f5ada572c41",
"type": "github"
},
"original": {
"owner": "Svenum",
"ref": "main",
"repo": "Solaar-Flake",
"type": "github"
}
},
"spicetify-nix": {
"inputs": {
"flake-compat": "flake-compat_9",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1728879439, "lastModified": 1728965841,
"narHash": "sha256-spvD0mgjj0xMv4qinSl5lxGLe8V8JAeIWNs0HF0i3kE=", "narHash": "sha256-IwFh7KUJ9saIONcklEkXR3ANtGxkZsNdtpeT6eyF01Q=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "c3463a8497fef3150aa8635d32b61b16e17a1e6b", "rev": "3dfd050f21568902449939f085e8d1aa28fb9913",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1692,7 +1880,6 @@
} }
}, },
"systems_12": { "systems_12": {
"flake": false,
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1708,6 +1895,7 @@
} }
}, },
"systems_13": { "systems_13": {
"flake": false,
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1737,6 +1925,36 @@
"type": "github" "type": "github"
} }
}, },
"systems_15": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_16": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -1799,16 +2017,16 @@
}, },
"systems_6": { "systems_6": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1681028828,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"type": "github" "type": "github"
} }
}, },
@ -1829,16 +2047,16 @@
}, },
"systems_8": { "systems_8": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1689347949,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"type": "github" "type": "github"
} }
}, },
@ -1881,7 +2099,7 @@
}, },
"waybar": { "waybar": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_10",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1943,7 +2161,7 @@
}, },
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1727721329, "lastModified": 1727721329,

View file

@ -11,14 +11,16 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay.url = "github:nix-community/emacs-overlay";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
resume.url = "git+https://git.zoeys.computer/zoey/resume"; resume.url = "git+https://git.zoeys.computer/zoey/resume";
@ -140,6 +142,7 @@
catppuccin.nixosModules.catppuccin catppuccin.nixosModules.catppuccin
blog.nixosModule blog.nixosModule
agenix.nixosModules.default agenix.nixosModules.default
solaar.nixosModules.default
]; ];
}; };
} }

View file

@ -17,12 +17,13 @@
tools.direnv.enable = true; tools.direnv.enable = true;
tools.tealdeer.enable = true; tools.tealdeer.enable = true;
tools.bat.enable = true; tools.bat.enable = true;
tools.emacs.enable = true;
tools.gh.enable = true; tools.gh.enable = true;
term.kitty.enable = true; term.kitty.enable = true;
term.foot.enable = true; term.foot.enable = true;
term.rio.enable = true; # term.rio.enable = true;
term.alacritty.enable = true; term.alacritty.enable = true;
music.spotify.enable = true; music.spotify.enable = true;

View file

@ -0,0 +1,71 @@
{
lib,
inputs,
config,
pkgs,
...
}:
with lib;
with lib.custom; let
cfg = config.apps.tools.emacs;
emacs = with pkgs;
(emacsPackagesFor
emacs30-pgtk)
.emacsWithPackages (epkgs:
with epkgs; [
treesit-grammars.with-all-grammars
vterm
mu4e
]);
in {
options.apps.tools.emacs = {
enable = mkBoolOpt false "Enable Emacs";
# doom = rec {
# enable = mkBoolOpt false;
# forgeUrl = mkOpt types.str "https://github.com";
# repoUrl = mkOpt types.str "${forgeUrl}/doomemacs/doomemacs";
# configRepoUrl = mkOpt types.str "${forgeUrl}/hlissner/.doom.d";
# };
};
config = mkIf cfg.enable {
nixpkgs.overlays = [
inputs.emacs-overlay.overlays.default
];
home.packages = with pkgs; [
## Emacs itself
binutils # native-comp needs 'as', provided by this
emacs # HEAD + native-comp
## Doom dependencies
git
ripgrep
gnutls # for TLS connectivity
## Optional dependencies
fd # faster projectile indexing
imagemagick # for image-dired
pinentry-emacs
zstd # for undo-fu-session/undo-tree compression
## Module dependencies
# :email mu4e
mu
isync
# :checkers spell
(aspellWithDicts (ds: with ds; [en en-computers en-science]))
# :tools editorconfig
editorconfig-core-c # per-project style config
# :tools lookup & :lang org +roam
sqlite
# :lang latex & :lang org (latex previews)
texlive.combined.scheme-medium
# :lang beancount
beancount
fava
# :lang nix
age
];
};
}

View file

@ -25,43 +25,44 @@ return {
}, },
}, },
}, },
-- { { "hrsh7th/nvim-cmp", enabled = false },
-- "saghen/blink.cmp", {
-- lazy = false, -- lazy loading handled internally "saghen/blink.cmp",
-- -- optional: provides snippets for the snippet source lazy = false, -- lazy loading handled internally
-- dependencies = "rafamadriz/friendly-snippets", -- optional: provides snippets for the snippet source
-- dependencies = "rafamadriz/friendly-snippets",
-- -- use a release tag to download pre-built binaries
-- version = "v0.*", -- use a release tag to download pre-built binaries
-- -- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust version = "v0.*",
-- -- build = 'cargo build --release', -- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-- -- build = 'cargo build --release',
-- opts = {
-- keymap = { opts = {
-- show = "<C-S-space>", keymap = {
-- accept = "<Enter>", show = "<C-S-space>",
-- select_prev = { "<S-Tab>", "<C-j>" }, accept = "<Enter>",
-- select_next = { "<C-Tab>", "<C-k>" }, select_prev = { "<S-Tab>", "<C-j>" },
-- select_next = { "<C-Tab>", "<C-k>" },
-- snippet_forward = "<Tab>",
-- snippet_backward = "<C-S-Tab>", snippet_forward = "<Tab>",
-- }, snippet_backward = "<C-S-Tab>",
-- },
-- highlight = {
-- -- sets the fallback highlight groups to nvim-cmp's highlight groups highlight = {
-- -- useful for when your theme doesn't support blink.cmp -- sets the fallback highlight groups to nvim-cmp's highlight groups
-- -- will be removed in a future release, assuming themes add support -- useful for when your theme doesn't support blink.cmp
-- use_nvim_cmp_as_default = true, -- will be removed in a future release, assuming themes add support
-- }, use_nvim_cmp_as_default = true,
-- -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' },
-- -- adjusts spacing to ensure icons are aligned -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-- nerd_font_variant = "normal", -- adjusts spacing to ensure icons are aligned
-- nerd_font_variant = "normal",
-- -- experimental auto-brackets support
-- -- accept = { auto_brackets = { enabled = true } } -- experimental auto-brackets support
-- -- accept = { auto_brackets = { enabled = true } }
-- -- experimental signature help support
-- -- trigger = { signature_help = { enabled = true } } -- experimental signature help support
-- }, -- trigger = { signature_help = { enabled = true } }
-- }, },
},
} }

View file

@ -40,13 +40,12 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ home.packages = [
pkgs-unstable.xwayland pkgs.xwayland
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
systemd = { systemd = {
enable = true; enable = true;
@ -171,6 +170,10 @@ in {
force_zero_scaling = true; force_zero_scaling = true;
}; };
cursor = {
no_hardware_cursors = true;
};
monitor = ["DP-1,2560x1440@240,0x0,1,bitdepth,10" "HDMI-A-1,disable" "DP-2,disable"]; monitor = ["DP-1,2560x1440@240,0x0,1,bitdepth,10" "HDMI-A-1,disable" "DP-2,disable"];
layerrule = [ layerrule = [

View file

@ -44,7 +44,7 @@ in {
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = pkgs-unstable.linuxPackages_zen.nvidiaPackages.latest; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
environment.variables = { environment.variables = {

View file

@ -72,7 +72,8 @@ in {
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-wlr
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland # inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-hyprland
pkgs.xwaylandvideobridge pkgs.xwaylandvideobridge
]; ];
}; };

View file

@ -151,7 +151,7 @@
in in
buildStdenv.mkDerivation rec { buildStdenv.mkDerivation rec {
pname = "zen-browser-unwrapped"; pname = "zen-browser-unwrapped";
version = "1.0.1-a.8"; version = "1.0.1-a.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zen-browser"; owner = "zen-browser";
@ -159,13 +159,13 @@ in
rev = "${version}"; rev = "${version}";
leaveDotGit = true; leaveDotGit = true;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-88/9IX3YCrbVdcp9uiz713T5b4WigJf1NkZeINWGkzM="; hash = "sha256-C08mouHUTSwiF/nNZ4T0A+33121ERWUOyCw6LMNTWQc=";
}; };
firefoxVersion = (lib.importJSON "${src}/surfer.json").version.version; firefoxVersion = (lib.importJSON "${src}/surfer.json").version.version;
firefoxSrc = fetchurl { firefoxSrc = fetchurl {
url = "mirror://mozilla/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.xz";
hash = "sha256-BA6DSslN1SRvnXemb3tDxDxi9TjQC1+UWXU03B23dhY="; hash = "sha256-en3z+Xc3RT76okPKnbr5XQ8PgzxdyK+stXBO4W7wYNA=";
}; };
SURFER_COMPAT = generic; SURFER_COMPAT = generic;

View file

@ -43,6 +43,7 @@
services.vpn.enable = true; services.vpn.enable = true;
services.xserver.enable = true; services.xserver.enable = true;
services.vpn.mullvad = true; services.vpn.mullvad = true;
services.lorri.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
services.transmission = { services.transmission = {
enable = true; enable = true;
@ -81,7 +82,7 @@
boot.kernelPackages = lib.custom.pkgs-unstable.linuxPackages_zen; boot.kernelPackages = lib.custom.pkgs-unstable.linuxPackages_zen;
boot.supportedFilesystems = ["ntfs"]; boot.supportedFilesystems = ["ntfs"];
services.dlna.enable = true; services.dlna.enable = false;
# services.openssh = { # services.openssh = {
# enable = true; # enable = true;
# PasswordAuthentication = true; # PasswordAuthentication = true;

View file

@ -36,6 +36,7 @@
services.web.nginx.enable = true; services.web.nginx.enable = true;
services.gh.enable = true; services.gh.enable = true;
services.fail2ban.enable = true;
sites = { sites = {
cv.enable = true; cv.enable = true;
gitlab.enable = true; gitlab.enable = true;