Compare commits
8 Commits
96c07bbdd5
...
f422a7b82e
Author | SHA1 | Date | |
---|---|---|---|
f422a7b82e | |||
3a3906399d | |||
38ad21a033 | |||
116e49f322 | |||
8e63730e60 | |||
e2a27dbc57 | |||
8b3bad38af | |||
821d7027b0 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
current
|
current
|
||||||
|
*~
|
||||||
|
14
channels.scm
14
channels.scm
@ -7,6 +7,15 @@
|
|||||||
"9edb3f66fd807b096b48283debdcddccfea34bad"
|
"9edb3f66fd807b096b48283debdcddccfea34bad"
|
||||||
(openpgp-fingerprint
|
(openpgp-fingerprint
|
||||||
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
|
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
|
||||||
|
(channel
|
||||||
|
(name 'artoria)
|
||||||
|
(url "https://git.bloodyno.se/lynn/artoria.git")
|
||||||
|
(branch "main")
|
||||||
|
(introduction
|
||||||
|
(make-channel-introduction
|
||||||
|
"56579fce18ab54c21442a98d923bd2bc6844d321"
|
||||||
|
(openpgp-fingerprint
|
||||||
|
"FE30 E8F6 522D 0615 35E0 E449 55E7 97F6 31DD A03C"))))
|
||||||
(channel
|
(channel
|
||||||
(name 'nonguix)
|
(name 'nonguix)
|
||||||
(url "https://gitlab.com/nonguix/nonguix")
|
(url "https://gitlab.com/nonguix/nonguix")
|
||||||
@ -17,7 +26,7 @@
|
|||||||
(openpgp-fingerprint
|
(openpgp-fingerprint
|
||||||
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
|
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
|
||||||
(channel
|
(channel
|
||||||
(name 'michael_atlas)
|
(name 'michal_atlas)
|
||||||
(url "https://git.sr.ht/~michal_atlas/guix-channel")
|
(url "https://git.sr.ht/~michal_atlas/guix-channel")
|
||||||
(branch "master")
|
(branch "master")
|
||||||
;;(introduction
|
;;(introduction
|
||||||
@ -26,4 +35,5 @@
|
|||||||
;; (openpgp-fingerprint
|
;; (openpgp-fingerprint
|
||||||
;; "")
|
;; "")
|
||||||
;; ))
|
;; ))
|
||||||
))
|
)
|
||||||
|
)
|
||||||
|
@ -25,7 +25,10 @@
|
|||||||
(define (file-fetch url hash)
|
(define (file-fetch url hash)
|
||||||
(with-store store
|
(with-store store
|
||||||
(run-with-store store
|
(run-with-store store
|
||||||
(url-fetch url 'sha256 (base64-decode hash)))))
|
(url-fetch url 'sha256
|
||||||
|
; hash
|
||||||
|
(base64-decode hash)
|
||||||
|
))))
|
||||||
|
|
||||||
(home-environment
|
(home-environment
|
||||||
;; Below is the list of packages that will show up in your
|
;; Below is the list of packages that will show up in your
|
||||||
@ -44,8 +47,9 @@
|
|||||||
home-files-service-type
|
home-files-service-type
|
||||||
`(
|
`(
|
||||||
(".face" ,(file-fetch
|
(".face" ,(file-fetch
|
||||||
"https://marq42.xyz/mir-avatar-picrew-3.png"
|
"https://marq42.xyz/mir-avatar-picrew-3.png"
|
||||||
"cf5ck8db4d5n24drdnv77wx1liiqi6an"
|
;; get below with `guix download URL --format=base64` - this took ages to work out
|
||||||
|
"Psx4J7+7mMKqpsT/rl/Iv/XQnZlTJ1WSMpswuNDjv38="
|
||||||
))))
|
))))
|
||||||
(service home-dconf-load-service-type
|
(service home-dconf-load-service-type
|
||||||
#~`((org/gnome/shell
|
#~`((org/gnome/shell
|
||||||
|
105
system.scm
105
system.scm
@ -11,7 +11,8 @@
|
|||||||
;; used in this configuration.
|
;; used in this configuration.
|
||||||
(use-modules
|
(use-modules
|
||||||
(gnu)
|
(gnu)
|
||||||
(nongnu packages linux))
|
(nongnu packages linux)
|
||||||
|
(nongnu system linux-initrd))
|
||||||
(use-service-modules
|
(use-service-modules
|
||||||
cups
|
cups
|
||||||
desktop
|
desktop
|
||||||
@ -21,20 +22,22 @@
|
|||||||
|
|
||||||
(operating-system
|
(operating-system
|
||||||
(kernel linux)
|
(kernel linux)
|
||||||
|
(initrd microcode-initrd)
|
||||||
(firmware (list linux-firmware))
|
(firmware (list linux-firmware))
|
||||||
(locale "en_US.utf8")
|
(locale "en_US.utf8")
|
||||||
(timezone "America/Anchorage")
|
(timezone "America/Anchorage")
|
||||||
(keyboard-layout (keyboard-layout "us"))
|
(keyboard-layout (keyboard-layout "us"))
|
||||||
(host-name "starscream")
|
(host-name "starscream")
|
||||||
|
|
||||||
|
|
||||||
;; The list of user accounts ('root' is implicit).
|
;; The list of user accounts ('root' is implicit).
|
||||||
(users (cons* (user-account
|
(users (cons* (user-account
|
||||||
(name "mir")
|
(name "mir")
|
||||||
(comment "Miranda Marquez")
|
(comment "Miranda Marquez")
|
||||||
(group "users")
|
(group "users")
|
||||||
(home-directory "/home/mir")
|
(home-directory "/home/mir")
|
||||||
(supplementary-groups '("wheel" "netdev" "audio" "video")))
|
(supplementary-groups '("wheel" "netdev" "audio" "video")))
|
||||||
%base-user-accounts))
|
%base-user-accounts))
|
||||||
|
|
||||||
;; Packages installed system-wide. Users can also install packages
|
;; Packages installed system-wide. Users can also install packages
|
||||||
;; under their own account: use 'guix search KEYWORD' to search
|
;; under their own account: use 'guix search KEYWORD' to search
|
||||||
@ -44,44 +47,76 @@
|
|||||||
(specification->package "emacs")
|
(specification->package "emacs")
|
||||||
(specification->package "eza")
|
(specification->package "eza")
|
||||||
(specification->package "git")
|
(specification->package "git")
|
||||||
;; (specification->package "nss-certs") ;removed because version conflict
|
(specification->package "gparted")
|
||||||
)
|
(specification->package "firefox")
|
||||||
%base-packages))
|
;; (specification->package "nss-certs") ;removed because version conflict
|
||||||
|
)
|
||||||
|
%base-packages))
|
||||||
|
|
||||||
;; Below is the list of system services. To search for available
|
;; Below is the list of system services. To search for available
|
||||||
;; services, run 'guix system search KEYWORD' in a terminal.
|
;; services, run 'guix system search KEYWORD' in a terminal.
|
||||||
(services
|
(services
|
||||||
(append (list (service gnome-desktop-service-type)
|
(append
|
||||||
|
(modify-services %desktop-services
|
||||||
|
(guix-service-type
|
||||||
|
config => (guix-configuration
|
||||||
|
(inherit config)
|
||||||
|
(authorized-keys
|
||||||
|
(append (list
|
||||||
|
(local-file "./unikey.txt"))
|
||||||
|
%default-authorized-guix-keys))
|
||||||
|
|
||||||
;; To configure OpenSSH, pass an 'openssh-configuration'
|
(build-machines (list
|
||||||
;; record as a second argument to 'service' below.
|
#~(build-machine
|
||||||
(service openssh-service-type)
|
(name "192.168.1.3") ; unicron
|
||||||
(service cups-service-type)
|
(systems (list "x86_64-linux" "1686-linux"))
|
||||||
(set-xorg-configuration
|
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALuQ9g+xYE7Wu5o+8GjtJXLEfOaJwgURMVaJIDb0e8T")
|
||||||
(xorg-configuration (keyboard-layout keyboard-layout))))
|
(user "root")
|
||||||
|
(speed 2.) ; incredibly fast :3
|
||||||
|
))
|
||||||
|
)
|
||||||
|
)))
|
||||||
|
(list (service gnome-desktop-service-type)
|
||||||
|
|
||||||
;; This is the default list of services we
|
;; To configure OpenSSH, pass an 'openssh-configuration'
|
||||||
;; are appending to.
|
;; record as a second argument to 'service' below.
|
||||||
%desktop-services))
|
(service openssh-service-type)
|
||||||
|
(service cups-service-type)
|
||||||
|
(set-xorg-configuration
|
||||||
|
(xorg-configuration (keyboard-layout keyboard-layout)))
|
||||||
|
|
||||||
|
)
|
||||||
|
;; This is the default list of services we
|
||||||
|
;; are appending to.
|
||||||
|
;%desktop-services ; already modified above?
|
||||||
|
))
|
||||||
(bootloader (bootloader-configuration
|
(bootloader (bootloader-configuration
|
||||||
(bootloader grub-efi-bootloader)
|
(bootloader grub-efi-bootloader)
|
||||||
(targets (list "/boot/efi"))
|
(targets (list "/boot/efi"))
|
||||||
(keyboard-layout keyboard-layout)))
|
(keyboard-layout keyboard-layout)))
|
||||||
(swap-devices (list (swap-space
|
(swap-devices (list (swap-space
|
||||||
(target (uuid
|
(target
|
||||||
"dc1220de-fbc4-4008-86d1-5c9b152cc32c")))))
|
; (uuid
|
||||||
|
; "dc1220de-fbc4-4008-86d1-5c9b152cc32c")
|
||||||
|
(file-system-label "swap")
|
||||||
|
))))
|
||||||
|
|
||||||
;; The list of file systems that get "mounted". The unique
|
;; The list of file systems that get "mounted". The unique
|
||||||
;; file system identifiers there ("UUIDs") can be obtained
|
;; file system identifiers there ("UUIDs") can be obtained
|
||||||
;; by running 'blkid' in a terminal.
|
;; by running 'blkid' in a terminal.
|
||||||
(file-systems (cons* (file-system
|
(file-systems (cons* (file-system
|
||||||
(mount-point "/boot/efi")
|
(mount-point "/boot/efi")
|
||||||
(device (uuid "67E3-17ED"
|
(device (uuid ;"67E3-17ED"
|
||||||
'fat32))
|
"FBB5-2030"
|
||||||
(type "vfat"))
|
'fat32))
|
||||||
(file-system
|
(type "vfat"))
|
||||||
(mount-point "/")
|
(file-system
|
||||||
(device (uuid
|
(mount-point "/")
|
||||||
"39ec24ba-7c1f-49ff-9af6-57ace91cfba5"
|
(device
|
||||||
'ext4))
|
(file-system-label "guix-root")
|
||||||
(type "ext4")) %base-file-systems)))
|
;(uuid
|
||||||
|
; "25b6c953-f92e-47df-baf0-6a80bccba45f"
|
||||||
|
; 'ext4)
|
||||||
|
)
|
||||||
|
(type "ext4")) %base-file-systems)))
|
||||||
|
|
||||||
|
7
unikey.txt
Normal file
7
unikey.txt
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
(public-key
|
||||||
|
(ecc
|
||||||
|
(curve Ed25519)
|
||||||
|
(q #E175C2683B75DE142F39AA7EA7CEDF1E939A80F44DBDC35479BFA81EB541F125#)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user