diff options
| -rw-r--r-- | .config/emacs/bd-mode-and-themes.el | 3 | ||||
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| l--------- | .config/guix/current | 1 | ||||
| -rw-r--r-- | .config/system_config.scm | 88 | ||||
| -rw-r--r-- | .config/xmodmap.config | 4 | ||||
| -rw-r--r-- | src/guix-config/.bashrc | 46 | ||||
| -rw-r--r-- | src/guix-config/bdunahu-config.scm | 64 | ||||
| -rw-r--r-- | src/guix-config/home-configuration.scm | 35 | ||||
| -rw-r--r-- | src/guix-config/system-config.scm | 88 |
9 files changed, 240 insertions, 91 deletions
diff --git a/.config/emacs/bd-mode-and-themes.el b/.config/emacs/bd-mode-and-themes.el index 7f4104b..098b733 100644 --- a/.config/emacs/bd-mode-and-themes.el +++ b/.config/emacs/bd-mode-and-themes.el @@ -108,8 +108,7 @@ only in the selected buffer.") (global-hl-line-mode 1) ;;;; true transparency -(when (>= emacs-major-version 29) - (add-to-list 'default-frame-alist '(alpha-background . 60))) +(add-to-list 'default-frame-alist '(alpha-background . 60)) (defun set-frame-alpha (value) "Sets the transparency of the frame background. 0=transparent/100=opaque" diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 71d6cdf..348cbc8 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -90,7 +90,7 @@ in-place, the old list reference does not remain valid." (use-package newsticker :demand t - :bind (("C-z C-g" . newsticker-show-news) + :bind (("C-z C-n" . newsticker-show-news) :map newsticker-treeview-item-mode-map ("C-j" . rip-video)) :custom diff --git a/.config/guix/current b/.config/guix/current new file mode 120000 index 0000000..4d350ac --- /dev/null +++ b/.config/guix/current @@ -0,0 +1 @@ +/var/guix/profiles/per-user/bdunahu/current-guix
\ No newline at end of file diff --git a/.config/system_config.scm b/.config/system_config.scm deleted file mode 100644 index dadf88d..0000000 --- a/.config/system_config.scm +++ /dev/null @@ -1,88 +0,0 @@ -;; This is an operating system configuration generated -;; by the graphical installer. -;; -;; Once installation is complete, you can learn and modify -;; this file to tweak the system configuration, and pass it -;; to the 'guix system reconfigure' command to effect your -;; changes. - - -;; Indicate which modules to import to access the variables -;; used in this configuration. -(use-modules (gnu)) -(use-service-modules cups desktop networking audio ssh xorg) - -(operating-system - (locale "en_US.utf8") - (timezone "America/Denver") - (keyboard-layout (keyboard-layout "us")) - (host-name "vali") - - ;; The list of user accounts ('root' is implicit). - (users (cons* (user-account - (name "bdunahu") - (comment "bdunahu") - (group "users") - (home-directory "/home/bdunahu") - (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 - ;; for packages and 'guix install PACKAGE' to install a package. - (packages (append (list (specification->package "emacs") - (specification->package "emacs-exwm") - (specification->package - "emacs-desktop-environment") - (specification->package "nss-certs")) - %base-packages)) - - ;; Below is the list of system services. To search for available - ;; services, run 'guix system search KEYWORD' in a terminal. - (services - (append (list - - ;; To configure OpenSSH, pass an 'openssh-configuration' - ;; record as a second argument to 'service' below. - (service openssh-service-type) - (service tor-service-type) - ;; can this be moved to home configuration? - (service mpd-service-type - (mpd-configuration - (music-directory "/home/bdunahu/Personal/mpd/music") - (playlist-directory "/home/bdunahu/Personal/mdp/playlist") - (user "bdunahu") - (default-port 6600))) - (set-xorg-configuration - (xorg-configuration (keyboard-layout keyboard-layout)))) - - ;; 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))) - (mapped-devices (list (mapped-device - (source (uuid - "b9ca1e17-4c3e-4f82-a15c-4bb442c042b9")) - (target "A") - (type luks-device-mapping)))) - - ;; 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 "4D74-E5F8" - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/home/bdunahu/Personal") - (device (uuid "020b73df-3991-4271-9d3f-dba00ad260ec")) - (type "ext4")) - (file-system - (mount-point "/") - (device "/dev/mapper/A") - (type "ext4") - (dependencies mapped-devices)) %base-file-systems))) diff --git a/.config/xmodmap.config b/.config/xmodmap.config new file mode 100644 index 0000000..c3a9690 --- /dev/null +++ b/.config/xmodmap.config @@ -0,0 +1,4 @@ +clear lock +clear control +keycode 66 = Control_L +add control = Control_L Control_R
\ No newline at end of file diff --git a/src/guix-config/.bashrc b/src/guix-config/.bashrc new file mode 100644 index 0000000..bc38007 --- /dev/null +++ b/src/guix-config/.bashrc @@ -0,0 +1,46 @@ +# Export 'SHELL' to child processes. Programs such as 'screen' +# honor it and otherwise use /bin/sh. +export SHELL + +if [[ $- != *i* ]] +then + # We are being invoked from a non-interactive shell. If this + # is an SSH session (as in "ssh host command"), source + # /etc/profile so we get PATH and other essential variables. + [[ -n "$SSH_CLIENT" ]] && source /etc/profile + + # Don't do anything else. + return +fi + +# Source the system-wide file. +source /etc/bashrc + +# Adjust the prompt depending on whether we're in 'guix environment'. +if [ -n "$GUIX_ENVIRONMENT" ] +then + PS1='\u@\h \w [env]\$ ' +else + PS1='\u@\h \w\$ ' +fi +alias ls='ls -p --color=auto' +alias ll='ls -l' +alias grep='grep --color=auto' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable ssh-agent on startup +eval 'ssh-agent' &> /dev/null + +# scripts folder to path +export PATH=$HOME/Personal/scripts/:$PATH + +# fixes some errors with Anaconda3 and URxvt +export TERMINFO=/usr/share/terminfo diff --git a/src/guix-config/bdunahu-config.scm b/src/guix-config/bdunahu-config.scm new file mode 100644 index 0000000..fe49e3a --- /dev/null +++ b/src/guix-config/bdunahu-config.scm @@ -0,0 +1,64 @@ +;; This "home-environment" file can be passed to 'guix home reconfigure' +;; to reproduce the content of your profile. This is "symbolic": it only +;; specifies package names. To reproduce the exact same profile, you also +;; need to capture the channels being used, as returned by "guix describe". +;; See the "Replicating Guix" section in the manual. + +(use-modules (gnu home) + (gnu packages) + (gnu services) + (guix gexp) + (gnu home services) + (gnu home services shells) + (gnu home services ssh)) + +(home-environment + ;; Below is the list of packages that will show up in your + ;; Home profile, under ~/.guix-home/profile. + (packages (specifications->packages (list "dmenu" + "feh" + "flameshot" + "gimp" + "icecat" + "libnotify" + ;; "mpc" + "password-store" + "pass-otp" + "rsync" + "sbcl" + "slock" + ;; "texlive" + "xset" + "yt-dlp" + "zathura" + "zathura-pdf-poppler"))) + + ;; Below is the list of Home services. To search for available + ;; services, run 'guix home search KEYWORD' in a terminal. + (services + (list (service home-bash-service-type + (home-bash-configuration + (aliases '(("c" . "clear") ("cp" . "cp -i") + ("grep" . "grep --color=auto") + ("ll" . "ls -l") + ("ls" . "ls -p --color=auto") + ("mkd" . "mkdir -pv") + ("mv" . "mv -i") + ("rm" . "rm -i") + ("vi" . "vim") + ("ytta" . "yt-dlp --paths /home/bdunahu/Media/Audio --extract-audio --format bestaudio/best") + ("yttv" . "yt-dlp --paths /home/bdunahu/Media/Videos -f b"))) + (bashrc (list (local-file + "/home/bdunahu/src/guix-config//.bashrc" + "bashrc"))))) + (service home-openssh-service-type + (home-openssh-configuration + (hosts + (list (openssh-host (name "ambrosis") + (host-name "192.168.1.68") + (user "bdunahu")) + (openssh-host (name "vali") + (host-name "192.168.1.64") + (user "bdunahu")))))) + (service home-xdg-configuration-files-service-type + `(("emacs/init.el" ,(local-file "init.el"))))))) diff --git a/src/guix-config/home-configuration.scm b/src/guix-config/home-configuration.scm new file mode 100644 index 0000000..344df88 --- /dev/null +++ b/src/guix-config/home-configuration.scm @@ -0,0 +1,35 @@ +;; This "home-environment" file can be passed to 'guix home reconfigure' +;; to reproduce the content of your profile. This is "symbolic": it only +;; specifies package names. To reproduce the exact same profile, you also +;; need to capture the channels being used, as returned by "guix describe". +;; See the "Replicating Guix" section in the manual. + +(use-modules (gnu home) + (gnu packages) + (gnu services) + (guix gexp) + (gnu home services shells)) + +(home-environment + ;; Below is the list of packages that will show up in your + ;; Home profile, under ~/.guix-home/profile. + (packages (specifications->packages (list "xset"))) + + ;; Below is the list of Home services. To search for available + ;; services, run 'guix home search KEYWORD' in a terminal. + (services + (list (service home-bash-service-type + (home-bash-configuration + (aliases '(("c" . "clear") ("cp" . "cp -i") + ("grep" . "grep --color=auto") + ("ll" . "ls -l") + ("ls" . "ls -p --color=auto") + ("mkd" . "mkdir -pv") + ("mv" . "mv -i") + ("rm" . "rm -i") + ("vi" . "vim") + ("ytta" . "yt-dlp --paths /home/bdunahu/Media/Audio --extract-audio --format bestaudio/best") + ("yttv" . "yt-dlp --paths /home/bdunahu/Media/Videos -f b"))) + (bashrc (list (local-file + "/home/bdunahu/src/guix-config//.bashrc" + "bashrc"))))) diff --git a/src/guix-config/system-config.scm b/src/guix-config/system-config.scm new file mode 100644 index 0000000..2f7710c --- /dev/null +++ b/src/guix-config/system-config.scm @@ -0,0 +1,88 @@ +;; Indicate which modules to import to access the variables +;; used in this configuration. +(use-modules (gnu)) +(use-service-modules audio desktop networking ssh xorg) + +(define username "bdunahu") +(define host-name "vali") + +(define user (user-account + (name username) + (comment username) + (group "users") + (home-directory (string-append "/home/" username)) + (supplementary-groups '("wheel" "netdev" "audio" "video")))) + +(operating-system + (locale "en_US.utf8") + (timezone "America/Denver") + (keyboard-layout (keyboard-layout "us")) + (host-name host-name) + + ;; The list of user accounts ('root' is implicit). + (users (cons* user + %base-user-accounts)) + + ;; Packages installed system-wide. Users can also install packages + ;; under their own account: use 'guix search KEYWORD' to search + ;; for packages and 'guix install PACKAGE' to install a package. + (packages (append (map specification->package + '("emacs" + "emacs-exwm" + "emacs-desktop-environment" + "git" + "htop" + "imagemagick" + "mpd" + "mpv" + "nss-certs" + "picom" + "stow" + "vim" + "xmodmap")) + %base-packages)) + + ;; Below is the list of system services. To search for available + ;; services, run 'guix system search KEYWORD' in a terminal. + (services + (append (list + + ;; To configure OpenSSH, pass an 'openssh-configuration' + ;; record as a second argument to 'service' below. + (service openssh-service-type) + (service tor-service-type) + (service mpd-service-type + (mpd-configuration + (user user) + (music-directory "~/Personal/mpd/music") + (playlist-directory "~/Personal/mpd/playlist") + (default-port 6600))) + (set-xorg-configuration + (xorg-configuration (keyboard-layout keyboard-layout)))) + + ;; 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))) + + ;; 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 "445A-BE61" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/home/bdunahu/Personal") + (device (uuid "020b73df-3991-4271-9d3f-dba00ad260ec")) + (type "ext4")) + (file-system + (mount-point "/") + (device (uuid + "98a6a953-1689-4a0f-a43b-f73c5a5d3e51" + 'ext4)) + (type "ext4")) %base-file-systems))) |