mir/guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mir:f422a7b82eea70d7af137f3c518ee267bd4626fb
Branches Tags
mir:main
..
compare: mir:96c07bbdd542fb0559de86a94c9d13c839fe5868
Branches Tags
mir:main

No commits in common. "f422a7b82eea70d7af137f3c518ee267bd4626fb" and "96c07bbdd542fb0559de86a94c9d13c839fe5868" have entirely different histories.
f422a7b82e ... 96c07bbdd5

6 changed files with 40 additions and 99 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1 @@
current
*~

14
channels.scm
View File

@ -7,15 +7,6 @@
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"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
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
@ -26,7 +17,7 @@
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(channel
(name 'michal_atlas)
(name 'michael_atlas)
(url "https://git.sr.ht/~michal_atlas/guix-channel")
(branch "master")
;;(introduction
@ -35,5 +26,4 @@
;; (openpgp-fingerprint
;; "")
;; ))
)
)
))

2
dconf.ini
View File

@ -1,2 +0,0 @@
[/]
idle-delay=uint32 0

10
home-configuration.scm
View File

@ -25,10 +25,7 @@
(define (file-fetch url hash)
(with-store store
(run-with-store store
(url-fetch url 'sha256
; hash
(base64-decode hash)
))))
(url-fetch url 'sha256 (base64-decode hash)))))
(home-environment
;; Below is the list of packages that will show up in your
@ -47,9 +44,8 @@
home-files-service-type
`(
(".face" ,(file-fetch
"https://marq42.xyz/mir-avatar-picrew-3.png"
;; get below with `guix download URL --format=base64` - this took ages to work out
"Psx4J7+7mMKqpsT/rl/Iv/XQnZlTJ1WSMpswuNDjv38="
"https://marq42.xyz/mir-avatar-picrew-3.png"
"cf5ck8db4d5n24drdnv77wx1liiqi6an"
))))
(service home-dconf-load-service-type
#~`((org/gnome/shell

105
system.scm
View File

@ -11,8 +11,7 @@
;; used in this configuration.
(use-modules
(gnu)
(nongnu packages linux)
(nongnu system linux-initrd))
(nongnu packages linux))
(use-service-modules
cups
desktop
@ -22,22 +21,20 @@
(operating-system
(kernel linux)
(initrd microcode-initrd)
(firmware (list linux-firmware))
(locale "en_US.utf8")
(timezone "America/Anchorage")
(keyboard-layout (keyboard-layout "us"))
(host-name "starscream")
;; The list of user accounts ('root' is implicit).
(users (cons* (user-account
(name "mir")
(comment "Miranda Marquez")
(group "users")
(home-directory "/home/mir")
(supplementary-groups '("wheel" "netdev" "audio" "video")))
%base-user-accounts))
(name "mir")
(comment "Miranda Marquez")
(group "users")
(home-directory "/home/mir")
(supplementary-groups '("wheel" "netdev" "audio" "video")))
%base-user-accounts))
;; Packages installed system-wide. Users can also install packages
;; under their own account: use 'guix search KEYWORD' to search
@ -47,76 +44,44 @@
(specification->package "emacs")
(specification->package "eza")
(specification->package "git")
(specification->package "gparted")
(specification->package "firefox")
;; (specification->package "nss-certs") ;removed because version conflict
)
%base-packages))
;; (specification->package "nss-certs") ;removed because version conflict
)
%base-packages))
;; Below is the list of system services. To search for available
;; services, run 'guix system search KEYWORD' in a terminal.
(services
(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))
(append (list (service gnome-desktop-service-type)
(build-machines (list
#~(build-machine
(name "192.168.1.3") ; unicron
(systems (list "x86_64-linux" "1686-linux"))
(host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALuQ9g+xYE7Wu5o+8GjtJXLEfOaJwgURMVaJIDb0e8T")
(user "root")
(speed 2.) ; incredibly fast :3
))
)
)))
(list (service gnome-desktop-service-type)
;; To configure OpenSSH, pass an 'openssh-configuration'
;; record as a second argument to 'service' below.
(service openssh-service-type)
(service cups-service-type)
(set-xorg-configuration
(xorg-configuration (keyboard-layout keyboard-layout))))
;; To configure OpenSSH, pass an 'openssh-configuration'
;; record as a second argument to 'service' below.
(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?
))
;; This is the default list of services we
;; are appending to.
%desktop-services))
(bootloader (bootloader-configuration
(bootloader grub-efi-bootloader)
(targets (list "/boot/efi"))
(keyboard-layout keyboard-layout)))
(bootloader grub-efi-bootloader)
(targets (list "/boot/efi"))
(keyboard-layout keyboard-layout)))
(swap-devices (list (swap-space
(target
; (uuid
; "dc1220de-fbc4-4008-86d1-5c9b152cc32c")
(file-system-label "swap")
))))
(target (uuid
"dc1220de-fbc4-4008-86d1-5c9b152cc32c")))))
;; The list of file systems that get "mounted". The unique
;; file system identifiers there ("UUIDs") can be obtained
;; by running 'blkid' in a terminal.
(file-systems (cons* (file-system
(mount-point "/boot/efi")
(device (uuid ;"67E3-17ED"
"FBB5-2030"
'fat32))
(type "vfat"))
(file-system
(mount-point "/")
(device
(file-system-label "guix-root")
;(uuid
; "25b6c953-f92e-47df-baf0-6a80bccba45f"
; 'ext4)
)
(type "ext4")) %base-file-systems)))
(mount-point "/boot/efi")
(device (uuid "67E3-17ED"
'fat32))
(type "vfat"))
(file-system
(mount-point "/")
(device (uuid
"39ec24ba-7c1f-49ff-9af6-57ace91cfba5"
'ext4))
(type "ext4")) %base-file-systems)))

7
unikey.txt
View File

@ -1,7 +0,0 @@
(public-key
(ecc
(curve Ed25519)
(q #E175C2683B75DE142F39AA7EA7CEDF1E939A80F44DBDC35479BFA81EB541F125#)
)
)