Compare commits
3 commits
mainline
...
amd-pmf-de
| Author | SHA1 | Date | |
|---|---|---|---|
| b042e2db5c | |||
| 1bb42d4c1b | |||
| 1d8de843af |
41 changed files with 932 additions and 2638 deletions
|
|
@ -1 +0,0 @@
|
|||
ce54be9aac846c7798307d6d6fcee3346c01f601
|
||||
674
LICENSE
674
LICENSE
|
|
@ -1,674 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
|
|
@ -1,25 +1,20 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inputs = config.inputInjection.flake-inputs;
|
||||
unstable = inputs.nixos-unstable;
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./packages.nix
|
||||
./nitrokey.nix
|
||||
./nix-settings.nix
|
||||
./upgrade-diff.nix
|
||||
./guest.nix
|
||||
];
|
||||
imports =
|
||||
[
|
||||
./packages.nix
|
||||
./nitrokey.nix
|
||||
];
|
||||
|
||||
services.davfs2.enable = true;
|
||||
|
||||
|
||||
# exfat support
|
||||
#boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
|
||||
|
||||
|
|
@ -28,6 +23,7 @@ in
|
|||
|
||||
# configure console
|
||||
console = {
|
||||
font = "Lat2-Terminus16";
|
||||
keyMap = "de";
|
||||
};
|
||||
|
||||
|
|
@ -41,22 +37,18 @@ in
|
|||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
programs.bash.completion.enable = true;
|
||||
programs.wireshark = {
|
||||
enable = true;
|
||||
package = pkgs.wireshark;
|
||||
};
|
||||
programs.bash.enableCompletion = true;
|
||||
programs.wireshark =
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.wireshark;
|
||||
};
|
||||
|
||||
programs.adb.enable = true;
|
||||
|
||||
programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
||||
|
||||
programs.ausweisapp = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
|
|
@ -67,6 +59,9 @@ in
|
|||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
|
||||
networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; # for KDE connect
|
||||
# FIXME: kdeconnect module
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
|
|
@ -74,127 +69,109 @@ in
|
|||
enable = true;
|
||||
# FIXME: move into own file, use SOPS for secrets
|
||||
ensureProfiles.profiles = {
|
||||
"37C3" = {
|
||||
connection = {
|
||||
id = "37C3";
|
||||
type = "wifi";
|
||||
interface-name = "wlan0";
|
||||
};
|
||||
wifi = {
|
||||
mode = "infrastructure";
|
||||
ssid = "37C3";
|
||||
};
|
||||
wifi-security = {
|
||||
auth-alg = "open";
|
||||
key-mgmt = "wpa-eap";
|
||||
};
|
||||
"802-1x" = {
|
||||
anonymous-identity = "37C3";
|
||||
eap = "ttls;";
|
||||
identity = "37C3";
|
||||
password = "37C3";
|
||||
phase2-auth = "pap";
|
||||
altsubject-matches = "DNS:radius.c3noc.net";
|
||||
ca-cert = "${builtins.fetchurl {
|
||||
url = "https://letsencrypt.org/certs/isrgrootx1.pem";
|
||||
sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
|
||||
}}";
|
||||
};
|
||||
ipv4 = {
|
||||
method = "auto";
|
||||
};
|
||||
ipv6 = {
|
||||
addr-gen-mode = "default";
|
||||
method = "auto";
|
||||
};
|
||||
"37C3" = {
|
||||
connection = {
|
||||
id = "37C3";
|
||||
type = "wifi";
|
||||
interface-name = "wlan0";
|
||||
};
|
||||
wifi = {
|
||||
mode = "infrastructure";
|
||||
ssid = "37C3";
|
||||
};
|
||||
wifi-security = {
|
||||
auth-alg = "open";
|
||||
key-mgmt = "wpa-eap";
|
||||
};
|
||||
"802-1x" = {
|
||||
anonymous-identity = "37C3";
|
||||
eap = "ttls;";
|
||||
identity = "37C3";
|
||||
password = "37C3";
|
||||
phase2-auth = "pap";
|
||||
altsubject-matches = "DNS:radius.c3noc.net";
|
||||
ca-cert = "${builtins.fetchurl {
|
||||
url = "https://letsencrypt.org/certs/isrgrootx1.pem";
|
||||
sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
|
||||
}}";
|
||||
};
|
||||
ipv4 = {
|
||||
method = "auto";
|
||||
};
|
||||
ipv6 = {
|
||||
addr-gen-mode = "default";
|
||||
method = "auto";
|
||||
};
|
||||
};
|
||||
plugins = with pkgs; [
|
||||
networkmanager-openvpn
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.avahi.enable = true;
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = [ pkgs.hplip ];
|
||||
};
|
||||
services.printing =
|
||||
{
|
||||
enable = true;
|
||||
drivers = [ pkgs.hplip ];
|
||||
};
|
||||
# scanners
|
||||
hardware.sane = {
|
||||
hardware.sane =
|
||||
{
|
||||
enable = true;
|
||||
extraBackends = [ pkgs.hplip ];
|
||||
};
|
||||
|
||||
# Enable sound.
|
||||
hardware.pulseaudio = {
|
||||
enable = true;
|
||||
extraBackends = [ pkgs.hplip ];
|
||||
# decouple pulseaudio application and sink volumes
|
||||
daemon.config = { flat-volumes = "no"; };
|
||||
# C3D2 hq music
|
||||
zeroconf.discovery.enable = true;
|
||||
zeroconf.publish.enable = true;
|
||||
};
|
||||
|
||||
|
||||
# Bluetooth
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.Disable = "Headset"; # disable headset profile
|
||||
};
|
||||
hardware.pulseaudio = {
|
||||
package = pkgs.pulseaudioFull;
|
||||
};
|
||||
|
||||
|
||||
# FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
xkb.layout = "de";
|
||||
xkb.options = "eurosign:e";
|
||||
};
|
||||
services.xserver.enable = true;
|
||||
services.xserver.layout = "de";
|
||||
services.xserver.xkbOptions = "eurosign:e";
|
||||
|
||||
# Enable touchpad support.
|
||||
services.libinput.enable = true;
|
||||
services.xserver.libinput.enable = true;
|
||||
|
||||
# while libinput also supports graphic tablets, enable more-specific wacom driver
|
||||
services.xserver.wacom.enable = true;
|
||||
|
||||
# Enable the KDE Desktop Environment.
|
||||
services.displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
# TODO: move out into a plasma.nix module
|
||||
programs.kde-pim = {
|
||||
enable = true;
|
||||
kmail = true;
|
||||
kontact = true;
|
||||
merkuro = true;
|
||||
};
|
||||
# additional standalone versions of kontact components
|
||||
environment.systemPackages = with pkgs.kdePackages; [
|
||||
korganizer
|
||||
kaddressbook
|
||||
pkgs.ktimetracker
|
||||
];
|
||||
programs.kdeconnect.enable = true;
|
||||
# enable wayland for Chromium and Electron
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
services.xserver.displayManager.sddm.enable = true;
|
||||
services.xserver.desktopManager.plasma5.enable = true;
|
||||
|
||||
# dconf required for several Gnome applications
|
||||
programs.dconf.enable = true;
|
||||
|
||||
programs.firefox.enable = true; # enables support for automatically setting additionsl nativeMessagingHosts
|
||||
programs.firefox.enable = true; # enables support for automatically setting additionsl nativeMessagingHosts
|
||||
|
||||
# Flatpak support
|
||||
services.flatpak.enable = true;
|
||||
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
|
||||
|
||||
# Define a user account. Don't forget to set a password with `passwd`.
|
||||
users.users.spiollinux = {
|
||||
isNormalUser = true;
|
||||
uid = 1000;
|
||||
extraGroups = [
|
||||
"vboxusers"
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
"scanner"
|
||||
"lp"
|
||||
"wireshark"
|
||||
"dialout"
|
||||
"cdrom"
|
||||
"input"
|
||||
"adbusers"
|
||||
];
|
||||
extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" "input" "adbusers" ];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
|
|
@ -207,10 +184,11 @@ in
|
|||
nixpkgs.config.whitelistedLicenses = [ pkgs.lib.licenses.virtualbox-puel ];
|
||||
users.extraGroups.vboxusers.members = [ "spiollinux" ];
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
autosuggestions.enable = true;
|
||||
};
|
||||
programs.zsh =
|
||||
{
|
||||
enable = true;
|
||||
autosuggestions.enable = true;
|
||||
};
|
||||
|
||||
# profile sync daemon
|
||||
services.psd.enable = true;
|
||||
|
|
@ -224,9 +202,23 @@ in
|
|||
# Enable all sysrq functions (useful to recover from some issues):
|
||||
boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
|
||||
|
||||
nix.package = pkgs.lix;
|
||||
|
||||
nix.settings.trusted-users = [ "spiollinux" ];
|
||||
nix = {
|
||||
# expose all flake inputs through nix Path and registry
|
||||
registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // {
|
||||
nixpkgs.flake = inputs.nixpkgs;
|
||||
};
|
||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||
# keep build-time deps around for offline-rebuilding
|
||||
settings = {
|
||||
# keep around all inputs necessary for offline-rebuilding the system
|
||||
keep-outputs = true;
|
||||
keep-derivations = true;
|
||||
trusted-users = [ "spiollinux" ];
|
||||
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
|
||||
# use all cores for building
|
||||
cores = 0;
|
||||
};
|
||||
};
|
||||
# override tmpdir for daemon
|
||||
#systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
|
||||
|
||||
|
|
@ -245,8 +237,7 @@ in
|
|||
# ];
|
||||
# }
|
||||
#];
|
||||
programs.ssh.knownHosts."build01.nix-community.org".publicKey =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H";
|
||||
programs.ssh.knownHosts."build01.nix-community.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H";
|
||||
|
||||
# package debugging
|
||||
# programs.sysdig.enable = true;
|
||||
|
|
@ -264,6 +255,5 @@ in
|
|||
# stop NetworkManager from managing virtual interfaces
|
||||
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
|
||||
|
||||
services.dbus.implementation = "broker";
|
||||
system.rebuild.enableNg = true;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inputs = config.inputInjection.flake-inputs;
|
||||
in
|
||||
{
|
||||
# interesting: this causes an infinite recursion
|
||||
#imports = [ config.inputInjection.flake-inputs.home-manager.nixosModules.home-manager ];
|
||||
|
||||
options.schmittlauch.guestUser.enable = lib.options.mkEnableOption "Provide a guest user account";
|
||||
|
||||
config = lib.mkIf config.schmittlauch.guestUser.enable {
|
||||
users.extraUsers.gast = {
|
||||
isNormalUser = true;
|
||||
group = "gast";
|
||||
hashedPassword = "$y$j9T$pPCjU8ZvVYo0aY4jtrHPj1$NxUWOP/YTcqJ1PYaP1Hy5MwTeDcNjg0k369R5rE5M48";
|
||||
};
|
||||
users.groups.gast = { };
|
||||
# a basic home-manager configuration to share installed packages of other accounts
|
||||
# reason: keeping a separate config checkout for guests and requiring them to run
|
||||
# their own `home-manager` instance does not make sense.
|
||||
home-manager =
|
||||
let
|
||||
gast = config.users.extraUsers.gast;
|
||||
in
|
||||
{
|
||||
useGlobalPkgs = false; # to allow usage of home-level overlays
|
||||
# FIXME: possibly expose home modules through flake outputs instead of brittle path traversals
|
||||
users.gast = {
|
||||
imports = [
|
||||
../home/modules/packages.nix
|
||||
];
|
||||
home = {
|
||||
username = gast.name;
|
||||
homeDirectory = gast.home;
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
schmittlauch = {
|
||||
packages = {
|
||||
graphics = true;
|
||||
multimedia = true;
|
||||
nixHelpers = true;
|
||||
devTools = true;
|
||||
pythonTools = true;
|
||||
games = true;
|
||||
desktopLinux = true;
|
||||
kde = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs system;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,11 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{ pkgs, lib, ...}:
|
||||
{
|
||||
hardware.nitrokey.enable = true;
|
||||
environment.systemPackages = [
|
||||
pkgs.pynitrokey
|
||||
pkgs.nitrokey-app2
|
||||
];
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"nrfutil"
|
||||
"pc-ble-driver-py"
|
||||
"pc-ble-driver"
|
||||
"pypemicro"
|
||||
];
|
||||
hardware.nitrokey.enable = true;
|
||||
environment.systemPackages = [ pkgs.pynitrokey ];
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"nrfutil"
|
||||
"pc-ble-driver-py"
|
||||
"pc-ble-driver"
|
||||
"pypemicro"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
# needs to be kept compatible to both NixOS and nix-darwin
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inputs = config.inputInjection.flake-inputs;
|
||||
unstable = inputs.nixos-unstable;
|
||||
in
|
||||
{
|
||||
nix = {
|
||||
# expose all flake inputs through nix Path and registry
|
||||
registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // {
|
||||
nixpkgs.flake = inputs.nixpkgs;
|
||||
};
|
||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||
};
|
||||
nix.settings = builtins.mapAttrs (_: lib.mkDefault) {
|
||||
# keep around all inputs necessary for offline-rebuilding the system
|
||||
keep-outputs = true;
|
||||
keep-derivations = true;
|
||||
trusted-users = [ "spiollinux" ];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
# use all cores for building
|
||||
cores = 0;
|
||||
#auto-optimise-store = true;
|
||||
};
|
||||
nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78
|
||||
# TODO: manage access token with sops instead of manual deployment
|
||||
# permissions: needs to be readable by the user invoking nix and root (for nix daemon)
|
||||
nix.extraOptions = ''
|
||||
!include /etc/nix/secrets.conf
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,20 +1,8 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ lib, pkgs, config, ... }:
|
||||
|
||||
{
|
||||
# take overlays from flake
|
||||
nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays;
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
# (temporarily) permit the usage of libolm
|
||||
"olm-3.2.16"
|
||||
# dependency of pynitrokey
|
||||
"python3.12-ecdsa-0.19.1"
|
||||
];
|
||||
|
||||
# List packages installed in system profile.
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
|
|
@ -42,7 +30,7 @@
|
|||
exfat
|
||||
iotop
|
||||
cifs-utils
|
||||
dool
|
||||
dstat
|
||||
lsof
|
||||
macchanger
|
||||
borgbackup
|
||||
|
|
@ -55,7 +43,47 @@
|
|||
networkmanager-openconnect
|
||||
networkmanager-vpnc
|
||||
networkmanager-openvpn
|
||||
plasma5Packages.kdeGear.akonadi-mime # for KOrganizer
|
||||
]
|
||||
++ (with plasma5Packages; with kdeGear; [
|
||||
#akonadi
|
||||
#akonadi-calendar
|
||||
#akonadi-contacts
|
||||
#akonadi-import-wizard
|
||||
#akonadi-mime
|
||||
#akonadi-notes
|
||||
#akonadi-search
|
||||
#akonadiconsole
|
||||
#akregator
|
||||
#kaddressbook
|
||||
#kalarm
|
||||
#kalarmcal
|
||||
#kcalutils
|
||||
#kcontacts
|
||||
#kdav
|
||||
#kdepim-addons
|
||||
|
||||
#kdepim-runtime
|
||||
#kidentitymanagement
|
||||
#kldap
|
||||
#kmail
|
||||
#kmailtransport
|
||||
#kmbox
|
||||
#kmime
|
||||
#kontact
|
||||
#kontactinterface
|
||||
#korganizer
|
||||
#kpimtextedit
|
||||
#libkdepim
|
||||
#libksieve
|
||||
#mailcommon
|
||||
#messagelib
|
||||
#pimcommon
|
||||
#pim-sieve-editor
|
||||
|
||||
# for some Flatpak packkages
|
||||
accountsservice
|
||||
];
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
# rtkit is optional but recommended
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
|
||||
wireplumber.configPackages = [
|
||||
(pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
|
||||
bluez_monitor.properties = {
|
||||
["bluez5.enable-sbc-xq"] = true,
|
||||
["bluez5.enable-msbc"] = true,
|
||||
["bluez5.enable-hw-volume"] = true,
|
||||
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
|
||||
}
|
||||
'')
|
||||
];
|
||||
};
|
||||
environment.systemPackages = [ pkgs.easyeffects ];
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
# Enable sound.
|
||||
services.pulseaudio = {
|
||||
enable = true;
|
||||
package = pkgs.pulseaudioFull;
|
||||
# decouple pulseaudio application and sink volumes
|
||||
daemon.config = {
|
||||
flat-volumes = "no";
|
||||
};
|
||||
# C3D2 hq music
|
||||
zeroconf.discovery.enable = true;
|
||||
zeroconf.publish.enable = true;
|
||||
};
|
||||
services.pipewire.enable = false; # conflicts otherwise
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# MIT Jörg Thalheim - https://github.com/Mic92/dotfiles/blob/c6cad4e57016945c4816c8ec6f0a94daaa0c3203/nixos/modules/upgrade-diff.nix
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
system.activationScripts.diff = ''
|
||||
if [[ -e /run/current-system ]]; then
|
||||
${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ../common/nix-settings.nix ];
|
||||
nix = {
|
||||
enable = true;
|
||||
settings = {
|
||||
trusted-users = [
|
||||
"os"
|
||||
"@admin"
|
||||
]; # @admin for linux-builder
|
||||
substituters = [
|
||||
"https://s3.whq.fcio.net/hydra"
|
||||
"https://hydra.flyingcircus.io"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o="
|
||||
];
|
||||
sandbox = "relaxed";
|
||||
};
|
||||
};
|
||||
|
||||
# List packages installed in system profile. To search by name, run:
|
||||
# $ nix-env -qaP | grep wget
|
||||
environment.systemPackages = [ pkgs.vim ];
|
||||
|
||||
# Use a custom configuration.nix location.
|
||||
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
|
||||
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
|
||||
|
||||
# Create /etc/bashrc that loads the nix-darwin environment.
|
||||
programs.zsh.enable = true; # default shell on catalina
|
||||
|
||||
# system-wide SSH configuration, used by nix-daemon for remote builders
|
||||
|
||||
# show hidden files
|
||||
system.primaryUser = "os";
|
||||
system.defaults.NSGlobalDomain.AppleShowAllFiles = true;
|
||||
|
||||
# Used for backwards compatibility, please read the changelog before changing.
|
||||
# $ darwin-rebuild changelog
|
||||
system.stateVersion = 4;
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
|
||||
# local vm-backed linux builder as background service
|
||||
nix.linux-builder = {
|
||||
enable = true;
|
||||
ephemeral = true;
|
||||
maxJobs = 3;
|
||||
};
|
||||
|
||||
}
|
||||
232
flake.lock
generated
232
flake.lock
generated
|
|
@ -1,12 +1,30 @@
|
|||
{
|
||||
"nodes": {
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"lanzaboote",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"lanzaboote",
|
||||
"rust-overlay"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754269165,
|
||||
"narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
|
||||
"lastModified": 1681177078,
|
||||
"narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "444e81206df3f7d92780680e45858e31d2f07a08",
|
||||
"rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -18,11 +36,11 @@
|
|||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -39,11 +57,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754091436,
|
||||
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
|
||||
"lastModified": 1680392223,
|
||||
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
|
||||
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -52,24 +70,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -82,11 +97,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"lastModified": 1660459072,
|
||||
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -102,16 +117,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764866045,
|
||||
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
|
||||
"lastModified": 1706981411,
|
||||
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
|
||||
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"ref": "release-23.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -121,33 +136,50 @@
|
|||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762205063,
|
||||
"narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",
|
||||
"lastModified": 1682802423,
|
||||
"narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",
|
||||
"rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "v0.4.3",
|
||||
"ref": "v0.3.0",
|
||||
"repo": "lanzaboote",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"logseq-fix-nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1707316439,
|
||||
"narHash": "sha256-3dVL8Wk7ECMiQrHVO1ys7FawMLo7iyQJyKG+aie1eaE=",
|
||||
"owner": "schmittlauch",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6f1431c8e2dfdfdfe25837c2cc94857900153cab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "schmittlauch",
|
||||
"ref": "backport2311-logseq-0.10.5",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mysecrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722419972,
|
||||
"narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=",
|
||||
"lastModified": 1618507998,
|
||||
"narHash": "sha256-i5ph7JlFh8eFEnQehQaKj2SGG7WLE0DPO8R81ERGCZ0=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04",
|
||||
"revCount": 5,
|
||||
"rev": "068a4759e72948284c3de85d20a780723278f8b8",
|
||||
"revCount": 2,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
|
||||
},
|
||||
|
|
@ -156,34 +188,13 @@
|
|||
"url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
|
||||
}
|
||||
},
|
||||
"nix-darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764161084,
|
||||
"narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "e95de00a471d07435e0527ff4db092c84998698e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "LnL7",
|
||||
"ref": "nix-darwin-25.11",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1764440730,
|
||||
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
||||
"lastModified": 1707211557,
|
||||
"narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
||||
"rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -195,11 +206,11 @@
|
|||
},
|
||||
"nixos-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1764950072,
|
||||
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
|
||||
"lastModified": 1707956935,
|
||||
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f61125a668a320878494449750330ca58b78c557",
|
||||
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -211,11 +222,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1754243818,
|
||||
"narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=",
|
||||
"lastModified": 1682741954,
|
||||
"narHash": "sha256-RPZxzRu8XU0YD2WeYUFYzJy5yAvWUsxkuK+zWw+6WVk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c",
|
||||
"rev": "373e9eb4c42b2fc0611d794de5ea715a35d72393",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -225,49 +236,45 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1764831616,
|
||||
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
|
||||
"lastModified": 1678872516,
|
||||
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
|
||||
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-22.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1764950072,
|
||||
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1707978831,
|
||||
"narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f61125a668a320878494449750330ca58b78c557",
|
||||
"rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765105806,
|
||||
"narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=",
|
||||
"lastModified": 1707071465,
|
||||
"narHash": "sha256-sp+lgTl440Ex3v8rB6hspMJhg5uuGVfO1LRba/a8kSY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "902c2223fc433b82d7149a33e1bb729fdba1a898",
|
||||
"rev": "abe9eb6d605d624e121d4f84749b47f7816f1686",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -282,18 +289,23 @@
|
|||
"lanzaboote",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750779888,
|
||||
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
||||
"lastModified": 1681413034,
|
||||
"narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
||||
"rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -306,29 +318,32 @@
|
|||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"logseq-fix-nixpkgs": "logseq-fix-nixpkgs",
|
||||
"mysecrets": "mysecrets",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-unstable": "nixos-unstable",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nur": "nur",
|
||||
"treefmt-nix": "treefmt-nix",
|
||||
"utils": "utils"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761791894,
|
||||
"narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
|
||||
"lastModified": 1682129965,
|
||||
"narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "59c45eb69d9222a4362673141e00ff77842cd219",
|
||||
"rev": "2c417c0460b788328220120c698630947547ee83",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -352,36 +367,31 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1762938485,
|
||||
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
250
flake.nix
250
flake.nix
|
|
@ -2,208 +2,96 @@
|
|||
description = "NixOS system flake";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||
logseq-fix-nixpkgs.url = "github:schmittlauch/nixpkgs/backport2311-logseq-0.10.5";
|
||||
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
lanzaboote = {
|
||||
url = "github:nix-community/lanzaboote/v0.4.3";
|
||||
url = "github:nix-community/lanzaboote/v0.3.0";
|
||||
# deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage
|
||||
};
|
||||
utils.url = "github:numtide/flake-utils";
|
||||
treefmt-nix = {
|
||||
url = "github:numtide/treefmt-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-darwin = {
|
||||
url = "github:LnL7/nix-darwin/nix-darwin-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nur.url = "github:nix-community/NUR";
|
||||
nur.url = "github:nix-community/NUR";
|
||||
# TODO: possible make this a flake as well
|
||||
mysecrets = {
|
||||
flake = false;
|
||||
url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
nur,
|
||||
lanzaboote,
|
||||
utils,
|
||||
home-manager,
|
||||
treefmt-nix,
|
||||
nix-darwin,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
# FIXME: allow different systems
|
||||
systems = utils.lib.system;
|
||||
|
||||
# ability to extend nixpkgs with patches, e.g. from PRs or staging. See https://ertt.ca/nix/patch-nixpkgs/
|
||||
mkNixpkgs-patched =
|
||||
system:
|
||||
(import nixpkgs { inherit system; }).applyPatches {
|
||||
name = "nixpkgs-patched";
|
||||
src = nixpkgs;
|
||||
patches = [ ];
|
||||
};
|
||||
|
||||
# necessary to make the top-level inputs available to system configuration
|
||||
# inspired by https://jade.fyi/blog/flakes-arent-real/
|
||||
inputInjection =
|
||||
{ pkgs, lib, ... }:
|
||||
{ self, nixpkgs, nur, lanzaboote, utils, home-manager, ... }@inputs:
|
||||
let
|
||||
# FIXME: allow different systems
|
||||
systems = utils.lib.system;
|
||||
# necessary to make the top-level inputs available to system configuration
|
||||
# inspired by https://jade.fyi/blog/flakes-arent-real/
|
||||
inputInjection = {pkgs, lib, ...}: {
|
||||
options.inputInjection = lib.mkOption {
|
||||
type = with lib.types; attrsOf unspecified;
|
||||
default = {};
|
||||
};
|
||||
config.inputInjection = {
|
||||
flake-inputs = inputs;
|
||||
};
|
||||
};
|
||||
defaultModules = system: [
|
||||
inputInjection
|
||||
];
|
||||
mkSystem = system: extraModules:
|
||||
nixpkgs.lib.nixosSystem rec {
|
||||
modules = (defaultModules system) ++ extraModules;
|
||||
inherit system;
|
||||
specialArgs = {inherit system;};
|
||||
};
|
||||
mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific
|
||||
# FIXME: this is thus still linux-x86_64 specific
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
modules = [
|
||||
{
|
||||
options.inputInjection = lib.mkOption {
|
||||
type = with lib.types; attrsOf unspecified;
|
||||
default = { };
|
||||
};
|
||||
config.inputInjection = {
|
||||
flake-inputs = inputs;
|
||||
};
|
||||
};
|
||||
defaultModules = system: [
|
||||
inputInjection
|
||||
|
||||
# for some reason, `imports`-ing the home-manager module via inputInjection
|
||||
# from a sub-module causes infinite recursion, so importing it here instead
|
||||
home-manager.nixosModules.home-manager
|
||||
];
|
||||
mkSystem =
|
||||
system: extraModules:
|
||||
nixpkgs.lib.nixosSystem rec {
|
||||
modules = (defaultModules system) ++ extraModules;
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit system;
|
||||
};
|
||||
};
|
||||
mkHomeManager =
|
||||
confName: user: system: # unfortunately, home-manager configs are still system-specific
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = import (mkNixpkgs-patched system) { inherit system; };
|
||||
modules = [
|
||||
{
|
||||
imports = [
|
||||
./home/common.nix
|
||||
./home/${confName}.nix
|
||||
];
|
||||
# extends the home config
|
||||
home.username = user;
|
||||
}
|
||||
imports = [
|
||||
nur.hmModules.nur
|
||||
# TODO: $name can be utilised to conditionally load other config files
|
||||
./home/home.nix
|
||||
];
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs system;
|
||||
};
|
||||
};
|
||||
treefmtConf =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
projectRootFile = "flake.nix";
|
||||
programs.nixfmt.enable = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
overlays.default = import ./packages;
|
||||
nixosConfigurations = {
|
||||
thinknix = mkSystem systems.x86_64-linux [
|
||||
./hosts/thinknix
|
||||
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t440s
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
];
|
||||
framenix = mkSystem systems.x86_64-linux [
|
||||
./hosts/framenix
|
||||
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
];
|
||||
# extends the home config
|
||||
home.username = user;
|
||||
home.homeDirectory = "/home/${user}";
|
||||
}
|
||||
];
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs system;
|
||||
};
|
||||
darwinConfigurations."OS-MacBook-Pro" = nix-darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
./darwin/configuration.nix
|
||||
inputInjection
|
||||
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
overlays.default = import ./packages;
|
||||
nixosConfigurations = {
|
||||
thinknix = mkSystem systems.x86_64-linux [ ./hosts/thinknix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t440s lanzaboote.nixosModules.lanzaboote ];
|
||||
framenix = mkSystem systems.x86_64-linux [ ./hosts/framenix inputs.nixos-hardware.nixosModules.framework-13-7040-amd lanzaboote.nixosModules.lanzaboote ];
|
||||
};
|
||||
homeConfigurations.spiollinux = mkHomeManager "spiollinux" "spiollinux" systems.x86_64-linux;
|
||||
} // utils.lib.eachDefaultSystem(system:
|
||||
let
|
||||
nixpkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = nixpkgs.lib.attrValues self.overlays;
|
||||
};
|
||||
homeConfigurations = {
|
||||
spiollinux-desktop = mkHomeManager "desktop" "spiollinux" systems.x86_64-linux;
|
||||
os-workmac = mkHomeManager "workmac" "os" systems.aarch64-darwin;
|
||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = [];
|
||||
};
|
||||
lib = {
|
||||
inherit mkHomeManager;
|
||||
};
|
||||
}
|
||||
// utils.lib.eachDefaultSystem (
|
||||
system:
|
||||
let
|
||||
nixpkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = nixpkgs.lib.attrValues self.overlays;
|
||||
};
|
||||
nixpkgs_unstable = import inputs.nixos-unstable {
|
||||
inherit system;
|
||||
overlays = nixpkgs.lib.attrValues self.overlays;
|
||||
};
|
||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
||||
pkgs_unstable = inputs.nixos-unstable.legacyPackages.${system};
|
||||
treefmtEval = treefmt-nix.lib.evalModule pkgs_unstable treefmtConf;
|
||||
in
|
||||
{
|
||||
devShells.default = pkgs.mkShell { buildInputs = [ ]; };
|
||||
formatter = treefmtEval.config.build.wrapper;
|
||||
checks.formatting = treefmtEval.config.build.check self;
|
||||
# expose nixpkgs with overlay; TODO: figure out role of config
|
||||
#legacyPackages = nixpkgs;
|
||||
|
||||
# inspired by https://github.com/Mic92/dotfiles/blob/main/home-manager/flake-module.nix
|
||||
# run like: `nix run .#hm -- <action>`
|
||||
apps.hm = {
|
||||
meta.description = "Wrapper around home-manager with automatic profile selection";
|
||||
type = "app";
|
||||
program = "${pkgs.writeShellScriptBin "hm" ''
|
||||
set -x
|
||||
export PATH=${
|
||||
pkgs.lib.makeBinPath [
|
||||
pkgs.git
|
||||
pkgs.coreutils
|
||||
pkgs.findutils
|
||||
pkgs.lix
|
||||
pkgs.jq
|
||||
pkgs.unixtools.hostname
|
||||
]
|
||||
}
|
||||
declare -A profiles=(
|
||||
["framenix"]="spiollinux-desktop"
|
||||
["thinknix"]="spiollinux-desktop"
|
||||
["OS MacBook Pro"]="os-workmac"
|
||||
)
|
||||
user=$(id -un)
|
||||
host=$(hostname)
|
||||
if [[ -n ''${profiles["$host-$user"]} ]]; then
|
||||
profile=''${profiles["$host-$user"]};
|
||||
elif [[ -n ''${profiles[$host]:-} ]]; then
|
||||
profile=''${profiles[$host]}
|
||||
else
|
||||
echo "No suitable profile found." >2
|
||||
exit 2
|
||||
fi
|
||||
if [[ "''${1:-}" == profile ]]; then
|
||||
echo $profile
|
||||
exit 0
|
||||
fi
|
||||
${
|
||||
inputs.home-manager.packages.${pkgs.system}.home-manager
|
||||
}/bin/home-manager --flake "${self}#$profile" "$@"
|
||||
''}/bin/hm";
|
||||
};
|
||||
}
|
||||
);
|
||||
# expose nixpkgs with overlay; TODO: figure out role of config
|
||||
#legacyPackages = nixpkgs;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
186
home/common.nix
186
home/common.nix
|
|
@ -1,186 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./modules/packages.nix
|
||||
./modules/vscodium.nix
|
||||
./modules/fonts.nix
|
||||
./modules/captive-browser.nix
|
||||
];
|
||||
home.homeDirectory =
|
||||
if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}";
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
programs.bat.enable = true;
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
keyMode = "vi";
|
||||
extraConfig =
|
||||
# for direnv not messing up the environment
|
||||
''
|
||||
set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES"
|
||||
set-environment -gu DIRENV_DIFF
|
||||
set-environment -gu DIRENV_DIR
|
||||
set-environment -gu DIRENV_WATCHES
|
||||
set-environment -gu DIRENV_LAYOUT
|
||||
|
||||
bind-key -T copy-mode-vi 'v' send -X begin-selection
|
||||
bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel'';
|
||||
terminal = "screen-256color";
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
credential.helper = "cache";
|
||||
push.default = "simple";
|
||||
push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
|
||||
init.defaultBranch = "mainline";
|
||||
diff.tool = "vimdiff";
|
||||
merge.tool = "vimdiff";
|
||||
# provide `git mergetool -t nixfmt`
|
||||
mergetool.nixfmt = {
|
||||
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
||||
trustExitCode = true;
|
||||
};
|
||||
core.excludesfile = toString (
|
||||
pkgs.writeText ".gitignore_global" ''
|
||||
# Direnv stuff #
|
||||
################
|
||||
.direnv
|
||||
.envrc
|
||||
# Editor files #
|
||||
################
|
||||
*~
|
||||
*.swp
|
||||
*.swo
|
||||
# macOS foo #
|
||||
#############
|
||||
.DS_Store
|
||||
''
|
||||
);
|
||||
core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab";
|
||||
rerere.enabled = true;
|
||||
};
|
||||
lfs.enable = true;
|
||||
};
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
options = {
|
||||
line-numbers = true;
|
||||
side-by-side = true;
|
||||
#dark = true;
|
||||
};
|
||||
};
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
git = {
|
||||
autoFetch = false;
|
||||
mainBranches = [
|
||||
"main"
|
||||
"master"
|
||||
"mainline"
|
||||
];
|
||||
};
|
||||
update.method = "never";
|
||||
};
|
||||
};
|
||||
|
||||
# shell config
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
history.ignoreSpace = true;
|
||||
initContent = ''
|
||||
# Uncomment following line if you want red dots to be displayed while waiting for completion
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
### Fix slowness of pastes with zsh-syntax-highlighting.zsh
|
||||
pasteinit() {
|
||||
OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]}
|
||||
zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`?
|
||||
}
|
||||
|
||||
pastefinish() {
|
||||
zle -N self-insert $OLD_SELF_INSERT
|
||||
}
|
||||
zstyle :bracketed-paste-magic paste-init pasteinit
|
||||
zstyle :bracketed-paste-magic paste-finish pastefinish
|
||||
|
||||
# automatic rehash of path completion
|
||||
zstyle ':completion:*' rehash true
|
||||
|
||||
## helper functions
|
||||
nixify() {
|
||||
if [ ! -e ./.envrc ]; then
|
||||
echo "eval \"$(lorri direnv)\"" > .envrc
|
||||
direnv allow
|
||||
fi
|
||||
if [ ! -e shell.nix ]; then
|
||||
cat > shell.nix <<'EOF'
|
||||
with import <nixpkgs> {};
|
||||
mkShell {
|
||||
buildInputs = [
|
||||
bashInteractive
|
||||
];
|
||||
}
|
||||
EOF
|
||||
${"EDITOR:-vim"} default.nix
|
||||
fi
|
||||
}
|
||||
|
||||
binpath() {
|
||||
realpath $(${pkgs.which}/bin/which $1)
|
||||
}
|
||||
'';
|
||||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
theme = "bira";
|
||||
plugins = [
|
||||
"git"
|
||||
"python"
|
||||
"systemd"
|
||||
"gpg-agent"
|
||||
];
|
||||
};
|
||||
};
|
||||
home.shellAliases = {
|
||||
ip = "ip --color";
|
||||
ipb = "ip --color --brief";
|
||||
ll = "ls -l";
|
||||
wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'";
|
||||
vim = "nvim";
|
||||
};
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
|
||||
programs.yt-dlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
embed-thumbnail = true;
|
||||
embed-subs = true;
|
||||
sub-langs = "all";
|
||||
};
|
||||
};
|
||||
|
||||
home.activation.reportChanges = config.lib.dag.entryAnywhere ''
|
||||
if [[ -v oldGenPath ]]; then
|
||||
run nix store diff-closures $oldGenPath $newGenPath
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ./modules/latex.nix ];
|
||||
home.stateVersion = "23.11";
|
||||
|
||||
schmittlauch = {
|
||||
packages = {
|
||||
graphics = true;
|
||||
multimedia = true;
|
||||
nixHelpers = true;
|
||||
devTools = true;
|
||||
pythonTools = true;
|
||||
games = true;
|
||||
desktopLinux = true;
|
||||
kde = true;
|
||||
};
|
||||
latex.guiTools = true;
|
||||
};
|
||||
|
||||
# for backwards compatibility
|
||||
services.lorri.enable = true;
|
||||
|
||||
programs.git =
|
||||
let
|
||||
# TODO profile specific
|
||||
contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
|
||||
in
|
||||
{
|
||||
includes = [
|
||||
{
|
||||
condition = "gitdir:~/Seafile/Studium/";
|
||||
contents = {
|
||||
user.name = contacts.personal.name;
|
||||
user.email = contacts.uni.email;
|
||||
};
|
||||
}
|
||||
{
|
||||
condition = "gitdir:~/src/nixpkgs/";
|
||||
contents = {
|
||||
user.name = "Trolli Schmittlauch";
|
||||
user.email = contacts.nixOs.email;
|
||||
};
|
||||
}
|
||||
]
|
||||
# set default name for several other common locations
|
||||
++
|
||||
map
|
||||
(dir: {
|
||||
condition = "gitdir:${dir}";
|
||||
contents = {
|
||||
user = {
|
||||
inherit (contacts.schmittlauch) email name;
|
||||
};
|
||||
};
|
||||
})
|
||||
[
|
||||
"~/src/"
|
||||
"~/bin/"
|
||||
"~/tmp/"
|
||||
"~/nixconfigs/"
|
||||
];
|
||||
};
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
#enableSshSupport = true;
|
||||
pinentry.package = pkgs.pinentry-qt;
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
# ssh host config
|
||||
matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts;
|
||||
};
|
||||
|
||||
# media button control support from Bluetooth devices
|
||||
services.mpris-proxy.enable = true;
|
||||
}
|
||||
453
home/home.nix
Normal file
453
home/home.nix
Normal file
|
|
@ -0,0 +1,453 @@
|
|||
{ pkgs, inputs, config, system, ... }:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
unstable = inputs.nixos-unstable.legacyPackages.${system};
|
||||
|
||||
desktopApps = [
|
||||
firefox
|
||||
chromium
|
||||
falkon
|
||||
thunderbird
|
||||
calibre
|
||||
dino
|
||||
#zotero has open CVEs, wait for patch in Zotero7
|
||||
keepassxc
|
||||
ding
|
||||
aspell
|
||||
aspellDicts.de
|
||||
aspellDicts.en
|
||||
# for kate/KDE applications
|
||||
hunspellDicts.de-de
|
||||
hunspellDicts.en-us
|
||||
hunspellDicts.en-gb-ise
|
||||
seafile-client
|
||||
alacritty
|
||||
libreoffice-qt # fresh with KDE integration
|
||||
backintime-common
|
||||
anki
|
||||
signal-desktop
|
||||
(tor-browser-bundle-bin.override {
|
||||
mediaSupport = true;
|
||||
pulseaudioSupport = true;
|
||||
})
|
||||
pdfpc
|
||||
quaternion
|
||||
nheko
|
||||
gpxsee
|
||||
subsurface
|
||||
yate
|
||||
# split and merge PDFs in a GUI
|
||||
pdfarranger
|
||||
qbittorrent
|
||||
#(pkgs.pidgin-with-plugins.override {
|
||||
# plugins = [ pkgs.pidginotr ];})
|
||||
|
||||
inputs.logseq-fix-nixpkgs.legacyPackages.${system}.logseq
|
||||
|
||||
|
||||
# for Hibiscus banking software
|
||||
jameica
|
||||
#ToDo: which of these drivers is actually used?
|
||||
geckodriver
|
||||
chromedriver
|
||||
];
|
||||
|
||||
graphicsApps = [
|
||||
inkscape
|
||||
darktable
|
||||
hugin
|
||||
luminanceHDR
|
||||
exiftool
|
||||
gimp
|
||||
xournal
|
||||
]
|
||||
++ (
|
||||
with gimpPlugins; [
|
||||
fourier
|
||||
lqrPlugin
|
||||
]
|
||||
);
|
||||
|
||||
multimediaApps = [
|
||||
mpv
|
||||
vlc
|
||||
#amarok
|
||||
clementine
|
||||
elisa
|
||||
yt-dlp
|
||||
#sonic-pi
|
||||
musescore
|
||||
tenacity
|
||||
#linphone
|
||||
soundkonverter
|
||||
config.nur.repos.fooker.studio-link
|
||||
];
|
||||
|
||||
cliApps = [
|
||||
myVim
|
||||
htop
|
||||
tmux
|
||||
httpie
|
||||
ponysay
|
||||
gti
|
||||
tree
|
||||
lsof
|
||||
mosh
|
||||
openssh
|
||||
sshfs-fuse
|
||||
cryfs
|
||||
smbnetfs # for FUSE smb mounting
|
||||
sshuttle
|
||||
thefuck
|
||||
gnupg
|
||||
unar
|
||||
lzop
|
||||
p7zip
|
||||
pwgen
|
||||
pandoc
|
||||
agrep
|
||||
pdfgrep
|
||||
torsocks
|
||||
ncdu
|
||||
psmisc # for killall
|
||||
dos2unix
|
||||
reptyr # re-bind running program to other tty
|
||||
xclip
|
||||
unzip
|
||||
lnav
|
||||
config.nur.repos.schmittlauch.lolcommits # from NUR
|
||||
];
|
||||
|
||||
nixHelpers = [
|
||||
nixpkgs-review
|
||||
nixpkgs-fmt
|
||||
nix-top
|
||||
statix
|
||||
nix-output-monitor
|
||||
];
|
||||
|
||||
kdeTools = with plasma5Packages; with kdeGear; [
|
||||
okular
|
||||
gwenview
|
||||
yakuake
|
||||
kmail
|
||||
kontact
|
||||
korganizer
|
||||
akonadi-mime #for KOrganizer
|
||||
kaddressbook
|
||||
kdeconnect
|
||||
dolphin
|
||||
spectacle
|
||||
kate
|
||||
kleopatra
|
||||
qdirstat
|
||||
ark
|
||||
kwalletmanager
|
||||
ktouch
|
||||
kcharselect
|
||||
konversation
|
||||
okteta
|
||||
krdc
|
||||
skanlite
|
||||
akonadiconsole
|
||||
tokodon # mastodon client
|
||||
]
|
||||
++ (
|
||||
with kdeFrameworks; [
|
||||
networkmanager-qt
|
||||
kcrash
|
||||
breeze-gtk
|
||||
]
|
||||
);
|
||||
|
||||
devTools = [
|
||||
curl
|
||||
httpie
|
||||
gdb
|
||||
strace
|
||||
ltrace
|
||||
valgrind
|
||||
zeal
|
||||
gcc
|
||||
shellcheck
|
||||
mtr
|
||||
ripgrep
|
||||
gitui
|
||||
lazygit
|
||||
pre-commit
|
||||
|
||||
# Haskell
|
||||
ghc
|
||||
cabal2nix
|
||||
];
|
||||
|
||||
|
||||
latexApps = [
|
||||
texmaker
|
||||
kile
|
||||
biber
|
||||
# customize texlive installation
|
||||
(
|
||||
texlive.combine {
|
||||
inherit (texlive)
|
||||
scheme-medium
|
||||
|
||||
xetex
|
||||
luatex
|
||||
unicode-math
|
||||
fontspec
|
||||
collection-binextra
|
||||
collection-fontsrecommended
|
||||
collection-latex
|
||||
collection-latexextra
|
||||
collection-latexrecommended
|
||||
collection-langgerman
|
||||
moderncv
|
||||
fontawesome5
|
||||
academicons
|
||||
acronym
|
||||
ccicons
|
||||
fontawesome
|
||||
biblatex
|
||||
logreq
|
||||
koma-script
|
||||
;
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
pythonApps = with python3Packages; [
|
||||
notebook
|
||||
ipython
|
||||
pip
|
||||
numpy
|
||||
matplotlib
|
||||
jedi
|
||||
flake8
|
||||
mypy
|
||||
];
|
||||
|
||||
|
||||
fonts = [
|
||||
comic-neue
|
||||
source-sans-pro
|
||||
source-serif-pro
|
||||
fira-code
|
||||
ubuntu_font_family
|
||||
twemoji-color-font
|
||||
open-sans
|
||||
(iosevka-bin.override {
|
||||
variant = "curly-slab";
|
||||
})
|
||||
config.nur.repos.schmittlauch.vollkorn
|
||||
# TODO: humor-sans
|
||||
];
|
||||
|
||||
games = [
|
||||
superTuxKart
|
||||
#hedgewars
|
||||
];
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
nixpkgs.overlays = (import ./overlays.nix);
|
||||
nixpkgs.config = {
|
||||
clementine.spotify = false;
|
||||
vim =
|
||||
{ gui = "gtk3";
|
||||
python = true;
|
||||
multibyteSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
home.packages =
|
||||
desktopApps
|
||||
++ latexApps
|
||||
++ pythonApps
|
||||
++ graphicsApps
|
||||
++ cliApps
|
||||
++ multimediaApps
|
||||
++ devTools
|
||||
++ kdeTools
|
||||
++ fonts
|
||||
++ nixHelpers
|
||||
++ games
|
||||
;
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
home.stateVersion = "22.11";
|
||||
|
||||
programs.direnv =
|
||||
{
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
|
||||
# programs.vim =
|
||||
# { enable = true;
|
||||
# };
|
||||
|
||||
programs.bat.enable = true;
|
||||
|
||||
services.gpg-agent =
|
||||
{
|
||||
enable = true;
|
||||
#enableSshSupport = true;
|
||||
pinentryFlavor = "qt";
|
||||
};
|
||||
|
||||
programs.ssh =
|
||||
{
|
||||
enable = true;
|
||||
# ssh host config
|
||||
matchBlocks =
|
||||
import "${inputs.mysecrets}/ssh_hosts.nix";
|
||||
};
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
keyMode = "vi";
|
||||
extraConfig =
|
||||
# for direnv not messing up the environment
|
||||
''set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES"
|
||||
set-environment -gu DIRENV_DIFF
|
||||
set-environment -gu DIRENV_DIR
|
||||
set-environment -gu DIRENV_WATCHES
|
||||
set-environment -gu DIRENV_LAYOUT
|
||||
|
||||
bind-key -T copy-mode-vi 'v' send -X begin-selection
|
||||
bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel'';
|
||||
terminal = "screen-256color";
|
||||
};
|
||||
|
||||
systemd.user.startServices = true;
|
||||
|
||||
# for backwards compatibility
|
||||
services.lorri.enable = true;
|
||||
|
||||
# media button control support from Bluetooth devices
|
||||
services.mpris-proxy.enable = true;
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
programs.git =
|
||||
let contacts = import "${inputs.mysecrets}/contacts.nix";
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
includes = [
|
||||
{
|
||||
condition = "gitdir:~/Seafile/Studium/";
|
||||
contents = {
|
||||
user.name = contacts.realName;
|
||||
user.email = contacts.uniMail;
|
||||
};
|
||||
}
|
||||
{
|
||||
condition = "gitdir:~/src/nixpkgs/";
|
||||
contents = {
|
||||
user.name = "Trolli Schmittlauch";
|
||||
user.email = contacts.nixosMail;
|
||||
};
|
||||
}
|
||||
]
|
||||
# set default name for several other common locations
|
||||
++ map
|
||||
(dir: {
|
||||
condition = "gitdir:${dir}";
|
||||
contents = {
|
||||
user.name = "Trolli Schmittlauch";
|
||||
user.email = contacts.mainMail;
|
||||
};
|
||||
}) [ "~/src/" "~/bin/" "~/tmp/" "~/nixconfigs/" ];
|
||||
extraConfig = {
|
||||
credential.helper = "cache";
|
||||
push.default = "simple";
|
||||
init.defaultBranch = "mainline";
|
||||
diff.tool = "vimdiff";
|
||||
merge.tool = "vimdiff";
|
||||
core.excludesfile = toString (pkgs.writeText ".gitignore_global" ''
|
||||
# Direnv stuff
|
||||
.direnv
|
||||
.envrc
|
||||
# Editor files #
|
||||
################
|
||||
*~
|
||||
*.swp
|
||||
*.swo
|
||||
'');
|
||||
core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab";
|
||||
};
|
||||
lfs.enable = true;
|
||||
};
|
||||
|
||||
# shell config
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
history.ignoreSpace = true;
|
||||
initExtra = ''
|
||||
# Uncomment following line if you want red dots to be displayed while waiting for completion
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
### Fix slowness of pastes with zsh-syntax-highlighting.zsh
|
||||
pasteinit() {
|
||||
OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]}
|
||||
zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`?
|
||||
}
|
||||
|
||||
pastefinish() {
|
||||
zle -N self-insert $OLD_SELF_INSERT
|
||||
}
|
||||
zstyle :bracketed-paste-magic paste-init pasteinit
|
||||
zstyle :bracketed-paste-magic paste-finish pastefinish
|
||||
|
||||
# automatic rehash of path completion
|
||||
zstyle ':completion:*' rehash true
|
||||
|
||||
eval "$(${pkgs.thefuck}/bin/thefuck --alias)"
|
||||
|
||||
## helper functions
|
||||
nixify() {
|
||||
if [ ! -e ./.envrc ]; then
|
||||
echo "eval \"$(lorri direnv)\"" > .envrc
|
||||
direnv allow
|
||||
fi
|
||||
if [ ! -e shell.nix ]; then
|
||||
cat > shell.nix <<'EOF'
|
||||
with import <nixpkgs> {};
|
||||
mkShell {
|
||||
buildInputs = [
|
||||
bashInteractive
|
||||
];
|
||||
}
|
||||
EOF
|
||||
${EDITOR:-vim} default.nix
|
||||
fi
|
||||
}
|
||||
|
||||
binpath() {
|
||||
realpath $(${pkgs.which}/bin/which $1)
|
||||
}
|
||||
'';
|
||||
|
||||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
theme = "bira";
|
||||
plugins = [ "git" "python" "systemd" "gpg-agent"];
|
||||
};
|
||||
};
|
||||
home.shellAliases = {
|
||||
ip = "ip --color";
|
||||
ipb = "ip --color --brief";
|
||||
ll = "ls -l";
|
||||
wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'";
|
||||
vim = "nvim";
|
||||
};
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
tomlFormat = pkgs.formats.toml { };
|
||||
cfg = config.programs.captive-browser;
|
||||
inherit (pkgs.stdenv.hostPlatform) isDarwin;
|
||||
in
|
||||
{
|
||||
options.programs.captive-browser = {
|
||||
enable = lib.mkEnableOption "Enable custom captive-browser in user PATH";
|
||||
package = lib.mkPackageOption pkgs "captive-browser" { nullable = true; };
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = tomlFormat.type;
|
||||
|
||||
options = {
|
||||
browser = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "command to invoke the browser with";
|
||||
|
||||
# browser is the shell (/bin/sh) command executed once the proxy starts.
|
||||
# When browser exits, the proxy exits. An extra env var PROXY is available.
|
||||
#
|
||||
# Here, we use a separate Chrome instance in Incognito mode, so that
|
||||
# it can run (and be waited for) alongside the default one, and that
|
||||
# it maintains no state across runs. To configure this browser open a
|
||||
# normal window in it, settings will be preserved.
|
||||
default = ''
|
||||
${cfg.browserCommand} \
|
||||
--user-data-dir="$HOME/Library/Application Support/Google/Captive" \
|
||||
--proxy-server="socks5://$PROXY" \
|
||||
--proxy-bypass-list="<-loopback>" \
|
||||
--no-first-run \
|
||||
--new-window \
|
||||
--incognito \
|
||||
--no-default-browser-check \
|
||||
--no-crash-upload \
|
||||
--disable-extensions \
|
||||
--disable-sync \
|
||||
--disable-background-networking \
|
||||
--disable-client-side-phishing-detection \
|
||||
--disable-component-update \
|
||||
--disable-translate \
|
||||
--disable-web-resources \
|
||||
--safebrowsing-disable-auto-update \
|
||||
http://example.com
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
interface = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "WLAN interface to use";
|
||||
};
|
||||
browserCommand = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = if isDarwin then "open -n -W -a \"Google Chrome\" --args" else (lib.getExe pkgs.chromium);
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
programs.captive-browser.settings = builtins.mapAttrs (_: lib.mkOptionDefault) {
|
||||
# dhcp-dns is the shell (/bin/sh) command executed to obtain the DHCP
|
||||
# DNS server address. The first match of an IPv4 regex is used.
|
||||
# IPv4 only, because let's be real, it's a captive portal.
|
||||
dhcp-dns =
|
||||
if isDarwin then
|
||||
"ipconfig getoption ${cfg.interface} domain_name_server"
|
||||
else
|
||||
"${lib.getExe pkgs.dhcpcd} -U ${cfg.interface} | grep domain_name_servers";
|
||||
|
||||
# socks5-addr is the listen address for the SOCKS5 proxy server.
|
||||
socks5-addr = "localhost:1666";
|
||||
};
|
||||
home.file.".config/captive-browser.toml" = lib.mkIf (isDarwin && !config.xdg.enable) {
|
||||
source = tomlFormat.generate "captive-browser-config" cfg.settings;
|
||||
};
|
||||
|
||||
xdg.configFile."captive-browser.toml" = lib.mkIf (!(isDarwin && !config.xdg.enable)) {
|
||||
source = tomlFormat.generate "captive-browser-config" cfg.settings;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
comic-neue
|
||||
source-sans-pro
|
||||
source-code-pro
|
||||
source-serif-pro
|
||||
ubuntu-classic
|
||||
twemoji-color-font
|
||||
open-sans
|
||||
(iosevka-bin.override { variant = "CurlySlab"; })
|
||||
inputs.nur.legacyPackages.${system}.repos.schmittlauch.vollkorn
|
||||
# TODO: humor-sans
|
||||
|
||||
# fcio corporate design, TODO module
|
||||
fira-code
|
||||
fira-mono
|
||||
# TODO fira-sans + condensed
|
||||
# TODO museo 500
|
||||
];
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with pkgs;
|
||||
let
|
||||
latexGuiTools = [
|
||||
texmaker
|
||||
kile
|
||||
biber
|
||||
];
|
||||
in
|
||||
{
|
||||
options.schmittlauch.latex.guiTools = lib.mkEnableOption "Install GUI LaTeX tools like editors";
|
||||
|
||||
config.home.packages = [
|
||||
(texlive.combine {
|
||||
inherit (texlive)
|
||||
scheme-medium
|
||||
|
||||
xetex
|
||||
luatex
|
||||
unicode-math
|
||||
fontspec
|
||||
collection-binextra
|
||||
collection-fontsrecommended
|
||||
collection-latex
|
||||
collection-latexextra
|
||||
collection-latexrecommended
|
||||
collection-langgerman
|
||||
moderncv
|
||||
fontawesome5
|
||||
academicons
|
||||
acronym
|
||||
ccicons
|
||||
fontawesome
|
||||
biblatex
|
||||
logreq
|
||||
koma-script
|
||||
;
|
||||
})
|
||||
]
|
||||
++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
myAider = pkgs.aider-chat;
|
||||
# FIXME: darwin build failure due to cfn-lint-1.32.1
|
||||
# myAider = pkgs.aider-chat.withOptional {
|
||||
# withPlaywright = true;
|
||||
# withBrowser = true;
|
||||
# withHelp = true;
|
||||
# withBedrock = false;
|
||||
# };
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
myAider
|
||||
pkgs.claude-code
|
||||
];
|
||||
#nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "claude-code" ]; # nixpkgs.config merging is unfortunately broken
|
||||
# TODO: API token e.g. via sops
|
||||
# TODO: proper codium and llm enable options
|
||||
home.sessionVariables = {
|
||||
AIDER_EDITOR = "codium --wait";
|
||||
DISABLE_TELEMETRY = 1; # for claude-code
|
||||
};
|
||||
}
|
||||
|
|
@ -1,267 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
cfg = config.schmittlauch.packages;
|
||||
unstable = inputs.nixos-unstable.legacyPackages.${system};
|
||||
nur = inputs.nur.legacyPackages.${system};
|
||||
|
||||
graphicsApps = [
|
||||
inkscape
|
||||
exiftool
|
||||
]
|
||||
++ (with gimp3Plugins; [
|
||||
#fourier # broken
|
||||
#lqrPlugin # broken
|
||||
])
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
darktable
|
||||
gimp3
|
||||
hugin
|
||||
#luminanceHDR # FIXME, build failure
|
||||
xournalpp
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isDarwin [
|
||||
gimp2
|
||||
];
|
||||
|
||||
multimediaApps = [
|
||||
mpv
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
vlc
|
||||
amarok
|
||||
clementine
|
||||
kdePackages.elisa
|
||||
musescore
|
||||
tenacity
|
||||
#nur.repos.fooker.studio-link
|
||||
];
|
||||
|
||||
cliApps = [
|
||||
coreutils
|
||||
myVim
|
||||
htop
|
||||
tmux
|
||||
httpie
|
||||
rsync
|
||||
ponysay
|
||||
gti
|
||||
tree
|
||||
lsof
|
||||
mosh
|
||||
openssh
|
||||
sshfs-fuse
|
||||
sshuttle
|
||||
cryfs
|
||||
gnupg
|
||||
unar
|
||||
lzop
|
||||
p7zip
|
||||
pwgen
|
||||
pandoc
|
||||
pdfgrep
|
||||
# zig dependency breaks occasionally, stay on C version for now
|
||||
ncdu_1
|
||||
dos2unix
|
||||
unzip
|
||||
fswatch
|
||||
jq
|
||||
age
|
||||
lnav
|
||||
spacer
|
||||
|
||||
nix-output-monitor # putting this here as a plain `nix` alternative
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
xclip
|
||||
smbnetfs # for FUSE smb mounting
|
||||
psmisc # for killall
|
||||
torsocks
|
||||
agrep
|
||||
reptyr # re-bind running program to other tty
|
||||
];
|
||||
|
||||
nixHelpers = [
|
||||
nixpkgs-review
|
||||
nixfmt-rfc-style
|
||||
nix-top
|
||||
statix
|
||||
];
|
||||
devTools = [
|
||||
curl
|
||||
httpie
|
||||
gcc
|
||||
shellcheck
|
||||
mtr
|
||||
ripgrep
|
||||
fd
|
||||
pre-commit
|
||||
scriv
|
||||
|
||||
# Haskell
|
||||
ghc
|
||||
cabal2nix
|
||||
]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
gdb
|
||||
strace
|
||||
ltrace
|
||||
valgrind
|
||||
zeal
|
||||
];
|
||||
|
||||
pythonTools = with python3Packages; [
|
||||
python # to shadow old macOS python
|
||||
ipython
|
||||
uv
|
||||
pip
|
||||
numpy
|
||||
matplotlib
|
||||
jedi
|
||||
jedi-language-server
|
||||
black
|
||||
flake8
|
||||
mypy
|
||||
];
|
||||
|
||||
games = [
|
||||
superTuxKart
|
||||
#hedgewars
|
||||
];
|
||||
|
||||
desktopCommon = [
|
||||
keepassxc
|
||||
];
|
||||
|
||||
desktopLinux = [
|
||||
firefox
|
||||
chromium
|
||||
kdePackages.falkon
|
||||
thunderbird
|
||||
calibre
|
||||
dino
|
||||
zotero
|
||||
ding
|
||||
aspell
|
||||
aspellDicts.de
|
||||
aspellDicts.en
|
||||
# for kate/KDE applications
|
||||
hunspellDicts.de-de
|
||||
hunspellDicts.en-us
|
||||
hunspellDicts.en-gb-ise
|
||||
seafile-client
|
||||
alacritty
|
||||
libreoffice-qt6 # still with KDE integration
|
||||
anki
|
||||
signal-desktop
|
||||
(tor-browser.override {
|
||||
mediaSupport = true;
|
||||
pulseaudioSupport = pkgs.stdenv.isLinux;
|
||||
})
|
||||
tigervnc
|
||||
rustdesk-flutter
|
||||
pdfpc
|
||||
nheko
|
||||
gpxsee
|
||||
subsurface
|
||||
yate
|
||||
# split and merge PDFs in a GUI
|
||||
pdfarranger
|
||||
qbittorrent
|
||||
#(pkgs.pidgin-with-plugins.override {
|
||||
# plugins = [ pkgs.pidginotr ];})
|
||||
|
||||
logseq
|
||||
|
||||
# for Hibiscus banking software
|
||||
jameica
|
||||
#ToDo: which of these drivers is actually used?
|
||||
geckodriver
|
||||
chromedriver
|
||||
];
|
||||
|
||||
kdeTools = [
|
||||
okteta
|
||||
]
|
||||
++ (with kdePackages; [
|
||||
okular
|
||||
gwenview
|
||||
yakuake
|
||||
dolphin
|
||||
spectacle
|
||||
kate
|
||||
kleopatra
|
||||
qdirstat
|
||||
ark
|
||||
kwalletmanager
|
||||
#ktouch # TODO: unbreak
|
||||
kcharselect
|
||||
konversation
|
||||
krdc
|
||||
skanlite
|
||||
akonadiconsole
|
||||
tokodon # mastodon client
|
||||
networkmanager-qt
|
||||
kcrash
|
||||
breeze-gtk
|
||||
]);
|
||||
in
|
||||
{
|
||||
options.schmittlauch.packages = {
|
||||
graphics = lib.mkEnableOption "Enable a common set of graphics apps";
|
||||
multimedia = lib.mkEnableOption "Enable a common set of multimedia apps";
|
||||
cli = lib.mkOption {
|
||||
description = "Enable a common set of CLI tools";
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
};
|
||||
nixHelpers = lib.mkEnableOption "Enable a common set of Nix helper tools";
|
||||
devTools = lib.mkEnableOption "Enable a common set of dev tools";
|
||||
pythonTools = lib.mkEnableOption "Enable a common set of python tools";
|
||||
games = lib.mkEnableOption "Enable some games";
|
||||
desktopCommon = lib.mkOption {
|
||||
description = "GUI desktop applications that work cross-platform and cross-desktop";
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
};
|
||||
desktopLinux = lib.mkEnableOption "Enable a common set of desktop applications";
|
||||
kde = lib.mkEnableOption "Enable a common set of KDE applications";
|
||||
};
|
||||
config = {
|
||||
home.packages = lib.flatten (
|
||||
(lib.optional cfg.graphics graphicsApps)
|
||||
++ (lib.optional cfg.multimedia multimediaApps)
|
||||
++ (lib.optional cfg.cli cliApps)
|
||||
++ (lib.optional cfg.nixHelpers nixHelpers)
|
||||
++ (lib.optional cfg.devTools devTools)
|
||||
++ (lib.optional cfg.pythonTools pythonTools)
|
||||
++ (lib.optional cfg.games games)
|
||||
++ (lib.optional cfg.desktopCommon desktopCommon)
|
||||
++ (lib.optional cfg.desktopLinux desktopLinux)
|
||||
++ (lib.optional cfg.kde kdeTools)
|
||||
);
|
||||
|
||||
nixpkgs.overlays = import ../overlays.nix;
|
||||
nixpkgs.config = {
|
||||
|
||||
permittedInsecurePackages = [
|
||||
# (temporarily) permit the usage of libolm
|
||||
"olm-3.2.16"
|
||||
];
|
||||
clementine.spotify = false;
|
||||
vim = {
|
||||
gui = "gtk3";
|
||||
python = true;
|
||||
multibyteSupport = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
mutableExtensionsDir = true;
|
||||
profiles.default = {
|
||||
extensions =
|
||||
with pkgs.vscode-extensions;
|
||||
[
|
||||
ms-python.python
|
||||
charliermarsh.ruff
|
||||
vscodevim.vim
|
||||
yzhang.markdown-all-in-one
|
||||
tamasfe.even-better-toml
|
||||
eamodio.gitlens
|
||||
jnoortheen.nix-ide
|
||||
mkhl.direnv
|
||||
editorconfig.editorconfig
|
||||
]
|
||||
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
name = "sync-rsync-extended";
|
||||
publisher = "SanderVerschoor";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-Jsfa1SrK1H0QwlJPEBdrb0gfGiIYoXdtIP32/4g+ceM=";
|
||||
}
|
||||
# TODO: probably available in nixpkgs soonish?
|
||||
{
|
||||
name = "mypy-type-checker";
|
||||
publisher = "ms-python";
|
||||
version = "2023.3.12681020";
|
||||
sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
|
||||
}
|
||||
{
|
||||
name = "vscode-pets";
|
||||
publisher = "tonybaloney";
|
||||
version = "1.25.1";
|
||||
sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
|
||||
}
|
||||
];
|
||||
userSettings =
|
||||
let
|
||||
defaultPython = pkgs.python3.withPackages (ps: [
|
||||
ps.jedi
|
||||
ps.jedi-language-server
|
||||
ps.pip
|
||||
ps.setuptools # for pkg_resources
|
||||
ps.black
|
||||
ps.mypy
|
||||
]);
|
||||
in
|
||||
{
|
||||
"telemetry.enableTelemetry" = false; # might not be needed for Codium
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.accessibilitySupport" = false; # prevent asking
|
||||
"editor.cursorBlinking" = "phase";
|
||||
"editor.stickyScroll.enabled" = true;
|
||||
"workbench.editor.highlightModifiedTabs" = true;
|
||||
"window.autoDetectColorScheme" = true;
|
||||
"workbench.preferredDarkColorTheme" = "Default Dark Modern";
|
||||
"workbench.preferredLightColorTheme" = "Default Light Modern";
|
||||
"[nix]" = {
|
||||
"editor.insertSpaces" = true;
|
||||
"editor.tabSize" = 2;
|
||||
# for now, disable automatic formatting to prevent disruption of existing code bases
|
||||
"editor.formatOnPaste" = false;
|
||||
"editor.formatOnSave" = false;
|
||||
"editor.formatOnType" = false;
|
||||
};
|
||||
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = lib.getExe pkgs.nixd;
|
||||
"nix.serverSettings" = { };
|
||||
"editor.fontSize" = 13;
|
||||
"editor.fontWeight" = "normal";
|
||||
"git.detectSubmodulesLimit" = 30;
|
||||
"[python]" = {
|
||||
"breadcrumbs.showClasses" = true;
|
||||
"breadcrumbs.showFunctions" = true;
|
||||
"gitlens.codeLens.symbolScopes" = [ "!Module" ];
|
||||
"editor.defaultFormatter" = "charliermarsh.ruff";
|
||||
"editor.formatOnSave" = true;
|
||||
# workaround for jedi-language-server < 0.45.1, semantic tokens are still broken
|
||||
"editor.semanticHighlighting.enabled" = false;
|
||||
};
|
||||
"python.experiments.enabled" = false;
|
||||
"python.languageServer" = "Jedi"; # don't use proprietary pylance server
|
||||
"python.defaultInterpreterPath" = lib.getExe defaultPython;
|
||||
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/dmypy" ];
|
||||
"mypy-type-checker.preferDaemon" = true;
|
||||
"mypy-type-checker.importStrategy" = "fromEnvironment";
|
||||
"mypy-type-checker.args" = [ "--ignore-missing-imports" ];
|
||||
"ruff.path" = [ (lib.getExe pkgs.ruff) ];
|
||||
"gitlens.telemetry.enabled" = false;
|
||||
"vim.highlightedyank.enable" = true;
|
||||
"vim.history" = 500;
|
||||
"vim.neovimUseConfigFile" = true;
|
||||
"vim.enableNeovim" = true;
|
||||
"git.suggestSmartCommit" = false;
|
||||
"editor.rulers" = [ 79 ];
|
||||
"vim.useSystemClipboard" = true;
|
||||
"vim.smartRelativeLine" = true;
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
"files.associations" = {
|
||||
"*.py" = "python";
|
||||
};
|
||||
"editor.renderWhitespace" = "all";
|
||||
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
|
||||
"vim.neovimPath" = lib.getExe pkgs.myVim;
|
||||
"sync-rsync.options" = [ ];
|
||||
"direnv.path.executable" = lib.getExe pkgs.direnv;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
|
||||
[
|
||||
(self: super: rec {
|
||||
myVim =
|
||||
with super;
|
||||
neovim.override {
|
||||
configure = {
|
||||
(
|
||||
self: super:
|
||||
rec {
|
||||
myVim = with super; neovim.override { configure = {
|
||||
packages.myVimPackage = with pkgs.vimPlugins; {
|
||||
# loaded on start
|
||||
start = [
|
||||
|
|
@ -18,16 +18,15 @@
|
|||
nerdtree
|
||||
nerdtree-git-plugin
|
||||
supertab
|
||||
vim-dirdiff
|
||||
vim-pandoc
|
||||
vim-pandoc-syntax
|
||||
vim-nix
|
||||
vim-jinja
|
||||
which-key-nvim
|
||||
];
|
||||
};
|
||||
customRC = builtins.readFile ./vimrc;
|
||||
};
|
||||
};
|
||||
})
|
||||
};};
|
||||
}
|
||||
)
|
||||
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
''
|
||||
# rsync -rlptzv --progress --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc.qemu os@hydra01:
|
||||
# rsync -rlptzv --progress --rsh="ssh -J fcio-whq-jump" --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc-nixos/ os@patty:fc-nixos/
|
||||
|
||||
|
||||
DEFAULT_JUMPHOST="fcio-whq-jump"
|
||||
|
||||
_parse_rsync_args() {
|
||||
# reset pre-defined variables that are read and manipulated throughout this function
|
||||
unset JUMPHOST
|
||||
# arrays are bash or zsh specific
|
||||
RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git/" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__")
|
||||
|
||||
while getopts ':Jj:' OPT; do
|
||||
case $OPT in
|
||||
j)
|
||||
if [ -n "$JUMPHOST" ]; then
|
||||
echo "-j and -J are conflicting arguments" >&2
|
||||
return 1
|
||||
fi
|
||||
JUMPHOST="$OPTARG"
|
||||
;;
|
||||
J)
|
||||
if [ -n "$JUMPHOST" ]; then
|
||||
echo "-j and -J are conflicting arguments" >&2
|
||||
return 1
|
||||
fi
|
||||
JUMPHOST="$DEFAULT_JUMPHOST"
|
||||
;;
|
||||
?)
|
||||
echo "rsyncrepo [-J] [-j <jumphost>] <directory> <hostname> [target dir name]"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# trim CLI parameters
|
||||
shift "$(($OPTIND -1))"
|
||||
|
||||
RR_FROM="$1"
|
||||
RR_TO="$2"
|
||||
RR_TARGET="$3"
|
||||
}
|
||||
|
||||
_do_rsync() {
|
||||
# parameter check
|
||||
if [ -z "$1" ] || [ -z "$2" ]; then
|
||||
echo "Missing arguments, required: <directory> <hostname>" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ -n "$JUMPHOST" ]; then
|
||||
RSYNC_OPTS+=("--rsh=${lib.getExe pkgs.openssh} -J ''${JUMPHOST}")
|
||||
fi
|
||||
|
||||
for OPTI in "''${RSYNC_OPTS[@]}"; do
|
||||
echo "$OPTI"
|
||||
done
|
||||
|
||||
# If no $3 is specified, we sync /path/to/dir/ to hostname:dir
|
||||
if [ -z "$3" ]; then
|
||||
RR_DEST="''${2}:$(basename $(realpath "''${1}"))"
|
||||
else
|
||||
RR_DEST="''${2}:''${3}"
|
||||
fi
|
||||
|
||||
echo "Syncing ''${1} to ''${RR_DEST}…"
|
||||
|
||||
# ensure trailing slash for src to avoid recreating directory
|
||||
${lib.getExe pkgs.rsync} "''${RSYNC_OPTS[@]}" "''${1}/" "''${RR_DEST}"
|
||||
}
|
||||
|
||||
rsyncrepo() {
|
||||
_parse_rsync_args "$@"
|
||||
# inherits parsed arguments through variables
|
||||
_do_rsync "$RR_FROM" "$RR_TO" "$RR_TARGET"
|
||||
}
|
||||
|
||||
rsynchydra() {
|
||||
_parse_rsync_args "$@"
|
||||
# the name of RR_TO is a bit misleading, it just describes the 2nd positional arg here
|
||||
_do_rsync "$RR_FROM" "hydra01" "$RR_TO"
|
||||
}
|
||||
''
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
''
|
||||
ssh-loop () {
|
||||
setopt shwordsplit
|
||||
local hosts=$1
|
||||
local cmd=$2
|
||||
|
||||
for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done
|
||||
}
|
||||
|
||||
ssh-root-loop () {
|
||||
setopt shwordsplit
|
||||
local hosts=$1
|
||||
local cmd=$2
|
||||
|
||||
for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh root@$x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done
|
||||
}
|
||||
|
||||
|
||||
ssh-loop-parallel () {
|
||||
setopt shwordsplit
|
||||
local hosts=$1
|
||||
local cmd=$2
|
||||
|
||||
for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2" 2>&1 | sed -e "s/^/$x: /;" & done
|
||||
wait
|
||||
}
|
||||
''
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04
|
||||
Subproject commit 068a4759e72948284c3de85d20a780723278f8b8
|
||||
|
|
@ -24,11 +24,7 @@ filetype plugin indent on
|
|||
|
||||
syntax on
|
||||
|
||||
" use relative numbering…
|
||||
set relativenumber
|
||||
" except for current line
|
||||
set number
|
||||
|
||||
set mouse=a
|
||||
set mousehide
|
||||
|
||||
|
|
@ -46,7 +42,7 @@ set history=1000
|
|||
" representing system clipboard (not X11 clipboard)
|
||||
set clipboard=unnamedplus
|
||||
|
||||
set expandtab
|
||||
" set expandtab
|
||||
set shiftwidth=4
|
||||
set tabstop=4
|
||||
set softtabstop=4
|
||||
|
|
@ -56,7 +52,7 @@ let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
|||
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
||||
set termguicolors
|
||||
|
||||
let base16colorspace=256
|
||||
"let base16colorspace=256
|
||||
|
||||
colorscheme base16-tomorrow-night
|
||||
"colorscheme Tomorrow-Night
|
||||
|
|
@ -106,7 +102,6 @@ let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles
|
|||
let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static`
|
||||
let g:haskell_backpack = 1 " to enable highlighting of backpack keywords
|
||||
au FileType markdown setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4
|
||||
au FileType pandoc setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4
|
||||
au FileType nix setlocal tabstop=2 expandtab shiftwidth=2 softtabstop=2
|
||||
set ofu=syntaxcomplete#Complete
|
||||
" nmap <C-V> "+gP
|
||||
|
|
|
|||
149
home/workmac.nix
149
home/workmac.nix
|
|
@ -1,149 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
unstable = inputs.nixos-unstable.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
imports = [ ./modules/llm.nix ];
|
||||
|
||||
schmittlauch.packages = {
|
||||
graphics = true;
|
||||
multimedia = true;
|
||||
nixHelpers = true;
|
||||
devTools = true;
|
||||
pythonTools = true;
|
||||
};
|
||||
targets.darwin = {
|
||||
linkApps.enable = false; # spotlight ignores symlinks
|
||||
copyApps.enable = true;
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
wireshark # on NixOS systems enabled via system config
|
||||
_1password-cli
|
||||
rectangle
|
||||
# also TODO: color schemes nix-darwin
|
||||
];
|
||||
|
||||
# pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme
|
||||
programs.bat.config.theme = "Visual Studio Dark+";
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
# defaults in bottom match block "*"
|
||||
# TODO: common config for desktop as well
|
||||
serverAliveInterval = 10;
|
||||
serverAliveCountMax = 2; # 2 strikes and you're out
|
||||
# ssh host config
|
||||
matchBlocks = {
|
||||
|
||||
# early catchall to enforce agent socket usage. **NOT** the place for fallback defaults.
|
||||
"*" = {
|
||||
extraOptions = {
|
||||
IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
|
||||
};
|
||||
};
|
||||
|
||||
"hydra01" = lib.hm.dag.entryAfter [ "*" ] {
|
||||
hostname = "hydra01.access.whq.gocept.net";
|
||||
user = "os";
|
||||
};
|
||||
"fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] {
|
||||
hostname = "vpn-whq.services.fcio.net";
|
||||
extraOptions = {
|
||||
LogLevel = "Verbose";
|
||||
AddressFamily = "inet";
|
||||
ControlMaster = "auto";
|
||||
# not too long, due to the frequent keepalives
|
||||
ControlPersist = "1h";
|
||||
};
|
||||
|
||||
};
|
||||
"fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] {
|
||||
# multiplexer, e.g. to avoid rate limiting on jumphost usage
|
||||
hostname = "vpn-rzob.services.fcio.net";
|
||||
extraOptions = {
|
||||
LogLevel = "Verbose";
|
||||
AddressFamily = "inet";
|
||||
ControlMaster = "auto";
|
||||
# not too long, due to the frequent keepalives
|
||||
ControlPersist = "1h";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.git =
|
||||
let
|
||||
contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
|
||||
in
|
||||
{
|
||||
includes = [
|
||||
{
|
||||
condition = "gitdir:~/src/schmittlauch/";
|
||||
contents = {
|
||||
user = {
|
||||
inherit (contacts.schmittlauch) name email;
|
||||
};
|
||||
};
|
||||
}
|
||||
]
|
||||
# set default name for several other common locations
|
||||
++ map (dir: {
|
||||
condition = "gitdir:${dir}";
|
||||
contents = {
|
||||
user = {
|
||||
inherit (contacts.work) name email;
|
||||
};
|
||||
};
|
||||
}) [ "~/" ];
|
||||
};
|
||||
|
||||
# some extra shell scripts
|
||||
programs.zsh.initContent = lib.mkAfter (
|
||||
import ./scripts/reporsync.nix { inherit pkgs lib; }
|
||||
+ import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
|
||||
);
|
||||
|
||||
# separate proxied browser using the DHCP-supplied DNS for accessing captive portals
|
||||
programs.captive-browser = {
|
||||
enable = true;
|
||||
interface = "en0";
|
||||
};
|
||||
launchd.agents.hydra_proxy = {
|
||||
enable = true;
|
||||
config = {
|
||||
ProgramArguments = [
|
||||
"${lib.getExe pkgs.autossh}"
|
||||
"-M"
|
||||
"0"
|
||||
"-D"
|
||||
"1080"
|
||||
"-oServerAliveInterval=30"
|
||||
"-oControlMaster=no"
|
||||
"-N"
|
||||
"vpn-whq.services.fcio.net"
|
||||
];
|
||||
# TODO: consider socket activation instead
|
||||
KeepAlive = true;
|
||||
ThrottleInterval = 60;
|
||||
};
|
||||
};
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"1password-cli"
|
||||
"claude-code"
|
||||
]; # nixpkgs.config merging is unfortunately broken
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
}
|
||||
|
|
@ -1,17 +1,10 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, system, ...}:
|
||||
let
|
||||
unstable = config.inputInjection.flake-inputs.nixos-unstable.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../../common
|
||||
../../common/pipewire.nix
|
||||
|
||||
./hardware-configuration.nix
|
||||
./storage.nix
|
||||
|
|
@ -20,34 +13,48 @@ in
|
|||
|
||||
networking.hostName = "framenix"; # Define your hostname.
|
||||
|
||||
# use newer linux-firmware from unstable
|
||||
hardware.firmware = lib.mkBefore [ unstable.linux-firmware ];
|
||||
|
||||
# override tmpdir for daemon
|
||||
systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
|
||||
|
||||
# try newer kernels
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_latest.override {
|
||||
argsOverride = rec {
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
hash = "sha256-sLypPyMhFhamhQOWDIkzZ5cVrWfoZDb3prJaESD6UU0=";
|
||||
};
|
||||
version = "6.8-rc4";
|
||||
modDirVersion = "6.8.0-rc4";
|
||||
};
|
||||
});
|
||||
# revert some commits that introduced the clourful graphics artefacts flickering,
|
||||
# at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097
|
||||
boot.kernelPatches = [
|
||||
{name = "[PATCH] platform/x86/amd/pmf: Fix a suspend hang on Framework 13";
|
||||
patch = pkgs.fetchpatch {
|
||||
url = "https://lore.kernel.org/platform-driver-x86/20240217005216.113408-1-mario.limonciello@amd.com/raw";
|
||||
hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4=";
|
||||
};
|
||||
}
|
||||
{name = "drm/buddy: Fix alloc_range() error handling code";
|
||||
patch = pkgs.fetchpatch {
|
||||
url = "https://cgit.freedesktop.org/drm/drm-misc/patch/?id=8746c6c9dfa31d269c65dd52ab42fde0720b7d91";
|
||||
hash = "sha256-Ir7TDLspbYilTJr6aVVb8urIYI2N2vZwI5ayp7laaGw=";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
# temporary workaround for white flickering graphics artefacts
|
||||
"amdgpu.sg_display=0"
|
||||
# powersave
|
||||
"amd_pstate=active"
|
||||
"amdgpu.abmlevel=1" # adaptive backlight management
|
||||
];
|
||||
|
||||
# disable WLAN powersave
|
||||
networking.networkmanager.settings.connection."wifi.powersave" = 2;
|
||||
|
||||
boot.initrd.systemd.enable = true;
|
||||
|
||||
# at boot by default, limit charging capacity to protect battery.
|
||||
# Hopefully there's gonna be a standard interface to control this from the desktop at some point.
|
||||
systemd.services.battery-charge-limit = {
|
||||
wantedBy = [ "basic.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${lib.getExe pkgs.framework-tool} --driver portio --charge-limit 85";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
};
|
||||
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
|
@ -83,3 +90,4 @@ in
|
|||
pkgs.framework-tool
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,18 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"thunderbolt"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,24 +1,17 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
fsOptions = [
|
||||
"noatime"
|
||||
"ssd"
|
||||
"compress=zstd"
|
||||
];
|
||||
fsOptions = [ "noatime" "ssd" "compress=zstd" ];
|
||||
in
|
||||
{
|
||||
boot.initrd.luks = {
|
||||
devices =
|
||||
# allow discards on all devices
|
||||
builtins.mapAttrs (name: val: val // { allowDiscards = true; }) {
|
||||
builtins.mapAttrs (name: val: val // {allowDiscards = true;})
|
||||
{
|
||||
"system".device = "/dev/disk/by-uuid/1838cdc5-9b0b-4c46-9f23-9465549eeb92";
|
||||
"cryptswap".device = "/dev/disk/by-uuid/ded7d649-ab3a-42ee-ae4a-f8c4ba029e9c";
|
||||
"cryptswap".device = "/dev/disk/by-uuid/ded7d649-ab3a-42ee-ae4a-f8c4ba029e9c";
|
||||
};
|
||||
reusePassphrases = true;
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
|
|
@ -39,26 +32,12 @@ in
|
|||
fsType = "vfat";
|
||||
options = [ "discard" ];
|
||||
};
|
||||
# nix/ lix build directory
|
||||
# lix:
|
||||
# > If you plan to use a tmpfs, we **strongly recommend** to set `mode=0755` as a mount option for that `tmpfs`, otherwise you are effectively reverting this mitigation.
|
||||
"/nix/var/nix/builds" = {
|
||||
device = "tmpfs";
|
||||
fsType = "tmpfs";
|
||||
options = [
|
||||
"mode=0755"
|
||||
"size=75%"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.fstrim.enable = true;
|
||||
services.btrfs.autoScrub = {
|
||||
enable = true;
|
||||
fileSystems = [
|
||||
"/"
|
||||
"/home"
|
||||
];
|
||||
fileSystems = [ "/" "/home" ];
|
||||
};
|
||||
|
||||
boot.tmp.useTmpfs = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/24c47f3d-0d3e-4575-92a2-174b5a6b6086"; } ];
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/24c47f3d-0d3e-4575-92a2-174b5a6b6086"; }
|
||||
];
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ...}:
|
||||
{
|
||||
imports = [
|
||||
../../common
|
||||
../../common/pulseaudio.nix
|
||||
|
||||
./hardware-configuration.nix
|
||||
./storage.nix
|
||||
|
|
@ -16,18 +10,16 @@
|
|||
./secureboot.nix
|
||||
];
|
||||
|
||||
|
||||
hardware.trackpoint = {
|
||||
enable = true;
|
||||
sensitivity = 180;
|
||||
speed = 180;
|
||||
};
|
||||
|
||||
boot.extraModprobeConfig = "options thinkpad_acpi fan_control=1"; # enable fan control via echo to /proc/acpi/ibm/fan
|
||||
|
||||
schmittlauch.guestUser.enable = true;
|
||||
|
||||
networking.hostName = "thinknix";
|
||||
|
||||
|
||||
# This value determines the NixOS release with which your system is to be
|
||||
# compatible, in order to avoid breaking some software such as database
|
||||
# servers. You should change this only after NixOS release notes say you
|
||||
|
|
|
|||
|
|
@ -1,27 +1,20 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
nix.settings.max-jobs = lib.mkDefault 4;
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
|
||||
# modesetting is always better than intel (legacy)
|
||||
services.xserver.videoDrivers = [ "modesetting" ];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ...}:
|
||||
{
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# UEFI secure boot
|
||||
environment.systemPackages = [ pkgs.sbctl ];
|
||||
environment.systemPackages = [
|
||||
pkgs.sbctl
|
||||
];
|
||||
# Lanzaboote currently replaces the systemd-boot module.
|
||||
# This setting is usually set to true in configuration.nix
|
||||
# generated at installation time. So we force it to false
|
||||
|
|
@ -19,4 +16,5 @@
|
|||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,19 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
fsOptions = [
|
||||
"noatime"
|
||||
"ssd"
|
||||
"space_cache"
|
||||
"compress=zstd"
|
||||
];
|
||||
fsOptions = [ "noatime" "ssd" "space_cache" "compress=zstd" ];
|
||||
in
|
||||
{
|
||||
# encrypted partitions
|
||||
boot.initrd.luks = {
|
||||
devices =
|
||||
# allow discards on all devices
|
||||
builtins.mapAttrs (name: val: val // { allowDiscards = true; }) {
|
||||
builtins.mapAttrs (name: val: val // {allowDiscards = true;})
|
||||
{
|
||||
"system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef";
|
||||
"cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa";
|
||||
"ssd2".device = "/dev/disk/by-uuid/cadd4e1f-3642-4faa-8d4e-37dd85465df1";
|
||||
};
|
||||
reusePassphrases = true;
|
||||
reusePassphrases = true;
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
|
|
@ -66,20 +57,16 @@ in
|
|||
services.fstrim.enable = true;
|
||||
services.btrfs.autoScrub = {
|
||||
enable = true;
|
||||
fileSystems = [
|
||||
"/"
|
||||
"/home"
|
||||
];
|
||||
fileSystems = [ "/" "/home" ];
|
||||
};
|
||||
|
||||
|
||||
boot.tmp.useTmpfs = true;
|
||||
fileSystems."/tmp".fsType = "tmpfs";
|
||||
|
||||
services.smartd = {
|
||||
enable = true;
|
||||
devices = [
|
||||
{ device = "/dev/sda"; }
|
||||
{ device = "/dev/sdb"; }
|
||||
];
|
||||
};
|
||||
services.smartd =
|
||||
{
|
||||
enable = true;
|
||||
devices = [{ device = "/dev/sda"; } { device = "/dev/sdb"; }];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; } ];
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; }
|
||||
];
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
experimentUid ? 1000,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, experimentUid ? 1000, ... }:
|
||||
|
||||
let
|
||||
projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
|
||||
projectPath = builtins.toPath projectDir;
|
||||
projectMount = "/mnt/project";
|
||||
shell = (import (projectDir + "/Hash2Pub/default.nix") { }).shell;
|
||||
shell = (import (projectDir + "/Hash2Pub/default.nix") {}).shell;
|
||||
simulationSetupScript = pkgs.writeShellScriptBin "simulationSetup" ''
|
||||
# make cabal-install work offline
|
||||
mkdir $HOME/.cabal
|
||||
|
|
@ -17,30 +12,25 @@ let
|
|||
|
||||
# run simulation script within the shell
|
||||
${pkgs.nix}/bin/nix-shell ${shell.drvPath} --command "cd ${projectMount} && bash ./build/simulationrunner.sh 2>&1"
|
||||
'';
|
||||
instanceData = builtins.fromJSON (
|
||||
builtins.readFile "${projectDir}/simulationData/inputs/generated/instances_sample.json"
|
||||
);
|
||||
'';
|
||||
instanceData = builtins.fromJSON (builtins.readFile "${projectDir}/simulationData/inputs/generated/instances_sample.json");
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
privateNetwork = true;
|
||||
ephemeral = true;
|
||||
bindMounts = {
|
||||
"${projectMount}" = {
|
||||
hostPath = projectDir;
|
||||
isReadOnly = false;
|
||||
};
|
||||
"${projectMount}" = { hostPath = projectDir; isReadOnly = false; };
|
||||
};
|
||||
|
||||
config = {
|
||||
networking = {
|
||||
firewall.enable = false;
|
||||
interfaces.lo.ipv6.addresses = builtins.map (inst: {
|
||||
address = inst.ip;
|
||||
prefixLength = 0;
|
||||
}) instanceData;
|
||||
extraHosts = pkgs.lib.concatMapStringsSep "\n" (inst: "${inst.ip} ${inst.hostname}") instanceData;
|
||||
interfaces.lo.ipv6.addresses =
|
||||
builtins.map (inst: {address = inst.ip; prefixLength = 0;}) instanceData;
|
||||
extraHosts =
|
||||
pkgs.lib.concatMapStringsSep "\n" (inst: "${inst.ip} ${inst.hostname}") instanceData;
|
||||
};
|
||||
# avoid permission problems with project builds
|
||||
users.users.experimentor = {
|
||||
|
|
@ -49,14 +39,12 @@ in
|
|||
};
|
||||
|
||||
# adjust open file limits
|
||||
security.pam.loginLimits = [
|
||||
{
|
||||
domain = "*";
|
||||
type = "-";
|
||||
item = "nofile";
|
||||
value = "50000";
|
||||
}
|
||||
];
|
||||
security.pam.loginLimits = [{
|
||||
domain = "*"
|
||||
; type = "-"
|
||||
; item = "nofile"
|
||||
; value = "50000"
|
||||
;}];
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.netcat
|
||||
|
|
@ -67,7 +55,7 @@ in
|
|||
pkgs.iftop
|
||||
(pkgs.writeShellScriptBin "doSimulation" ''
|
||||
su experimentor -c "${simulationSetupScript}/bin/simulationSetup"
|
||||
'')
|
||||
'')
|
||||
pkgs.tcpdump
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
ssh-ng://schmittlauch@build01.nix-community.org x86_64-linux /root/.ssh/remote_builder_key 64 1 big-parallel,kvm,nixos-test -
|
||||
|
|
@ -1,8 +1,12 @@
|
|||
final: prev: {
|
||||
python3 = prev.python3.override {
|
||||
packageOverrides = python-final: python-prev: {
|
||||
# spsdk tests fail with timeout on old laptop thinknix
|
||||
spsdk = python-prev.spsdk.overridePythonAttrs { doCheck = false; };
|
||||
};
|
||||
};
|
||||
power-profiles-daemon = prev.power-profiles-daemon.overrideAttrs (old: {
|
||||
patches = [
|
||||
# patch for AMD pstate CPUs
|
||||
(final.fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/127.patch";
|
||||
sha256 = "sha256-CneqixlpZx9iZ0PM5MFIutsvnqKrLlM7FHOHUA/MK6g=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue