system: Export default guile config.
* gnu/system/shadow.scm (%default-dotguile): Extract from default-skeletons, export. (default-skeletons): Use %default-dotguile. Change-Id: Ibe91b3b517ae542bd28070a08e14152f87ed75ec
This commit is contained in:
		
							parent
							
								
									33136e0426
								
							
						
					
					
						commit
						3ca02f0304
					
				
					 1 changed files with 23 additions and 19 deletions
				
			
		| 
						 | 
					@ -69,6 +69,7 @@
 | 
				
			||||||
            %default-xdefaults
 | 
					            %default-xdefaults
 | 
				
			||||||
            %default-gdbinit
 | 
					            %default-gdbinit
 | 
				
			||||||
            %default-nanorc
 | 
					            %default-nanorc
 | 
				
			||||||
 | 
					            %default-dotguile
 | 
				
			||||||
            default-skeletons
 | 
					            default-skeletons
 | 
				
			||||||
            skeleton-directory
 | 
					            skeleton-directory
 | 
				
			||||||
            %base-groups
 | 
					            %base-groups
 | 
				
			||||||
| 
						 | 
					@ -217,25 +218,9 @@ set auto-load safe-path /gnu/store/*/lib\n"))
 | 
				
			||||||
              "# Include all the syntax highlighting modules.
 | 
					              "# Include all the syntax highlighting modules.
 | 
				
			||||||
include /run/current-system/profile/share/nano/*.nanorc\n"))
 | 
					include /run/current-system/profile/share/nano/*.nanorc\n"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (default-skeletons)
 | 
					(define %default-dotguile
 | 
				
			||||||
  "Return the default skeleton files for /etc/skel.  These files are copied by
 | 
					  (plain-file "dot-guile"
 | 
				
			||||||
'useradd' in the home directory of newly created user accounts."
 | 
					              "(cond ((false-if-exception (resolve-interface '(ice-9 readline)))
 | 
				
			||||||
 | 
					 | 
				
			||||||
  (let ((profile   %default-bash-profile)
 | 
					 | 
				
			||||||
        (bashrc    %default-bashrc)
 | 
					 | 
				
			||||||
        (zprofile  %default-zprofile)
 | 
					 | 
				
			||||||
        (xdefaults %default-xdefaults)
 | 
					 | 
				
			||||||
        (gdbinit   %default-gdbinit))
 | 
					 | 
				
			||||||
    `((".bash_profile" ,profile)
 | 
					 | 
				
			||||||
      (".bashrc" ,bashrc)
 | 
					 | 
				
			||||||
      ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin
 | 
					 | 
				
			||||||
      ;; after ~/.zshrc.  To avoid interfering with any customizations a user
 | 
					 | 
				
			||||||
      ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin.
 | 
					 | 
				
			||||||
      (".zprofile" ,zprofile)
 | 
					 | 
				
			||||||
      (".nanorc" ,%default-nanorc)
 | 
					 | 
				
			||||||
      (".Xdefaults" ,xdefaults)
 | 
					 | 
				
			||||||
      (".guile" ,(plain-file "dot-guile"
 | 
					 | 
				
			||||||
                             "(cond ((false-if-exception (resolve-interface '(ice-9 readline)))
 | 
					 | 
				
			||||||
       =>
 | 
					       =>
 | 
				
			||||||
       (lambda (module)
 | 
					       (lambda (module)
 | 
				
			||||||
         ;; Enable completion and input history at the REPL.
 | 
					         ;; Enable completion and input history at the REPL.
 | 
				
			||||||
| 
						 | 
					@ -253,6 +238,25 @@ convenient interactive line editing and input history.\\n\\n\")))
 | 
				
			||||||
              (else
 | 
					              (else
 | 
				
			||||||
               (display \"Consider installing the 'guile-colorized' package
 | 
					               (display \"Consider installing the 'guile-colorized' package
 | 
				
			||||||
for a colorful Guile experience.\\n\\n\"))))\n"))
 | 
					for a colorful Guile experience.\\n\\n\"))))\n"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define (default-skeletons)
 | 
				
			||||||
 | 
					  "Return the default skeleton files for /etc/skel.  These files are copied by
 | 
				
			||||||
 | 
					'useradd' in the home directory of newly created user accounts."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  (let ((profile   %default-bash-profile)
 | 
				
			||||||
 | 
					        (bashrc    %default-bashrc)
 | 
				
			||||||
 | 
					        (zprofile  %default-zprofile)
 | 
				
			||||||
 | 
					        (xdefaults %default-xdefaults)
 | 
				
			||||||
 | 
					        (gdbinit   %default-gdbinit))
 | 
				
			||||||
 | 
					    `((".bash_profile" ,profile)
 | 
				
			||||||
 | 
					      (".bashrc" ,bashrc)
 | 
				
			||||||
 | 
					      ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin
 | 
				
			||||||
 | 
					      ;; after ~/.zshrc.  To avoid interfering with any customizations a user
 | 
				
			||||||
 | 
					      ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin.
 | 
				
			||||||
 | 
					      (".zprofile" ,zprofile)
 | 
				
			||||||
 | 
					      (".nanorc" ,%default-nanorc)
 | 
				
			||||||
 | 
					      (".Xdefaults" ,xdefaults)
 | 
				
			||||||
 | 
					      (".guile" ,%default-dotguile)
 | 
				
			||||||
      (".gdbinit" ,gdbinit))))
 | 
					      (".gdbinit" ,gdbinit))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (skeleton-directory skeletons)
 | 
					(define (skeleton-directory skeletons)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue