summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DOCS.md75
-rw-r--r--README.md85
2 files changed, 2 insertions, 158 deletions
diff --git a/DOCS.md b/DOCS.md
deleted file mode 100644
index fd811f6..0000000
--- a/DOCS.md
+++ /dev/null
@@ -1,75 +0,0 @@
-## System Configuration Templates
-
-### Desktop
-
-- `px-desktop-os`
-- `px-desktop-ee-os`
-
-#### Services
-
-Internally:
-
-- `%px-desktop-base-minimal-services` is great for custom-desktops, and excludes
- - `sddm-service-type`
- - `gnome-keyring-service-type`
- - `openssh-service-type`
-- `%px-desktop-base-services` is similiar to guix `%desktop-services`
-
-Stable:
-
-- `%px-desktop-minmal-services` (`%px-desktop-base-minimal-services`)
- - Ideal for Sway
-- `%px-desktop-services` (`%px-desktop-base-services`)
- - Ideal for Gnome, LXQt, KDE, etc.
-- `%px-desktop-ee-services` (`%px-desktop-base-services`)
-
-### Server
-
-- `px-server-os`
-- `px-server-ee-os`
-
-#### Services
-
-- `%px-server-services` is %base-services, with:
- - `openssh-service-type` (permit root login; disable password auth)
- - `nftables-service-type` (firewall)
- - `ntp-service-type` (time sync)
- - `dhcp-client-service-type` (dhcp)
-- `%px-server-ee-services`
-
-By default, the following ports are open:
-
-- 22 (SSH)
-- 80 (HTTP)
-- 443 (HTTPS)
-
-## Services
-
-### Device Identity Service
-
-Options:
-
-- `port` - The port the service will listen on.
-- `config-dir` - The directory where the configuration files are stored.
-- `key-dir` - The directory where the keys are stored.
-
-```scheme
-(service px-device-identity-service-type
- (px-device-identity-configuration
- (port 8000)
- (config-dir "/etc/px-device-identity")
- (key-dir "/root/.local/share/px-device-identity")))
-```
-
-### User Identity Service
-
-```scheme
-(service px-user-identity-service-type)
-```
-
-## UDEV Rules
-
-- `ledger-wallet-service`
-- `nitro-key-service`
-- `yubikey-service`
-- `coinkite-service` \ No newline at end of file
diff --git a/README.md b/README.md
index 3842acd..cb565f5 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,6 @@
This repository contains package defintions for PantherX OS.
-This is a fork of our original package repository [guix-pantherx](https://git.pantherx.org/development/guix-pantherx) to resolve authentication issues (many of the commits weren't signed) and reduce the size which had blown up to 700+ MB.
-
-Refer to `./DOCS.md` for more information on configuration options.
-
## Authentication
```scheme
@@ -43,7 +39,7 @@ guix style --whole-file px/packages/tools.scm
### Test changes
```bash
-./pre-inst-env guix system vm .examples/server-os.scm
+./pre-inst-env guix system vm ../panther-examples/server-os.scm
```
### Patches
@@ -61,81 +57,4 @@ For the time being, all patches must remain in `./` to be found by guix, due to:
(string-append directory "/gnu/packages/patches")
directory))
%load-path)))
-```
-
-## Troubleshooting
-
-When you are upgrading from a old installation, you might face issues where `%default-channels` points to previous guix and nongnu (nonguix) channels.
-
-Here's what your channels file probably looked like:
-
-```scheme
-(list (channel
- (name 'guix)
- (url "https://channels.pantherx.org/git/pantherx.git")
- (branch "rolling-nonlibre"))
- (channel
- (name 'nongnu)
- (url "https://channels.pantherx.org/git/nongnu.git")
- (branch "rolling"))
- (channel
- (name 'pantherx)
- (url "https://channels.pantherx.org/git/pantherx-extra.git")
- (branch "master")))
-```
-
-This is what you tried:
-
-```scheme
-(cons* (channel
- (name 'pantherx)
- (branch "master")
- (url "https://channels.pantherx.org/git/panther.git")
- (introduction
- (make-channel-introduction
- "54b4056ac571611892c743b65f4c47dc298c49da"
- (openpgp-fingerprint
- "A36A D41E ECC7 A871 1003 5D24 524F EB1A 9D33 C9CB"))))
- %default-channels)
-```
-
-This is a potential issue:
-
-```bash
-zcat /var/log/guix/drvs/k7/dgx55ivy7bfgm2z2qvk0njnjs2x5dh-nongnu.drv.gz
-(repl-version 0 1 1)
-(exception unbound-variable (value #f) (value "Unbound variable: ~S") (value (linux-libre-6.3)) (value #f))
-```
-
-This is how you can temporarily overwrite all channels:
-
-```scheme
-(list (channel
- (name 'guix)
- (branch "master")
- (url "https://git.savannah.gnu.org/git/guix.git")
- (introduction
- (make-channel-introduction
- "9edb3f66fd807b096b48283debdcddccfea34bad"
- (openpgp-fingerprint
- "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
- (channel
- (name 'nonguix)
- (url "https://channels.pantherx.org/git/nonguix.git")
- (introduction
- (make-channel-introduction
- "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
- (openpgp-fingerprint
- "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
- (channel
- (name 'pantherx)
- (branch "master")
- (url "https://channels.pantherx.org/git/panther.git")
- (introduction
- (make-channel-introduction
- "54b4056ac571611892c743b65f4c47dc298c49da"
- (openpgp-fingerprint
- "A36A D41E ECC7 A871 1003 5D24 524F EB1A 9D33 C9CB")))))
-```
-
-After pull and reconfigure succeeds, you may restore the default.
+``` \ No newline at end of file