Compare commits
No commits in common. "keyring" and "main" have entirely different histories.
4
.guix-authorizations
Normal file
4
.guix-authorizations
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
(authorizations
|
||||||
|
(version 0)
|
||||||
|
(("A0C9 1947 734F 076F 5F08 E9FF 257D 284A 2A1D 3A32"
|
||||||
|
(name "Saku Laesvuori"))))
|
||||||
24
.guix-channel
Normal file
24
.guix-channel
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
(channel
|
||||||
|
(version 0)
|
||||||
|
(directory "modules")
|
||||||
|
(keyring-reference "keyring")
|
||||||
|
(url "https://git.olarinmaensamoojat.fi/OMS/tietokoneet.git")
|
||||||
|
(dependencies
|
||||||
|
(channel
|
||||||
|
(name sops-guix)
|
||||||
|
(url "https://github.com/fishinthecalculator/sops-guix.git")
|
||||||
|
(branch "main")
|
||||||
|
(introduction
|
||||||
|
(channel-introduction
|
||||||
|
(version 0)
|
||||||
|
(commit "0bbaf1fdd25266c7df790f65640aaa01e6d2dbc9")
|
||||||
|
(signer "8D10 60B9 6BB8 292E 829B 7249 AED4 1CC1 93B7 01E2"))))
|
||||||
|
;; Ikävä kyllä OMSin tietokoneet tarvitsevat ei-vapaita laiteohjelmia
|
||||||
|
(channel
|
||||||
|
(name nonguix)
|
||||||
|
(url "https://gitlab.com/nonguix/nonguix")
|
||||||
|
(introduction
|
||||||
|
(channel-introduction
|
||||||
|
(version 0)
|
||||||
|
(commit "897c1a470da759236cc11798f4e0a5f7d4d59fbc")
|
||||||
|
(signer "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))))
|
||||||
661
COPYING
Normal file
661
COPYING
Normal file
@ -0,0 +1,661 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are 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.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
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 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 work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
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 AGPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
34
README.md
Normal file
34
README.md
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# OMSin tietokoneiden asetukset
|
||||||
|
|
||||||
|
Tietokoneiden käyttöjärjestelmät määritetään [GNU Guixin avulla][guix-system]
|
||||||
|
`modules`-hakemistossa olevalla Scheme-koodilla. Koneet hakevat uudet asetukset
|
||||||
|
ja päivitykset automaattisesti täältä joka viikko.
|
||||||
|
|
||||||
|
[guix-system]: https://guix.gnu.org/manual/devel/en/guix.html#System-Configuration
|
||||||
|
|
||||||
|
## Muutosten tekeminen
|
||||||
|
|
||||||
|
Jonkun ylläpitäjän täytyy allekirjoittaa muutokset sähköisesti ennen kuin ne
|
||||||
|
voidaan julkaista `main`-haarassa. Muuten tietokoneet hylkäävät ne
|
||||||
|
turvallisuussyistä ja automaattiset päivitykset loppuvat.
|
||||||
|
|
||||||
|
## Ylläpitäjän lisääminen
|
||||||
|
|
||||||
|
Muutosoikeuksien Gittiin lisäämisen lisäksi uuden ylläpitäjän PGP-avain pitää
|
||||||
|
tallentaa [`keyring`](keyring)-haaraan sekä rekisteröidä
|
||||||
|
`.guix-authorizations`-tiedostoon. [Katso lisätietoja GNU Guixin
|
||||||
|
käyttöohjeista.][authorizations]
|
||||||
|
|
||||||
|
[authorizations]: https://guix.gnu.org/manual/devel/en/guix.html#Specifying-Channel-Authorizations
|
||||||
|
|
||||||
|
Myös SSH- ja Guix-avainten lisääminen `files/keys`-hakemistoon ja rekisteröinti
|
||||||
|
`modules/oms/admins.scm`-tiedostossa sekä salaisuuksien jakaminen
|
||||||
|
`files/sops`-hakemistosta voivat tulla kyseeseen.
|
||||||
|
|
||||||
|
## Kopioiminen
|
||||||
|
|
||||||
|
Kaikkea tässä tietovarannossa olevaa tietoa, poislukien salatut tiedostot ja
|
||||||
|
avaimet, jotka on tarkoitettu vain Olarinmäen samoojat ry:n käyttöön, saa
|
||||||
|
kopioida ja jakaa [GNU AGPL-lisenssin version 3](main/COPYING), tai valintasi mukaan
|
||||||
|
minkä tahansa myöhemmän Free Software Foundationin julkaiseman version, ehtojen
|
||||||
|
mukaan.
|
||||||
30
channels.lock.scm
Normal file
30
channels.lock.scm
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
(list (channel
|
||||||
|
(name 'guix)
|
||||||
|
(url "https://git.guix.gnu.org/guix.git")
|
||||||
|
(branch "master")
|
||||||
|
(commit "8aa82da48c219d3e9b47b209660215e4ddd33d09")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"9edb3f66fd807b096b48283debdcddccfea34bad"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
|
||||||
|
(channel
|
||||||
|
(name 'sops-guix)
|
||||||
|
(url "https://github.com/fishinthecalculator/sops-guix.git")
|
||||||
|
(branch "main")
|
||||||
|
(commit "c53e27e533836ea8595626ba6796dee5362f8c4a")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"0bbaf1fdd25266c7df790f65640aaa01e6d2dbc9"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"8D10 60B9 6BB8 292E 829B 7249 AED4 1CC1 93B7 01E2"))))
|
||||||
|
(channel
|
||||||
|
(name 'nonguix)
|
||||||
|
(url "https://gitlab.com/nonguix/nonguix")
|
||||||
|
(branch "master")
|
||||||
|
(commit "653504e6551198c9b2b998c143d7cf2675b22547")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))))
|
||||||
27
channels.scm
Normal file
27
channels.scm
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
(list (channel
|
||||||
|
(name 'guix)
|
||||||
|
(url "https://git.guix.gnu.org/guix.git")
|
||||||
|
(branch "master")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"9edb3f66fd807b096b48283debdcddccfea34bad"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
|
||||||
|
(channel
|
||||||
|
(name 'sops-guix)
|
||||||
|
(url "https://github.com/fishinthecalculator/sops-guix.git")
|
||||||
|
(branch "main")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"0bbaf1fdd25266c7df790f65640aaa01e6d2dbc9"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"8D10 60B9 6BB8 292E 829B 7249 AED4 1CC1 93B7 01E2"))))
|
||||||
|
(channel
|
||||||
|
(name 'nonguix)
|
||||||
|
(url "https://gitlab.com/nonguix/nonguix")
|
||||||
|
(branch "master")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))))
|
||||||
11
etc/cuirass-manifest.scm
Normal file
11
etc/cuirass-manifest.scm
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
(use-modules (gnu system)
|
||||||
|
(guix profiles)
|
||||||
|
(oms systems))
|
||||||
|
|
||||||
|
(define (operating-system->manifest-entry os)
|
||||||
|
(manifest-entry
|
||||||
|
(name (string-append (operating-system-host-name os) "-system"))
|
||||||
|
(version "0")
|
||||||
|
(item os)))
|
||||||
|
|
||||||
|
(manifest (map operating-system->manifest-entry %oms-systems))
|
||||||
6
files/OMS-kone/dhcpd.conf
Normal file
6
files/OMS-kone/dhcpd.conf
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
option domain-name "kolo.olarinmaensamoojat.fi";
|
||||||
|
option domain-name-servers 192.168.1.1;
|
||||||
|
subnet 192.168.1.0 netmask 255.255.255.0 {
|
||||||
|
option routers 192.168.1.1;
|
||||||
|
range 192.168.1.100 192.168.1.240;
|
||||||
|
}
|
||||||
32
files/OMS-kone/nftables.rules
Normal file
32
files/OMS-kone/nftables.rules
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
flush ruleset
|
||||||
|
|
||||||
|
table inet firewall_and_nat {
|
||||||
|
chain samoojaverkko_input {
|
||||||
|
accept
|
||||||
|
}
|
||||||
|
chain wireguard_input {
|
||||||
|
accept
|
||||||
|
}
|
||||||
|
chain input {
|
||||||
|
type filter hook input priority filter; policy drop;
|
||||||
|
iifname lo accept
|
||||||
|
ct state invalid drop
|
||||||
|
ct state { established, related } accept
|
||||||
|
iifname wlp2s0 jump samoojaverkko_input
|
||||||
|
iifname wg0 jump wireguard_input
|
||||||
|
}
|
||||||
|
chain forward {
|
||||||
|
type filter hook forward priority filter; policy drop;
|
||||||
|
ct state invalid drop
|
||||||
|
ct state { established, related } accept
|
||||||
|
iifname wlp2s0 accept
|
||||||
|
iifname wg0 accept
|
||||||
|
}
|
||||||
|
chain output {
|
||||||
|
type filter hook output priority filter; policy accept;
|
||||||
|
}
|
||||||
|
chain nat_masquerade {
|
||||||
|
type nat hook postrouting priority srcnat;
|
||||||
|
oifname enp1s0 ip saddr 192.168.0.0/16 masquerade
|
||||||
|
}
|
||||||
|
}
|
||||||
4
files/keys/guix/nonguix.pub
Normal file
4
files/keys/guix/nonguix.pub
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
(public-key
|
||||||
|
(ecc
|
||||||
|
(curve Ed25519)
|
||||||
|
(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))
|
||||||
6
files/keys/guix/saku-laesvuori-x-kone.pub
Normal file
6
files/keys/guix/saku-laesvuori-x-kone.pub
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
(public-key
|
||||||
|
(ecc
|
||||||
|
(curve Ed25519)
|
||||||
|
(q #24B936F16F885AA15419CA6E57C2D402AE2887135167FEFE18B90DC15C6B8AAD#)
|
||||||
|
)
|
||||||
|
)
|
||||||
1
files/keys/ssh/saku-laesvuori-x-kone.pub
Normal file
1
files/keys/ssh/saku-laesvuori-x-kone.pub
Normal file
@ -0,0 +1 @@
|
|||||||
|
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtvgHIqHsLPh+X2OqdUUiTnWn8vtgMrpV3UHluAF26l4YEjEpoh7NBI9QFaILkK68jcyiJ/0O+ikJnqjRZg3zm4mmvnhP+1UypuoMeZq3GR2WUdmUV58c6Y37SYTXICXFDKgKZIBEFbMi/J6HuHIyt/t1fl5htiDah594rxRaB3QoE3KqqHTIAeFncj/bwkyRRkBMSrI0Z0+OpEZ6qzlXYgWmAHsra4iuTxvTssIJdBfEKzqDeKGTjCcyUbyz/XaCShES6XSDnuFNT4wQfFx3SRT99VzXIAFwskRRb/B7Yx0NgR6WGHcFm4qsUay/95wK9R6DXP1rLAXzbJVrC8Y1de2D3Lo4bkVU3lh4JyRAyYybHq9qGQ4DNZ0tMiADfd3w1ZuoURUpjEYaa9FkLvIA36VQINGqRMQ/PXYVpppFqe8Y7CNdLWtdDOjJEq0QSkSmdolTMcxzWLdqyt+TSlCoRgMdbafzxQx184ij7+QZ8wa/M/xNytgru4zM+/wQhd9c= saku@X-kone
|
||||||
44
files/oms-evolution-calendar.source
Normal file
44
files/oms-evolution-calendar.source
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
[Data Source]
|
||||||
|
DisplayName=OMS
|
||||||
|
Enabled=true
|
||||||
|
Parent=webcal-stub
|
||||||
|
|
||||||
|
[Authentication]
|
||||||
|
Host=calendar.google.com
|
||||||
|
Method=plain/password
|
||||||
|
Port=443
|
||||||
|
ProxyUid=system-proxy
|
||||||
|
RememberPassword=true
|
||||||
|
User=
|
||||||
|
CredentialName=
|
||||||
|
IsExternal=false
|
||||||
|
|
||||||
|
[Security]
|
||||||
|
Method=tls
|
||||||
|
|
||||||
|
[WebDAV Backend]
|
||||||
|
AvoidIfmatch=false
|
||||||
|
CalendarAutoSchedule=false
|
||||||
|
Color=
|
||||||
|
DisplayName=
|
||||||
|
EmailAddress=
|
||||||
|
ResourcePath=/calendar/ical/olarinmaensamoojat@gmail.com/public/basic.ics
|
||||||
|
ResourceQuery=
|
||||||
|
SslTrust=
|
||||||
|
Order=4294967295
|
||||||
|
Timeout=30
|
||||||
|
LimitDownloadDays=0
|
||||||
|
|
||||||
|
[Calendar]
|
||||||
|
BackendName=webcal
|
||||||
|
Color=rgb(38,162,105)
|
||||||
|
Selected=true
|
||||||
|
Order=0
|
||||||
|
|
||||||
|
[Offline]
|
||||||
|
StaySynchronized=true
|
||||||
|
|
||||||
|
[Refresh]
|
||||||
|
Enabled=true
|
||||||
|
EnabledOnMeteredNetwork=true
|
||||||
|
IntervalMinutes=30
|
||||||
10
files/sops/.sops.yaml
Normal file
10
files/sops/.sops.yaml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
keys:
|
||||||
|
- &saku-laesvuori A0C91947734F076F5F08E9FF257D284A2A1D3A32
|
||||||
|
- &OMS-kone D70ADEB8DFCC7DDB13B83E9B60E9442BA424EBD3
|
||||||
|
|
||||||
|
creation_rules:
|
||||||
|
- path_regex: ^OMS-kone.yaml$
|
||||||
|
key_groups:
|
||||||
|
- pgp:
|
||||||
|
- *saku-laesvuori
|
||||||
|
- *OMS-kone
|
||||||
40
files/sops/OMS-kone.yaml
Normal file
40
files/sops/OMS-kone.yaml
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
wpa-psk: ENC[AES256_GCM,data:2kKBEMJl8CS5y2OxIUP+iEUb2NipkFmcR1E=,iv:Mo1iXxP3mckFY0frN3G5TNClXd2R6Py1IW7Pi3D+Cn4=,tag:wpRwVpJXworEwGd0ugbKxw==,type:str]
|
||||||
|
wg-private-key: ENC[AES256_GCM,data:4irlnZLArzlEDF6H7J87RAbTSzd4DB4EF5PSjFI/fJieIuwKaAR1Q7a83dw=,iv:1zCLPVNqwvhCmkzypLjNIIe0kIgMTPeoUrHnGPaqfQc=,tag:N3BRacdX9EZFxPxwRAqWFw==,type:str]
|
||||||
|
sops:
|
||||||
|
lastmodified: "2026-08-19T16:50:51Z"
|
||||||
|
mac: ENC[AES256_GCM,data:7Wztf61am4tWXBkCq5FE0eavV4p+Xe/QXcG5m54iRML4NVAx9CUjTCoM1idKSsjLmCGzAEL7bWx98MG6NnYEMgS+KvNRPKZHqDnDrLgr14MycH1w976aiQA0+T3w6yG5a3FSiZXgNDA2wZ9ZCsiQIhlu5JkdVPr5L8yr46TBpzM=,iv:0lHrkcHTzmWhNGDx8aM/5k8cbVb1pUmUjxibTXlGK/U=,tag:wne2NRvv3WklaHmi+PjWuQ==,type:str]
|
||||||
|
pgp:
|
||||||
|
- created_at: "2026-08-12T13:05:39Z"
|
||||||
|
enc: |-
|
||||||
|
-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
hQIMA/QlAv6mQqxoARAAm/Q4hyhJ797BpoydN6HcI8olVVXZvp3oQ0WxILt1wH5N
|
||||||
|
7E6JfAEzxzdpEC/2lyS+IORMnLgkhJzlBTv2Wd34mlWeZ08EnhmMpMBHBeUWj6Ah
|
||||||
|
bKJFxfPb2MqcHBm1CLft/ei7mOVnnEb6qzzkXhWFFhxb34e8HCn0oIgREGqpBv6q
|
||||||
|
BQNFYmt9IOQOFvmfnYhppBRL/UyaWENs0veINncmY36ElsFAfb2dpPqJbeEXKnJG
|
||||||
|
+78nUOpctKfKDe16RPHLuiFWKMfzamciPBO0j1YoJo4wh8zoe1l6A0Ar4yFpgpL3
|
||||||
|
4KpNdwZrNjzBH2GTMQ8LdZjnWVcX2V5ZQ3I/srWHSKqFl/Q/pXclSCecV9afZzV1
|
||||||
|
sAvwg1T/WCpJ82LGfJBnYMB2EGhmIAkMCV1tpAacK1MN5rHcuJak3wvRVm7RfEP7
|
||||||
|
n6YoQU7XUkXgsw9rg9tuWt90T3O6Z5PC6f3YtZ4K+yVrA90OKxLhmLxjCnPINikT
|
||||||
|
2rP3biMge5eUplReUtObuxuNr+qVyaKPLPxaW2gBzQ+wjE2O2X2p5McQTGRzh+hi
|
||||||
|
N7foCjniEzQapjV6cjjKwBJS8l+tYxYfuA4yGSJN5O4zc5KgQwP8Lq1ExvYu1hol
|
||||||
|
1XUDjjn46zUzLDvGP7bu/21NOY8e1lKd04fYFUn5czx1MlyrDpmp54zxvKgr+urS
|
||||||
|
XAHQSDnaDhh+2s203YL/j2CSs1oNEbN7ctEaqlvoXhAeGmMAAowFDW9eR3HPtnus
|
||||||
|
65nH3OaXgUIFlARaLYpJl8/pbB06C24qRLah3jaX3dTSFigTv77DyE3ZeUZe
|
||||||
|
=ttg1
|
||||||
|
-----END PGP MESSAGE-----
|
||||||
|
fp: A0C91947734F076F5F08E9FF257D284A2A1D3A32
|
||||||
|
- created_at: "2026-08-12T13:05:39Z"
|
||||||
|
enc: |-
|
||||||
|
-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
hF4Du53yw99JEwQSAQdApGSh5Fbt0y9PGIF6MLk1JkaF4anF9r434ezd9Dj+Gkcw
|
||||||
|
QjMFXhGR/l/QVw1q5Rkwac1FgNpevuWwlupAzmXsD3/yViM+8OwV/+RBCDSSzyUE
|
||||||
|
1GYBCQIQ6gI3gx5E3G1mjLwiSzh6zCxfgpYXeX+desnsgsldj/zkYLnMteTHy7/x
|
||||||
|
/BsURV7CyK6sT/B6okxq1H/lZV3Xr15kvMIc8t44XYkFq+2eyIn5BAOZDLqTZ8Tx
|
||||||
|
EZEc6BiaE7U=
|
||||||
|
=5mFp
|
||||||
|
-----END PGP MESSAGE-----
|
||||||
|
fp: D70ADEB8DFCC7DDB13B83E9B60E9442BA424EBD3
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.12.2
|
||||||
48
files/sops/README.md
Normal file
48
files/sops/README.md
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
# Guix SOPS -salaisuuksienhallinta
|
||||||
|
|
||||||
|
<https://github.com/fishinthecalculator/sops-guix>
|
||||||
|
|
||||||
|
## Uuden laitteen lisääminen
|
||||||
|
|
||||||
|
Jokaiselle salaisuuksia tarvitsevalle laitteelle luodaan oma PGP-salausavain
|
||||||
|
seuraavan kaltaisella komennolla. Olennaista on, että avaimella ei ole
|
||||||
|
salasanaa eikä se vanhene.
|
||||||
|
|
||||||
|
```
|
||||||
|
gpg --batch --passphrase '' --quick-generate-key \
|
||||||
|
'(SOPS Guix -salauksen purkamiseen) <root@LAITE>' default default never
|
||||||
|
```
|
||||||
|
|
||||||
|
Tämän avaimen yksityinen osa tallennetaan salattuna kaikille ylläpitäjille
|
||||||
|
hakemistoon `host-decryption-keys` käyttämällä apuna `./encrypt-private-key.sh`
|
||||||
|
komentokyhäelmää. Kyhäelmä hakee ylläpitäjien julkiset salausavaimet
|
||||||
|
hakemistosta `./admin-encryption-keys`.
|
||||||
|
|
||||||
|
```
|
||||||
|
gpg --export-secret-keys root@LAITE | ./encrypt-private-key.sh > host-decryption-keys/LAITE.key.gpg
|
||||||
|
```
|
||||||
|
|
||||||
|
Lisäksi yksityinen avain viedään laitteen `root`-käyttäjän avainrenkaaseen.
|
||||||
|
|
||||||
|
```
|
||||||
|
gpg --decrypt < host-decryption-keys/LAITE.key.gpg | ssh root@LAITE 'gpg --import'
|
||||||
|
```
|
||||||
|
|
||||||
|
Avaimen tunniste lisätään salaisuuksienhallinan ohjaustiedostoon `sops.yaml`
|
||||||
|
omalle rivilleen kohtaan `keys`. Tunnisteen saa näkyviin ajamalla komennon
|
||||||
|
`gpg --list-keys root@LAITE`. Kun kaikki ylläolevista on tehty, laitteelle voi
|
||||||
|
asentaa salaisuuksia.
|
||||||
|
|
||||||
|
## Uuden ylläpitäjän lisääminen
|
||||||
|
|
||||||
|
Ylläpitäjä tarvitsee oman PGP-salausavaimensa, jonka voi luoda esimerkiksi
|
||||||
|
GnuPG:llä komennolla `gpg --generate-key`. Avaimen julkinen eli salauspuoli
|
||||||
|
tallennetaan hakemistoon `./admin-encryption-keys` muita ylläpitäjiä varten.
|
||||||
|
|
||||||
|
```
|
||||||
|
gpg --armor --export AVAIN > admin-encryption-keys/YLLÄPITÄJÄ.pub
|
||||||
|
```
|
||||||
|
|
||||||
|
Lisäksi avaimen tunniste pitää lisätä `sops.yaml`-tiedostoon. Jonkun aiemman
|
||||||
|
ylläpitäjän pitää lisätä uusi tiedostojen salausryhmiin ja salata tiedostot
|
||||||
|
uudelleen ennen kuin ne ovat hänen luettavissaan.
|
||||||
52
files/sops/admin-encryption-keys/saku-laesvuori.pub
Normal file
52
files/sops/admin-encryption-keys/saku-laesvuori.pub
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
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
|
||||||
|
8WXUYb+YeXxijAcFcQ==
|
||||||
|
=AmUD
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
9
files/sops/encrypt-private-key.sh
Executable file
9
files/sops/encrypt-private-key.sh
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
recipients=""
|
||||||
|
|
||||||
|
for key in admin-encryption-keys/*; do
|
||||||
|
recipients="--recipient-file $key $recipients";
|
||||||
|
done
|
||||||
|
|
||||||
|
gpg --encrypt --armor $recipients "$@"
|
||||||
40
files/sops/host-decryption-keys/OMS-kone.key.gpg
Normal file
40
files/sops/host-decryption-keys/OMS-kone.key.gpg
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
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
|
||||||
|
PMDALdN2jfmnxE/zJvYD82TbanNy
|
||||||
|
=PuIl
|
||||||
|
-----END PGP MESSAGE-----
|
||||||
1
manifest.scm
Normal file
1
manifest.scm
Normal file
@ -0,0 +1 @@
|
|||||||
|
(specifications->manifest (list "sops" "wpa-supplicant"))
|
||||||
19
modules/oms/channel-file.scm
Normal file
19
modules/oms/channel-file.scm
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
(define-module (oms channel-file)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:export (channel-file))
|
||||||
|
|
||||||
|
(define (channel-path file)
|
||||||
|
(string-append (current-source-directory) "/../../files/" file))
|
||||||
|
|
||||||
|
(define-syntax channel-file
|
||||||
|
(lambda (s)
|
||||||
|
(syntax-case s ()
|
||||||
|
((channel-file file rest ...)
|
||||||
|
(string? (syntax->datum #'file))
|
||||||
|
(with-syntax ((file* (datum->syntax #'file (channel-path
|
||||||
|
(syntax->datum #'file)))))
|
||||||
|
#'(local-file file* rest ...)))
|
||||||
|
((channel-file file rest ...)
|
||||||
|
#'(local-file (channel-path file)
|
||||||
|
rest ...)))))
|
||||||
74
modules/oms/home.scm
Normal file
74
modules/oms/home.scm
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
(define-module (oms home)
|
||||||
|
#:use-module (gnu home)
|
||||||
|
#:use-module (gnu home services)
|
||||||
|
#:use-module (gnu home services shells)
|
||||||
|
#:use-module (gnu home services xdg)
|
||||||
|
#:use-module (gnu services)
|
||||||
|
#:use-module (gnu packages games)
|
||||||
|
#:use-module (gnu packages gnome-circle)
|
||||||
|
#:use-module (gnu packages gimp)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu packages graphics)
|
||||||
|
#:use-module (gnu packages haskell-xyz)
|
||||||
|
#:use-module (gnu packages inkscape)
|
||||||
|
#:use-module (gnu packages kde-graphics)
|
||||||
|
#:use-module (gnu packages libreoffice)
|
||||||
|
#:use-module (gnu packages luanti)
|
||||||
|
#:use-module (gnu packages maths)
|
||||||
|
#:use-module (gnu packages pdf)
|
||||||
|
#:use-module (gnu packages tex)
|
||||||
|
#:use-module (gnu packages version-control)
|
||||||
|
#:use-module (gnu packages video)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (oms channel-file)
|
||||||
|
#:use-module (oms home gsettings-schemas)
|
||||||
|
#:use-module (oms home services gnome))
|
||||||
|
|
||||||
|
(define-public oms-home-environment
|
||||||
|
(home-environment
|
||||||
|
(packages
|
||||||
|
(list 0ad
|
||||||
|
apostrophe
|
||||||
|
blender
|
||||||
|
gimp
|
||||||
|
git
|
||||||
|
gnome-2048
|
||||||
|
gnome-chess
|
||||||
|
gnome-tour
|
||||||
|
inkscape
|
||||||
|
krita
|
||||||
|
libreoffice
|
||||||
|
luanti
|
||||||
|
luanti-voxelibre
|
||||||
|
pandoc
|
||||||
|
qalculate-gtk
|
||||||
|
supertuxkart
|
||||||
|
texlive-scheme-medium
|
||||||
|
wesnoth
|
||||||
|
xonotic
|
||||||
|
xournalpp
|
||||||
|
yle-dl
|
||||||
|
yt-dlp))
|
||||||
|
(services
|
||||||
|
(append
|
||||||
|
(list (service home-gsettings-service-type
|
||||||
|
(home-gsettings-configuration
|
||||||
|
(reset? #t)
|
||||||
|
(schemas oms-gsettings-schemas)))
|
||||||
|
(service home-zsh-service-type)
|
||||||
|
(service home-xdg-user-directories-service-type
|
||||||
|
(home-xdg-user-directories-configuration
|
||||||
|
(desktop "$HOME")
|
||||||
|
(documents "$HOME/Asiakirjat")
|
||||||
|
(download "$HOME/Lataukset")
|
||||||
|
(music "$HOME/Musiikki")
|
||||||
|
(pictures "$HOME/Kuvat")
|
||||||
|
(projects "$HOME/Projektit")
|
||||||
|
(publicshare "$HOME")
|
||||||
|
(templates "$HOME/Mallit")
|
||||||
|
(videos "$HOME/Videot")))
|
||||||
|
(simple-service
|
||||||
|
'oms-calendar home-xdg-configuration-files-service-type
|
||||||
|
`(("evolution/sources/oms.source"
|
||||||
|
,(channel-file "oms-evolution-calendar.source")))))
|
||||||
|
%base-home-services))))
|
||||||
98
modules/oms/home/gsettings-schemas.scm
Normal file
98
modules/oms/home/gsettings-schemas.scm
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
(define-module (oms home gsettings-schemas)
|
||||||
|
#:use-module (oms home services gnome)
|
||||||
|
#:export (oms-gsettings-schemas))
|
||||||
|
|
||||||
|
(define oms-gsettings-schemas
|
||||||
|
(list
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.screen-time-limits")
|
||||||
|
(settings '(("history-enabled" . #f))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.mutter")
|
||||||
|
(settings '(("edge-tiling" . #t)
|
||||||
|
("dynamic-workspaces" . #t))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.interface")
|
||||||
|
(settings '(("enable-hot-corners" . #t))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.calendar")
|
||||||
|
(settings '(("show-weekdate" . #t))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.settings-daemon.plugins.color")
|
||||||
|
(settings `(("night-light-enabled" . #t)
|
||||||
|
("night-light-schedule-automatic" . #t)
|
||||||
|
("night-light-last-coordinates" .
|
||||||
|
,(raw-gvariant "(60.0, 25.0)")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.app-folders")
|
||||||
|
(settings '(("folder-children" .
|
||||||
|
("System" "Utilities" "Graphics" "Games" "Office")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/Games/")
|
||||||
|
(settings '(("name" . "Game.directory")
|
||||||
|
("translate" . #t)
|
||||||
|
("apps" .
|
||||||
|
("org.luanti.luanti.desktop"
|
||||||
|
"org.wesnoth.Wesnoth.desktop"
|
||||||
|
"xonotic.desktop"
|
||||||
|
"supertuxkart.desktop"
|
||||||
|
"0ad.desktop"
|
||||||
|
"org.gnome.TwentyFortyEight.desktop"
|
||||||
|
"org.gnome.Chess.desktop"
|
||||||
|
"xonotic-sdl.desktop"
|
||||||
|
"xonotic-glx.desktop")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/Graphics/")
|
||||||
|
(settings '(("name" . "Graphics.directory")
|
||||||
|
("translate" . #t)
|
||||||
|
("apps" .
|
||||||
|
("gimp.desktop"
|
||||||
|
"blender.desktop"
|
||||||
|
"org.inkscape.Inkscape.desktop"
|
||||||
|
"org.kde.krita.desktop")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/Office/")
|
||||||
|
(settings '(("name" . "Office.directory")
|
||||||
|
("translate" . #t)
|
||||||
|
("apps" .
|
||||||
|
("libreoffice-calc.desktop"
|
||||||
|
"libreoffice-writer.desktop"
|
||||||
|
"libreoffice-impress.desktop"
|
||||||
|
"libreoffice-draw.desktop"
|
||||||
|
"libreoffice-math.desktop"
|
||||||
|
"libreoffice-base.desktop"
|
||||||
|
"libreoffice-startcenter.desktop"
|
||||||
|
"org.gnome.gitlab.somas.Apostrophe.desktop"
|
||||||
|
"com.github.xournalpp.xournalpp.desktop"
|
||||||
|
"org.gnome.Papers.desktop")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/Utilities/")
|
||||||
|
(settings '(("name" . "X-GNOME-Shell-Utilities.directory")
|
||||||
|
("translate" . #t)
|
||||||
|
("apps" .
|
||||||
|
("org.gnome.Decibels.desktop"
|
||||||
|
"org.gnome.Connections.desktop"
|
||||||
|
"org.gnome.Evince.desktop"
|
||||||
|
"org.gnome.FileRoller.desktop"
|
||||||
|
"org.gnome.font-viewer.desktop"
|
||||||
|
"org.gnome.Loupe.desktop"
|
||||||
|
"org.gnome.Tour.desktop"
|
||||||
|
"gucharmap.desktop"
|
||||||
|
"xdvi.desktop")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.desktop.app-folders.folder:/org/gnome/desktop/app-folders/folders/System/")
|
||||||
|
(settings '(("name" . "X-GNOME-Shell-System.directory")
|
||||||
|
("translate" . #t)
|
||||||
|
("apps" .
|
||||||
|
("nm-connection-editor.desktop"
|
||||||
|
"org.gnome.baobab.desktop"
|
||||||
|
"org.gnome.DiskUtility.desktop"
|
||||||
|
"org.gnome.Sysprof.desktop"
|
||||||
|
"org.gnome.SystemMonitor.desktop"
|
||||||
|
"org.gnome.Extensions.desktop"
|
||||||
|
"org.gnome.Settings.desktop"
|
||||||
|
"system-config-printer.desktop"
|
||||||
|
"org.gnome.Console.desktop")))))
|
||||||
|
(gsettings-schema
|
||||||
|
(name "org.gnome.shell")
|
||||||
|
(settings `(("app-picker-layout" . ,(raw-gvariant "[{'org.gnome.Contacts.desktop': <{'position': <0>}>, 'org.gnome.Weather.desktop': <{'position': <1>}>, 'org.gnome.clocks.desktop': <{'position': <2>}>, 'org.gnome.Music.desktop': <{'position': <3>}>, 'org.gnome.Snapshot.desktop': <{'position': <4>}>, 'yelp.desktop': <{'position': <5>}>, 'org.gnome.Characters.desktop': <{'position': <6>}>, 'org.gnome.Showtime.desktop': <{'position': <7>}>, 'org.gnome.SimpleScan.desktop': <{'position': <8>}>, 'org.gnome.Screenshot.desktop': <{'position': <9>}>, 'qalculate-gtk.desktop': <{'position': <10>}>, 'Graphics': <{'position': <11>}>, 'Office': <{'position': <12>}>, 'Games': <{'position': <13>}>, 'Utilities': <{'position': <14>}>, 'System': <{'position': <15>}>}]")))))))
|
||||||
187
modules/oms/home/services/gnome.scm
Normal file
187
modules/oms/home/services/gnome.scm
Normal file
@ -0,0 +1,187 @@
|
|||||||
|
(define-module (oms home services gnome)
|
||||||
|
#:use-module (gnu home services)
|
||||||
|
#:use-module (gnu home services shepherd)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu services configuration)
|
||||||
|
#:use-module ((guix diagnostics) #:select (warning))
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix i18n)
|
||||||
|
#:use-module (ice-9 match)
|
||||||
|
#:use-module (ice-9 string-fun)
|
||||||
|
#:use-module (srfi srfi-1)
|
||||||
|
#:use-module (srfi srfi-9 gnu)
|
||||||
|
#:use-module (srfi srfi-11)
|
||||||
|
#:use-module (srfi srfi-26)
|
||||||
|
#:export (home-gsettings-configuration
|
||||||
|
home-gsettings-configuration?
|
||||||
|
home-gsettings-configuration-reset?
|
||||||
|
home-gsettings-configuration-schemas
|
||||||
|
|
||||||
|
gsettings-schema
|
||||||
|
gsettings-schema?
|
||||||
|
gsettings-schema-name
|
||||||
|
gsettings-schema-settings
|
||||||
|
|
||||||
|
raw-gvariant
|
||||||
|
raw-gvariant?
|
||||||
|
raw-gvariant-value
|
||||||
|
|
||||||
|
home-gsettings-service-type))
|
||||||
|
|
||||||
|
(define-immutable-record-type <raw-gvariant>
|
||||||
|
(raw-gvariant value)
|
||||||
|
raw-gvariant?
|
||||||
|
(value raw-gvariant-value))
|
||||||
|
|
||||||
|
(define (gvariant-association-list? x)
|
||||||
|
(match x
|
||||||
|
((((? string?) . (? gvariant-printable?)) ...) #t)
|
||||||
|
(_ #f)))
|
||||||
|
|
||||||
|
(define (list-of-gsettings-schemas? x)
|
||||||
|
(and (list? x)
|
||||||
|
;; TODO who does this not work???
|
||||||
|
;(every (lambda (x) ((gsettings-schema? x))) x)
|
||||||
|
))
|
||||||
|
|
||||||
|
(define-configuration/no-serialization home-gsettings-configuration
|
||||||
|
(reset?
|
||||||
|
(boolean #t)
|
||||||
|
"Whether to reset all undeclared GSettings to default values. Resetting
|
||||||
|
ensures the configuration is declarative but makes it impossible to modify
|
||||||
|
settings persistently from any application's user interface.")
|
||||||
|
(schemas
|
||||||
|
(list-of-gsettings-schemas '())
|
||||||
|
"The declared GSettings configuration values."))
|
||||||
|
|
||||||
|
(define-configuration/no-serialization gsettings-schema
|
||||||
|
(name
|
||||||
|
string
|
||||||
|
"The identifier of the GSettings schema. For example \"org.gnome.desktop.background\".")
|
||||||
|
(settings
|
||||||
|
(gvariant-association-list)
|
||||||
|
"Keys and values to set in this schema."))
|
||||||
|
|
||||||
|
(define* (group lst #:key (similar? equal?))
|
||||||
|
"Returns a list of non-empty lists such that all the values in each sublist
|
||||||
|
are SIMILAR? to it's first one."
|
||||||
|
(match lst
|
||||||
|
((head _ ...)
|
||||||
|
(let-values (((similar different)
|
||||||
|
(partition (cut similar? head <>) lst)))
|
||||||
|
(cons similar (group different #:similar? similar?))))
|
||||||
|
(() '())))
|
||||||
|
|
||||||
|
(define (equal?-under view)
|
||||||
|
(lambda (x y)
|
||||||
|
(equal? (view x)
|
||||||
|
(view y))))
|
||||||
|
|
||||||
|
(define (gvariant-printable? x)
|
||||||
|
(or (boolean? x)
|
||||||
|
(string? x)
|
||||||
|
(file-like? x)
|
||||||
|
(number? x)
|
||||||
|
(and (list? x)
|
||||||
|
(every gvariant-printable? x))
|
||||||
|
(raw-gvariant? x)))
|
||||||
|
|
||||||
|
(define (serialize-gvariant value)
|
||||||
|
"Serialize VALUE to a string in GVariant text format or to a G-expression
|
||||||
|
that expands to an expression that evaluates to such a string."
|
||||||
|
(match value
|
||||||
|
((or (? string?)
|
||||||
|
(? file-like?))
|
||||||
|
#~(begin
|
||||||
|
(use-modules (ice-9 string-fun))
|
||||||
|
(format #f "'~a'"
|
||||||
|
(string-replace-substring
|
||||||
|
(string-replace-substring #$value "\\" "\\\\")
|
||||||
|
"'" "\\'"))))
|
||||||
|
((? boolean?)
|
||||||
|
(if value "true" "false"))
|
||||||
|
((? number?)
|
||||||
|
(format #f "~a" value))
|
||||||
|
((? raw-gvariant? (= raw-gvariant-value raw-value))
|
||||||
|
raw-value)
|
||||||
|
(((? gvariant-printable? lst) ...)
|
||||||
|
#~(format #f "[~a]" (string-join (list #$@(map serialize-gvariant lst)) ", ")))))
|
||||||
|
|
||||||
|
(define (home-gsettings-configuration->setting-list config)
|
||||||
|
"Convert a home-gsettings-configuration record into a list-based format with
|
||||||
|
serialized values. If the same key is set multiple times in the same schema, a
|
||||||
|
warning is raised and the leftmost value used."
|
||||||
|
(define (serialize-keyvals keyvals)
|
||||||
|
(match keyvals
|
||||||
|
(((key . value))
|
||||||
|
#~(list #$key #$(serialize-gvariant value)))
|
||||||
|
(((key . value) (_ . ignored) ...)
|
||||||
|
(warning (G_ "Multiple values set for GSetting key '~a ~a'! \
|
||||||
|
Using '~a' and ignoring the rest ~a.")
|
||||||
|
schema-name key value ignored)
|
||||||
|
#~(list #$key #$(serialize-gvariant value)))))
|
||||||
|
(define (merge-schemas schemas)
|
||||||
|
(let ((schema-name (gsettings-schema-name (car schemas))))
|
||||||
|
#~(list #$schema-name
|
||||||
|
#$@(map serialize-keyvals
|
||||||
|
(group (append-map gsettings-schema-settings schemas)
|
||||||
|
#:similar? (equal?-under car))))))
|
||||||
|
#~(list
|
||||||
|
#$@(map merge-schemas
|
||||||
|
(group (home-gsettings-configuration-schemas config)
|
||||||
|
#:similar? (equal?-under gsettings-schema-name)))))
|
||||||
|
|
||||||
|
(define (extend-gsettings config extension-schemas)
|
||||||
|
(home-gsettings-configuration
|
||||||
|
(inherit config)
|
||||||
|
(schemas
|
||||||
|
;; Leftmost values are preferred so instantiation overrides extensions
|
||||||
|
(append (home-gsettings-configuration-schemas config)
|
||||||
|
extension-schemas))))
|
||||||
|
|
||||||
|
(define (make-gsettings-script config)
|
||||||
|
(program-file
|
||||||
|
"set-gsettings"
|
||||||
|
(with-imported-modules '((guix build utils))
|
||||||
|
#~(begin
|
||||||
|
(use-modules (guix build utils)
|
||||||
|
(ice-9 match))
|
||||||
|
;; Pass options via the environment to allow reusing this script
|
||||||
|
(when #$(home-gsettings-configuration-reset? config)
|
||||||
|
(invoke #$(file-append dconf "/bin/dconf") "reset" "-f" "/"))
|
||||||
|
(match #$(home-gsettings-configuration->setting-list config)
|
||||||
|
((((? string? schemas) keyvals ...) ...)
|
||||||
|
(map (lambda (schema keyvals)
|
||||||
|
(map (match-lambda
|
||||||
|
((key value)
|
||||||
|
(invoke #$(file-append (gexp-input glib "bin")
|
||||||
|
"/bin/gsettings")
|
||||||
|
"set" schema key value)))
|
||||||
|
keyvals))
|
||||||
|
schemas keyvals)))))))
|
||||||
|
|
||||||
|
(define (home-gsettings-shepherd-services config)
|
||||||
|
(list
|
||||||
|
(shepherd-service
|
||||||
|
(documentation "Sets declared GSettings configuration values.")
|
||||||
|
(provision '(gsettings))
|
||||||
|
(one-shot? #t)
|
||||||
|
(start #~(make-forkexec-constructor
|
||||||
|
(list #$(make-gsettings-script config)))))))
|
||||||
|
|
||||||
|
(define home-gsettings-service-type
|
||||||
|
(service-type
|
||||||
|
(name 'home-gsettings)
|
||||||
|
(extensions
|
||||||
|
(list (service-extension home-shepherd-service-type
|
||||||
|
home-gsettings-shepherd-services)))
|
||||||
|
(compose concatenate)
|
||||||
|
(extend extend-gsettings)
|
||||||
|
(default-value
|
||||||
|
(home-gsettings-configuration
|
||||||
|
;; If the user has not added the service to their home configuration
|
||||||
|
;; themselves, they probably don't want it to reset their settings when
|
||||||
|
;; another service extends it.
|
||||||
|
(reset? #f)))
|
||||||
|
(description "Declare values for GSettings configuration settings used by GNOME.")))
|
||||||
31
modules/oms/image.scm
Normal file
31
modules/oms/image.scm
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
(define-module (oms image)
|
||||||
|
#:use-module (guix)
|
||||||
|
#:use-module (gnu image)
|
||||||
|
#:use-module (gnu packages bootloaders)
|
||||||
|
#:use-module (oms systems))
|
||||||
|
|
||||||
|
(define-public base-image
|
||||||
|
(image
|
||||||
|
(name 'oms-base)
|
||||||
|
(format 'disk-image)
|
||||||
|
(operating-system (base-operating-system "OMS-pohja"))
|
||||||
|
(partition-table-type 'gpt)
|
||||||
|
(partitions
|
||||||
|
(list (partition
|
||||||
|
(file-system "vfat")
|
||||||
|
(flags '(esp))
|
||||||
|
(initializer #~(lambda* (root #:key #:allow-other-keys)
|
||||||
|
(initialize-efi-partition root #:grub-efi #+grub-efi)))
|
||||||
|
(label "OMS-F32-EFI")
|
||||||
|
(size (expt 2 28))) ; 256 MiB
|
||||||
|
(partition
|
||||||
|
(file-system "swap")
|
||||||
|
(initializer #~(const #t)) ; default is initialize-root-partition
|
||||||
|
(label "oms-guix-swap")
|
||||||
|
(size (expt 2 34))) ; 16 GiB
|
||||||
|
(partition
|
||||||
|
(file-system "btrfs")
|
||||||
|
(flags '(boot))
|
||||||
|
(initializer #~initialize-root-partition)
|
||||||
|
(label "oms-guix-system-btrfs-root"))))
|
||||||
|
(volatile-root? #f)))
|
||||||
329
modules/oms/systems.scm
Normal file
329
modules/oms/systems.scm
Normal file
@ -0,0 +1,329 @@
|
|||||||
|
(define-module (oms systems)
|
||||||
|
#:use-module (gnu)
|
||||||
|
#:use-module (gnu packages cups)
|
||||||
|
#:use-module (gnu packages package-management)
|
||||||
|
#:use-module (gnu services admin)
|
||||||
|
#:use-module (gnu services base)
|
||||||
|
#:use-module (gnu services cups)
|
||||||
|
#:use-module (gnu services desktop)
|
||||||
|
#:use-module (gnu services dns)
|
||||||
|
#:use-module (gnu services guix)
|
||||||
|
#:use-module (gnu services networking)
|
||||||
|
#:use-module (gnu services shepherd)
|
||||||
|
#:use-module (gnu services ssh)
|
||||||
|
#:use-module (gnu services sysctl)
|
||||||
|
#:use-module (gnu services vpn)
|
||||||
|
#:use-module (gnu services xorg)
|
||||||
|
#:use-module (gnu system pam)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix modules)
|
||||||
|
#:use-module (nongnu packages linux)
|
||||||
|
#:use-module (nongnu system linux-initrd)
|
||||||
|
#:use-module (oms channel-file)
|
||||||
|
#:use-module (oms home)
|
||||||
|
#:use-module (sops secrets)
|
||||||
|
#:use-module (sops services sops)
|
||||||
|
#:export (base-operating-system
|
||||||
|
%oms-systems))
|
||||||
|
|
||||||
|
(define default-gsettings
|
||||||
|
#~(string-append "\
|
||||||
|
[org/gnome/desktop/background]
|
||||||
|
picture-options='zoom'
|
||||||
|
picture-uri='file://"
|
||||||
|
#$(file-append guix-backgrounds
|
||||||
|
"/share/backgrounds/guix/guix-encircled-checkered-16-9.svg") "'
|
||||||
|
picture-uri-dark='file://"
|
||||||
|
#$(file-append guix-backgrounds
|
||||||
|
"/share/backgrounds/guix/guix-encircled-checkered-16-9.svg") "'
|
||||||
|
[org/gnome/desktop/interface]
|
||||||
|
accent-color='yellow'
|
||||||
|
|
||||||
|
[org/gnome/desktop/input-sources]
|
||||||
|
sources=[('xkb', 'fi')]"))
|
||||||
|
|
||||||
|
(define* (base-operating-system host-name)
|
||||||
|
(operating-system
|
||||||
|
(kernel linux)
|
||||||
|
(kernel-arguments
|
||||||
|
(append '("resume=oms-guix-swap") %default-kernel-arguments))
|
||||||
|
(initrd microcode-initrd)
|
||||||
|
(firmware (list linux-firmware))
|
||||||
|
(locale "fi_FI.utf8")
|
||||||
|
(timezone "Europe/Helsinki")
|
||||||
|
(keyboard-layout (keyboard-layout "fi"))
|
||||||
|
(host-name host-name)
|
||||||
|
(users (cons* (user-account
|
||||||
|
(name "oms")
|
||||||
|
(comment "Olarinmäen samoojat")
|
||||||
|
(group "users")
|
||||||
|
(home-directory "/home/oms")
|
||||||
|
(supplementary-groups '("wheel" "netdev" "audio" "video" "passwordlesslogin")))
|
||||||
|
%base-user-accounts))
|
||||||
|
(groups (cons (user-group (name "passwordlesslogin")) %base-groups))
|
||||||
|
(services
|
||||||
|
(append
|
||||||
|
(list (service bluetooth-service-type)
|
||||||
|
(simple-service
|
||||||
|
'default-desktop-settings dconf-service-type
|
||||||
|
(list (dconf-profile
|
||||||
|
(name "user")
|
||||||
|
(keyfile
|
||||||
|
(dconf-keyfile
|
||||||
|
(name "defaults")
|
||||||
|
(content (list default-gsettings)))))))
|
||||||
|
(service gnome-desktop-service-type)
|
||||||
|
(service openssh-service-type
|
||||||
|
(openssh-configuration
|
||||||
|
(permit-root-login 'prohibit-password)
|
||||||
|
(authorized-keys
|
||||||
|
`(("root" ,(channel-file "keys/ssh/saku-laesvuori-x-kone.pub"))))))
|
||||||
|
(service guix-home-service-type `(("oms" ,oms-home-environment)))
|
||||||
|
(service guix-publish-service-type
|
||||||
|
(guix-publish-configuration
|
||||||
|
(port 8001)
|
||||||
|
(host "0.0.0.0")
|
||||||
|
(advertise? #t)))
|
||||||
|
(service cups-service-type
|
||||||
|
(cups-configuration
|
||||||
|
(web-interface? #t)
|
||||||
|
(extensions (list cups-filters epson-inkjet-printer-escpr))))
|
||||||
|
(simple-service 'passwordless-gdm-login pam-root-service-type
|
||||||
|
(list
|
||||||
|
(pam-extension
|
||||||
|
(transformer
|
||||||
|
(lambda (service)
|
||||||
|
(if (equal? (pam-service-name service)
|
||||||
|
"gdm-password")
|
||||||
|
(pam-service
|
||||||
|
(inherit service)
|
||||||
|
(auth
|
||||||
|
(cons (pam-entry
|
||||||
|
(control "sufficient")
|
||||||
|
(module "pam_succeed_if.so")
|
||||||
|
(arguments
|
||||||
|
'("user" "ingroup"
|
||||||
|
"passwordlesslogin")))
|
||||||
|
(pam-service-auth service))))
|
||||||
|
service))))))
|
||||||
|
(set-xorg-configuration (xorg-configuration (keyboard-layout keyboard-layout))))
|
||||||
|
(modify-services %desktop-services
|
||||||
|
(guix-service-type config =>
|
||||||
|
(guix-configuration
|
||||||
|
(inherit config)
|
||||||
|
(discover? #t)
|
||||||
|
(extra-options '("--max-jobs=1" "--cores=1"))
|
||||||
|
(substitute-urls
|
||||||
|
(append %default-substitute-urls ; more often used servers first
|
||||||
|
(list "https://substitutes.nonguix.org")))
|
||||||
|
(authorized-keys
|
||||||
|
(append (list (channel-file "keys/guix/nonguix.pub")
|
||||||
|
(channel-file "keys/guix/saku-laesvuori-x-kone.pub"))
|
||||||
|
%default-authorized-guix-keys)))))))
|
||||||
|
(bootloader (bootloader-configuration
|
||||||
|
(bootloader grub-efi-bootloader)
|
||||||
|
(targets (list "/boot/efi"))
|
||||||
|
(keyboard-layout keyboard-layout)))
|
||||||
|
(swap-devices
|
||||||
|
(list (swap-space
|
||||||
|
(target (file-system-label "oms-guix-swap"))
|
||||||
|
(discard? #t))))
|
||||||
|
(file-systems
|
||||||
|
(append (list (file-system
|
||||||
|
(mount-point "/")
|
||||||
|
(device (file-system-label "oms-btrfs-root"))
|
||||||
|
(flags '(no-atime))
|
||||||
|
(options "compress-force=zstd")
|
||||||
|
(type "btrfs"))
|
||||||
|
(file-system
|
||||||
|
(mount-point "/boot/efi")
|
||||||
|
(device (file-system-label "OMS-F32-EFI"))
|
||||||
|
(type "vfat"))
|
||||||
|
(file-system
|
||||||
|
(mount-point "/tmp")
|
||||||
|
(device "tmpfs")
|
||||||
|
(type "tmpfs")
|
||||||
|
(check? #f)
|
||||||
|
(flags '(no-dev no-suid))
|
||||||
|
(options "size=70%")
|
||||||
|
(create-mount-point? #t)))
|
||||||
|
%base-file-systems))))
|
||||||
|
|
||||||
|
(define upgrade-if-needed-script
|
||||||
|
(program-file
|
||||||
|
"upgrade-if-needed"
|
||||||
|
(with-imported-modules (source-module-closure
|
||||||
|
'((gnu services herd)
|
||||||
|
(guix config)
|
||||||
|
(guix profiles)))
|
||||||
|
#~(begin
|
||||||
|
(use-modules (gnu services herd)
|
||||||
|
(guix config)
|
||||||
|
(guix profiles)
|
||||||
|
(ice-9 exceptions)
|
||||||
|
(srfi srfi-1)
|
||||||
|
(srfi srfi-19)
|
||||||
|
(srfi srfi-26))
|
||||||
|
|
||||||
|
;; From guix/scripts/system.scm
|
||||||
|
(define %system-profile
|
||||||
|
(string-append %state-directory "/profiles/system"))
|
||||||
|
|
||||||
|
(define (latest-of lst)
|
||||||
|
(reduce (lambda (next largest)
|
||||||
|
(if (time>? next largest) next largest))
|
||||||
|
#f lst))
|
||||||
|
|
||||||
|
(define latest-generation
|
||||||
|
(latest-of (map (cut generation-time %system-profile <>)
|
||||||
|
(profile-generations %system-profile))))
|
||||||
|
|
||||||
|
(define one-week (make-time time-duration 0 (* 7 24 60 60)))
|
||||||
|
|
||||||
|
(define no-generations-exception
|
||||||
|
(make-exception
|
||||||
|
(make-exception-with-message
|
||||||
|
(format #f "No system generations found at '~a'! Not upgrading.~%"
|
||||||
|
%system-profile))
|
||||||
|
(make-external-error)))
|
||||||
|
|
||||||
|
(if (time>? (current-time time-utc)
|
||||||
|
(add-duration
|
||||||
|
(or latest-generation
|
||||||
|
(raise-exception no-generations-exception))
|
||||||
|
one-week))
|
||||||
|
(with-shepherd-action 'unattended-upgrade ('trigger)
|
||||||
|
result result)
|
||||||
|
(format #t "Latest generation is from ~a. No need to upgrade.~%"
|
||||||
|
(date->string (time-utc->date latest-generation))))))))
|
||||||
|
|
||||||
|
(define %oms-systems '())
|
||||||
|
|
||||||
|
(define-syntax-rule (define-system id os)
|
||||||
|
"Extend the operating system OS with unattended upgrades and define a varible
|
||||||
|
ID with the extended system as it's value."
|
||||||
|
(begin
|
||||||
|
(define-public id
|
||||||
|
(let ((base os))
|
||||||
|
(operating-system
|
||||||
|
(inherit base)
|
||||||
|
(services
|
||||||
|
(append
|
||||||
|
(list (service unattended-upgrade-service-type
|
||||||
|
(unattended-upgrade-configuration
|
||||||
|
(channels
|
||||||
|
#~(cons (channel
|
||||||
|
(name 'oms-tietokoneet)
|
||||||
|
(url "https://git.olarinmaensamoojat.fi/OMS/tietokoneet.git")
|
||||||
|
(branch "main")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"a3665902d411cd473636a836c2efd707b3a25cfd"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"A0C9 1947 734F 076F 5F08 E9FF 257D 284A 2A1D 3A32"))))
|
||||||
|
%default-channels))
|
||||||
|
(operating-system-expression
|
||||||
|
#~(@ (oms systems) id))))
|
||||||
|
(simple-service
|
||||||
|
'check-upgrade-on-boot
|
||||||
|
shepherd-root-service-type
|
||||||
|
(list (shepherd-service
|
||||||
|
(provision '(upgrade-if-needed))
|
||||||
|
(requirement '(unattended-upgrade))
|
||||||
|
(one-shot? #t)
|
||||||
|
(start #~(make-forkexec-constructor
|
||||||
|
(list #$upgrade-if-needed-script)))))))
|
||||||
|
(operating-system-user-services base))))))
|
||||||
|
(set! %oms-systems (cons id %oms-systems))))
|
||||||
|
|
||||||
|
(define-system oms-morn (base-operating-system "OMS-morn"))
|
||||||
|
|
||||||
|
(define-system oms-celeb
|
||||||
|
(let ((base (base-operating-system "OMS-celeb")))
|
||||||
|
(operating-system
|
||||||
|
(inherit base)
|
||||||
|
(firmware (cons sof-firmware (operating-system-firmware base)))
|
||||||
|
(initrd-modules
|
||||||
|
(append '("vmd") (operating-system-initrd-modules base)))
|
||||||
|
(services
|
||||||
|
(modify-services (operating-system-user-services base)
|
||||||
|
(elogind-service-type config =>
|
||||||
|
(elogind-configuration
|
||||||
|
(inherit config)
|
||||||
|
;; This machine gets stuck with proper deep sleep (suspend to RAM)
|
||||||
|
(suspend-mode '(s2idle)))))))))
|
||||||
|
|
||||||
|
(define-system oms-kone
|
||||||
|
(let ((base (base-operating-system "OMS-kone"))
|
||||||
|
(wpa-psk (sops-secret
|
||||||
|
(key '("wpa-psk"))
|
||||||
|
(file (channel-file "sops/OMS-kone.yaml"))))
|
||||||
|
(wg-key (sops-secret
|
||||||
|
(key '("wg-private-key"))
|
||||||
|
(file (channel-file "sops/OMS-kone.yaml")))))
|
||||||
|
(operating-system
|
||||||
|
(inherit base)
|
||||||
|
(kernel-arguments %default-kernel-arguments)
|
||||||
|
(firmware (list ibt-hw-firmware iwlwifi-firmware))
|
||||||
|
(swap-devices '())
|
||||||
|
(services
|
||||||
|
(append
|
||||||
|
(list (service dhcpcd-service-type
|
||||||
|
(dhcpcd-configuration
|
||||||
|
(interfaces '("enp1s0"))))
|
||||||
|
(service dhcpd-service-type
|
||||||
|
(dhcpd-configuration
|
||||||
|
(interfaces '("wlp2s0"))
|
||||||
|
(config-file (channel-file "OMS-kone/dhcpd.conf"))))
|
||||||
|
(service dnsmasq-service-type
|
||||||
|
(dnsmasq-configuration
|
||||||
|
(listen-addresses '("192.168.1.1"))))
|
||||||
|
(service hostapd-service-type
|
||||||
|
(hostapd-configuration
|
||||||
|
(interface "wlp2s0")
|
||||||
|
(ssid "Samoojaverkko")
|
||||||
|
(channel 1)
|
||||||
|
(extra-settings
|
||||||
|
(string-append "wpa=2\n" "wpa_psk_file="
|
||||||
|
(sops-secret->secret-file wpa-psk)))))
|
||||||
|
(service nftables-service-type
|
||||||
|
(nftables-configuration
|
||||||
|
(ruleset (channel-file "OMS-kone/nftables.rules"))))
|
||||||
|
(service sops-secrets-service-type
|
||||||
|
(sops-service-configuration
|
||||||
|
(secrets (list wpa-psk wg-key))))
|
||||||
|
(service static-networking-service-type
|
||||||
|
(list (static-networking
|
||||||
|
(provision '(wifi-ip))
|
||||||
|
(addresses (list (network-address
|
||||||
|
(device "wlp2s0")
|
||||||
|
(value "192.168.1.1/24")))))))
|
||||||
|
(service wireguard-service-type
|
||||||
|
(wireguard-configuration
|
||||||
|
(peers
|
||||||
|
(list
|
||||||
|
(wireguard-peer
|
||||||
|
(name "olarinmaensamoojat.fi")
|
||||||
|
(endpoint "olarinmaensamoojat.fi:51820")
|
||||||
|
(public-key "UT4RGKMzp61DYiiodsrvHc6m/tkSqLNo2wqxwACrdl4=")
|
||||||
|
(allowed-ips '("192.168.3.3/32"))
|
||||||
|
(keep-alive 25))))
|
||||||
|
(addresses '("192.168.3.2/24"))
|
||||||
|
(private-key (sops-secret->secret-file wg-key))
|
||||||
|
(shepherd-requirement '(networking)))))
|
||||||
|
(modify-services (operating-system-user-services base)
|
||||||
|
(elogind-service-type config =>
|
||||||
|
(elogind-configuration
|
||||||
|
(inherit config)
|
||||||
|
(handle-power-key 'ignore)))
|
||||||
|
(sysctl-service-type config =>
|
||||||
|
(sysctl-configuration
|
||||||
|
(inherit config)
|
||||||
|
(settings (cons '("net.ipv4.ip_forward" . "1")
|
||||||
|
%default-sysctl-settings))))
|
||||||
|
(gdm-service-type config =>
|
||||||
|
(gdm-configuration
|
||||||
|
(inherit config)
|
||||||
|
(auto-suspend? #f)))
|
||||||
|
(delete network-manager-service-type)
|
||||||
|
(delete wpa-supplicant-service-type)))))))
|
||||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user