summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--aisaka.org49
-rw-r--r--channels.scm7
-rw-r--r--data/emacs-config62
-rw-r--r--home-configuration.scm31
-rw-r--r--system-configuration.scm18
5 files changed, 126 insertions, 41 deletions
diff --git a/aisaka.org b/aisaka.org
index 17dc6a2..5e29700 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -29,6 +29,7 @@ https://guix.gnu.org/en/manual/en/html_node/System-Configuration.html
#+begin_src scheme :noweb-ref system-dump :tangle system-configuration.scm
(define-module (aisaka-system-configuration)
#:use-module (gnu)
+ #:use-module (gnu packages commencement)
#:use-module (gnu packages cups)
#:use-module (gnu packages finance)
#:use-module (gnu services cups)
@@ -67,7 +68,7 @@ https://guix.gnu.org/en/manual/en/html_node/System-Configuration.html
"ntfs-3g"))
( map
<<to-package+output>>
- ( list "plasma" "plasma-desktop" "plasma-framework" "plasma-integration" "plasma-nano" "plasma-nm" "plasma-pa" "plasma-pass" "plasma-vault" "plasma-welcome" "plasma-workspace" "plasma-bigscreen" "plasma-mobile" "plasma-phonebook" "plasma-browser-integration" "plasma-mobile-settings" "plasma-mobile-sounds" "plasma-wayland-protocols" "plasma-active-window-control" "plasma-phone-components" "plasma-redshift-control" "plasma-disks" "plasma-firewall" "plasma-systemmonitor" "breeze" "breeze-gtk" "bluedevil" "breeze-icons" "kdeplasma-addons" "keysmith" "kmenuedit" "krunner" "kwin" "latte-dock" "plasma-workspace-wallpapers" "polkit-kde-agent" "system-settings" "calindori" "discover" "elisa" "kpipewire" "ksysguard" "attica" "kaccounts-integration" "kde-frameworkintegration" "kmail" "kscreen" ) )
+ ( list ) )
%base-packages))
(services
<<system-services>>)
@@ -94,6 +95,15 @@ https://guix.gnu.org/en/manual/en/html_node/Services.html
#+begin_src scheme :noweb-ref system-services
(append
(list
+ (extra-special-file
+ "/lib64/ld-linux-x86-64.so.2"
+ (file-append (canonical-package glibc) "/lib/ld-linux-x86-64.so.2"))
+ (extra-special-file
+ "/lib64/libstdc++.so.6"
+ (file-append (canonical-package gcc-toolchain) "/lib/libstdc++.so.6"))
+ (extra-special-file
+ "/usr/lib64/libstdc++.so.6"
+ (file-append (canonical-package gcc-toolchain) "/lib/libstdc++.so.6"))
<<ssh-system-service>>
<<system-base-services>>
<<system-miscellaneous-services>>
@@ -110,6 +120,7 @@ https://guix.gnu.org/en/manual/en/html_node/Services.html
(git-daemon-configuration
(export-all? #t)))
(service gnome-desktop-service-type)
+ (service plasma-desktop-service-type)
(service
tor-service-type
(tor-configuration
@@ -121,6 +132,11 @@ https://guix.gnu.org/en/manual/en/html_node/Services.html
(elogind-configuration
(inherit configuration)
(handle-lid-switch 'ignore)))
+ (gdm-service-type
+ configuration =>
+ (gdm-configuration
+ (inherit configuration)
+ (wayland? #t)))
(delete guix-service-type)))
#+end_src
@@ -299,6 +315,37 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
("system-update-" . ,system-update-)))
(bashrc (list
(local-file "data/bashrc")))))
+ ;; (service
+ ;; home-channels-service-type
+ ;; (list
+ ;; (channel
+ ;; (name 'guix)
+ ;; (url "https://git.savannah.gnu.org/git/guix.git"))
+ ;; (channel
+ ;; (name 'jeko)
+ ;; (url "https://framagit.org/Jeko/guix-jeko-channel.git"))
+ ;; (channel
+ ;; (name 'nonguix)
+ ;; (url "https://gitlab.com/nonguix/nonguix")
+ ;; ;; Enable signature verification:
+ ;; (introduction
+ ;; (make-channel-introduction
+ ;; "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+ ;; (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
+ ;; (channel (name 'org-fc-tn)
+ ;; (url "file:///home/marek/src/org-fc")
+ ;; (branch "repository"))
+ ;; (channel (name 'packages)
+ ;; (url "file:///home/marek/src/packages")
+ ;; (branch "master"))
+ ;; (channel (name 'channel)
+ ;; (url "https://git.marekpasnikowski.pl/git/channel.git")
+ ;; (branch "wip-channel")
+ ;; ( introduction
+ ;; ( make-channel-introduction
+ ;; "f8ccfe8f3e5c8bafe06665cbd4b0c9301e1a64b6"
+ ;; ( openpgp-fingerprint
+ ;; "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F" ) ) ))))
(simple-service 'configuration-files
home-files-service-type
`((".config/git/config" ,(local-file "data/git-config"))
diff --git a/channels.scm b/channels.scm
index b55e947..d3e60c7 100644
--- a/channels.scm
+++ b/channels.scm
@@ -10,6 +10,7 @@
(channel (name 'org-fc-tn)
(url "file:///home/marek/src/org-fc")
(branch "repository"))
- (channel (name 'packages)
- (url "file:///home/marek/src/packages")
- (branch "master")))
+ ;; (channel (name 'packages)
+ ;; (url "file:///home/marek/src/packages")
+ ;; (branch "master"))
+ )
diff --git a/data/emacs-config b/data/emacs-config
index 139509c..272c20b 100644
--- a/data/emacs-config
+++ b/data/emacs-config
@@ -1,18 +1,16 @@
+;;; Disable auto-backup
+(setq-default make-backup-files nil)
+
;;; https://github.com/fimblo/dot.emacs
;;; Theme Activation
-(load-theme 'misterioso)
-
-(global-visual-line-mode t)
-
-;;; Disable Org Indent Mode
-(add-hook 'org-mode-hook (lambda () (org-indent-mode -1)))
+(load-theme 'manoj-dark)
;;; Enable ParEdit
(add-hook 'prog-mode-hook 'enable-paredit-mode)
;;; https://elpa.gnu.org/packages/aggressive-indent.html
;;; Automatic Activation of Aggressive Indent
-;; (global-aggressive-indent-mode)
+(global-aggressive-indent-mode)
;; Highlight the pair of delimiters under the cursor
(setq-default show-paren-mode 1
@@ -28,13 +26,9 @@
;; Enable the column-80 line
(setq-default display-fill-column-indicator 1
- display-fill-column-indicator-column t
- fill-column 80)
+ display-fill-column-indicator-column 80)
(global-display-fill-column-indicator-mode)
-;;; Enable Org Modern Style
-;(with-eval-after-load 'org (global-org-modern-mode))
-
;; Prepare Literate Programming
(setq-default
org-startup-indented t
@@ -54,35 +48,31 @@
(tool-bar-mode -1)
;; GNUS Configuration
-;; (setq-default gnus-auto-select-first nil
-;; gnus-select-method '(nnnil "")
-;; gnus-secondary-select-methods '((nnimap "outlook"
-;; (nnimap-address "outlook.office365.com")
-;; (nnimap-server-port 993)
-;; (nnimap-stream ssl)
-;; (nnimap-authinfo-file "~/.authinfo"))
-;; (nnimap "home"
-;; (nnimap-address "serwer1930490.home.pl")
-;; (nnimap-server-port 993)
-;; (nnimap-stream ssl)
-;; (nnimap-authinfo-file "~/.authinfo")))
-;; nnmail-split-method 'nnmail-split-fancy
-;; nnmail-split-fancy '(| "normal"))
-;; (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
+(setq-default gnus-auto-select-first nil
+ gnus-select-method '(nnnil "")
+ gnus-secondary-select-methods '((nnimap "outlook"
+ (nnimap-address "outlook.office365.com")
+ (nnimap-server-port 993)
+ (nnimap-stream ssl)
+ (nnimap-authinfo-file "~/.authinfo"))
+ (nnimap "home"
+ (nnimap-address "serwer1930490.home.pl")
+ (nnimap-server-port 993)
+ (nnimap-stream ssl)
+ (nnimap-authinfo-file "~/.authinfo")))
+ nnmail-split-method 'nnmail-split-fancy
+ nnmail-split-fancy '(| "normal"))
+(add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
+
+;; Org Configuration
+(setq-default org-contacts-files '("~/Dokumenty/UWM/filia w Ełku/Samorząd 2022/starostowie.org"))
;; ORG-FC Configuration
(require 'org-fc-hydra)
(setq-default
org-fc-algorithm 'tn
- org-fc-shuffle-positions t
org-fc-directories '("~/Dokumenty/fiszki"))
;; Nix Mode
-;; (require 'nix-mode)
-;; (add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode))
-
-
-(setq scroll-preserve-screen-position t
- scroll-conservatively 0
- maximum-scroll-margin 0.5
- scroll-margin 99999) \ No newline at end of file
+(require 'nix-mode)
+(add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode))
diff --git a/home-configuration.scm b/home-configuration.scm
index 2f64492..167075a 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -189,6 +189,37 @@
("system-update-" . ,system-update-)))
(bashrc (list
(local-file "data/bashrc")))))
+ ;; (service
+ ;; home-channels-service-type
+ ;; (list
+ ;; (channel
+ ;; (name 'guix)
+ ;; (url "https://git.savannah.gnu.org/git/guix.git"))
+ ;; (channel
+ ;; (name 'jeko)
+ ;; (url "https://framagit.org/Jeko/guix-jeko-channel.git"))
+ ;; (channel
+ ;; (name 'nonguix)
+ ;; (url "https://gitlab.com/nonguix/nonguix")
+ ;; ;; Enable signature verification:
+ ;; (introduction
+ ;; (make-channel-introduction
+ ;; "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+ ;; (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
+ ;; (channel (name 'org-fc-tn)
+ ;; (url "file:///home/marek/src/org-fc")
+ ;; (branch "repository"))
+ ;; (channel (name 'packages)
+ ;; (url "file:///home/marek/src/packages")
+ ;; (branch "master"))
+ ;; (channel (name 'channel)
+ ;; (url "https://git.marekpasnikowski.pl/git/channel.git")
+ ;; (branch "wip-channel")
+ ;; ( introduction
+ ;; ( make-channel-introduction
+ ;; "f8ccfe8f3e5c8bafe06665cbd4b0c9301e1a64b6"
+ ;; ( openpgp-fingerprint
+ ;; "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F" ) ) ))))
(simple-service 'configuration-files
home-files-service-type
`((".config/git/config" ,(local-file "data/git-config"))
diff --git a/system-configuration.scm b/system-configuration.scm
index 11a6e61..388bf06 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -1,5 +1,6 @@
(define-module (aisaka-system-configuration)
#:use-module (gnu)
+ #:use-module (gnu packages commencement)
#:use-module (gnu packages cups)
#:use-module (gnu packages finance)
#:use-module (gnu services cups)
@@ -40,11 +41,20 @@
( map
(compose list
specification->package+output)
- ( list "plasma" "plasma-desktop" "plasma-framework" "plasma-integration" "plasma-nano" "plasma-nm" "plasma-pa" "plasma-pass" "plasma-vault" "plasma-welcome" "plasma-workspace" "plasma-bigscreen" "plasma-mobile" "plasma-phonebook" "plasma-browser-integration" "plasma-mobile-settings" "plasma-mobile-sounds" "plasma-wayland-protocols" "plasma-active-window-control" "plasma-phone-components" "plasma-redshift-control" "plasma-disks" "plasma-firewall" "plasma-systemmonitor" "breeze" "breeze-gtk" "bluedevil" "breeze-icons" "kdeplasma-addons" "keysmith" "kmenuedit" "krunner" "kwin" "latte-dock" "plasma-workspace-wallpapers" "polkit-kde-agent" "system-settings" "calindori" "discover" "elisa" "kpipewire" "ksysguard" "attica" "kaccounts-integration" "kde-frameworkintegration" "kmail" "kscreen" ) )
+ ( list ) )
%base-packages))
(services
(append
(list
+ (extra-special-file
+ "/lib64/ld-linux-x86-64.so.2"
+ (file-append (canonical-package glibc) "/lib/ld-linux-x86-64.so.2"))
+ (extra-special-file
+ "/lib64/libstdc++.so.6"
+ (file-append (canonical-package gcc-toolchain) "/lib/libstdc++.so.6"))
+ (extra-special-file
+ "/usr/lib64/libstdc++.so.6"
+ (file-append (canonical-package gcc-toolchain) "/lib/libstdc++.so.6"))
(service openssh-service-type)
(udev-rules-service 'trezord trezord-udev-rules)
(service
@@ -80,6 +90,7 @@
(git-daemon-configuration
(export-all? #t)))
(service gnome-desktop-service-type)
+ (service plasma-desktop-service-type)
(service
tor-service-type
(tor-configuration
@@ -91,6 +102,11 @@
(elogind-configuration
(inherit configuration)
(handle-lid-switch 'ignore)))
+ (gdm-service-type
+ configuration =>
+ (gdm-configuration
+ (inherit configuration)
+ (wayland? #t)))
(delete guix-service-type))))
(bootloader (bootloader-configuration (bootloader grub-bootloader)
(targets '("/dev/sda"))
generated by cgit v1.2.3 (git 2.46.2) at 2024-11-10 03:25:07 +0000