Compare commits

...

10 Commits

Author SHA1 Message Date
Skylar Hill 0c2208ec7e Add rust build tools
As much as I wanted to avoid using cargo and just stick to guix, Cargo
is just really nice and also `guix shell rust-rand` with rustc didn't
actually work
2023-11-14 10:24:08 -06:00
Skylar Hill c2d4d6f864 Move syncthing service to system config
Apparently home-syncthing-service-type is busted...
2023-11-14 10:23:36 -06:00
Skylar Hill 3e6470d00b Set up CUPS configuration and user groups 2023-11-13 23:05:25 -06:00
Skylar Hill 60f1350951 Add calibre, configure mupdf as default epub reader 2023-11-13 23:04:59 -06:00
Skylar Hill e160eda352 Switch to existing syncthing home service 2023-11-13 23:04:44 -06:00
Skylar Hill ae779c3364 Add toot mastodon client 2023-11-13 14:54:25 -06:00
Skylar Hill d8e4a20c8b Add cjk font 2023-11-13 14:54:17 -06:00
Skylar Hill 794f212371 Add flatpak and configure data paths 2023-11-13 14:53:59 -06:00
Skylar Hill fca290ccf3 Add config for rofi theming 2023-11-13 00:04:48 -06:00
Skylar Hill 8f6adfa74d Add gaps and small smart borders to sway 2023-11-12 23:46:05 -06:00
5 changed files with 218 additions and 37 deletions

View File

@ -2,6 +2,9 @@ bass source $HOME/.profile
set -x GUILE_HISTORY "$XDG_STATE_HOME"/guile_history
set -x LESSHISTFILE "$XDG_STATE_HOME"/less/history
set -x PASSWORD_STORE_DIR "$XDG_DATA_HOME"/pass
set -x XDG_DATA_DIRS "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share"
set -x XDG_DATA_DIRS "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share"
set -x XDG_DATA_DIRS "$XDG_DATA_DIRS:$HOME/.local/share/applications"
function wget --wraps wget
command wget --hsts-file="$XDG_DATA_HOME/wget-hsts"

153
home/rofi Normal file
View File

@ -0,0 +1,153 @@
/* -*- mode: conf -*- */
configuration {
/* modes: "window,drun,run,ssh";*/
font: "Iosevka Slab 12";
/* location: 0;*/
/* yoffset: 0;*/
/* xoffset: 0;*/
/* fixed-num-lines: true;*/
/* show-icons: false;*/
/* terminal: "rofi-sensible-terminal";*/
/* ssh-client: "ssh";*/
/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
/* run-command: "{cmd}";*/
/* run-list-command: "";*/
/* run-shell-command: "{terminal} -e {cmd}";*/
/* window-command: "wmctrl -i -R {window}";*/
/* window-match-fields: "all";*/
/* icon-theme: ;*/
/* drun-match-fields: "name,generic,exec,categories,keywords";*/
/* drun-categories: ;*/
/* drun-show-actions: false;*/
/* drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";*/
/* drun-url-launcher: "xdg-open";*/
/* disable-history: false;*/
/* ignored-prefixes: "";*/
/* sort: false;*/
/* sorting-method: "normal";*/
/* case-sensitive: false;*/
/* cycle: true;*/
/* sidebar-mode: false;*/
/* hover-select: false;*/
/* eh: 1;*/
/* auto-select: false;*/
/* parse-hosts: false;*/
/* parse-known-hosts: true;*/
/* combi-modes: "window,run";*/
/* matching: "normal";*/
/* tokenize: true;*/
/* m: "-5";*/
/* filter: ;*/
/* dpi: -1;*/
/* threads: 0;*/
/* scroll-method: 0;*/
/* window-format: "{w} {c} {t}";*/
/* click-to-exit: true;*/
/* max-history-size: 25;*/
/* combi-hide-mode-prefix: false;*/
/* combi-display-format: "{mode} {text}";*/
/* matching-negate-char: '-' /* unsupported */;*/
/* cache-dir: ;*/
/* window-thumbnail: false;*/
/* drun-use-desktop-cache: false;*/
/* drun-reload-desktop-cache: false;*/
/* normalize-match: false;*/
/* steal-focus: false;*/
/* application-fallback-icon: ;*/
/* refilter-timeout-limit: 300;*/
/* xserver-i300-workaround: false;*/
/* pid: "/run/user/1000/rofi.pid";*/
/* display-window: ;*/
/* display-run: ;*/
/* display-ssh: ;*/
/* display-drun: ;*/
/* display-combi: ;*/
/* display-keys: ;*/
/* display-filebrowser: ;*/
/* kb-primary-paste: "Control+V,Shift+Insert";*/
/* kb-secondary-paste: "Control+v,Insert";*/
/* kb-secondary-copy: "Control+c";*/
/* kb-clear-line: "Control+w";*/
/* kb-move-front: "Control+a";*/
/* kb-move-end: "Control+e";*/
/* kb-move-word-back: "Alt+b,Control+Left";*/
/* kb-move-word-forward: "Alt+f,Control+Right";*/
/* kb-move-char-back: "Left,Control+b";*/
/* kb-move-char-forward: "Right,Control+f";*/
/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
/* kb-remove-word-forward: "Control+Alt+d";*/
/* kb-remove-char-forward: "Delete,Control+d";*/
/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/
/* kb-remove-to-eol: "Control+k";*/
/* kb-remove-to-sol: "Control+u";*/
/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
/* kb-accept-custom: "Control+Return";*/
/* kb-accept-custom-alt: "Control+Shift+Return";*/
/* kb-accept-alt: "Shift+Return";*/
/* kb-delete-entry: "Shift+Delete";*/
/* kb-mode-next: "Shift+Right,Control+Tab";*/
/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
/* kb-mode-complete: "Control+l";*/
/* kb-row-left: "Control+Page_Up";*/
/* kb-row-right: "Control+Page_Down";*/
/* kb-row-up: "Up,Control+p";*/
/* kb-row-down: "Down,Control+n";*/
/* kb-row-tab: "";*/
/* kb-element-next: "Tab";*/
/* kb-element-prev: "ISO_Left_Tab";*/
/* kb-page-prev: "Page_Up";*/
/* kb-page-next: "Page_Down";*/
/* kb-row-first: "Home,KP_Home";*/
/* kb-row-last: "End,KP_End";*/
/* kb-row-select: "Control+space";*/
/* kb-screenshot: "Alt+S";*/
/* kb-ellipsize: "Alt+period";*/
/* kb-toggle-case-sensitivity: "grave,dead_grave";*/
/* kb-toggle-sort: "Alt+grave";*/
/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/
/* kb-custom-1: "Alt+1";*/
/* kb-custom-2: "Alt+2";*/
/* kb-custom-3: "Alt+3";*/
/* kb-custom-4: "Alt+4";*/
/* kb-custom-5: "Alt+5";*/
/* kb-custom-6: "Alt+6";*/
/* kb-custom-7: "Alt+7";*/
/* kb-custom-8: "Alt+8";*/
/* kb-custom-9: "Alt+9";*/
/* kb-custom-10: "Alt+0";*/
/* kb-custom-11: "Alt+exclam";*/
/* kb-custom-12: "Alt+at";*/
/* kb-custom-13: "Alt+numbersign";*/
/* kb-custom-14: "Alt+dollar";*/
/* kb-custom-15: "Alt+percent";*/
/* kb-custom-16: "Alt+dead_circumflex";*/
/* kb-custom-17: "Alt+ampersand";*/
/* kb-custom-18: "Alt+asterisk";*/
/* kb-custom-19: "Alt+parenleft";*/
/* kb-select-1: "Super+1";*/
/* kb-select-2: "Super+2";*/
/* kb-select-3: "Super+3";*/
/* kb-select-4: "Super+4";*/
/* kb-select-5: "Super+5";*/
/* kb-select-6: "Super+6";*/
/* kb-select-7: "Super+7";*/
/* kb-select-8: "Super+8";*/
/* kb-select-9: "Super+9";*/
/* kb-select-10: "Super+0";*/
/* ml-row-left: "ScrollLeft";*/
/* ml-row-right: "ScrollRight";*/
/* ml-row-up: "ScrollUp";*/
/* ml-row-down: "ScrollDown";*/
/* me-select-entry: "MousePrimary";*/
/* me-accept-entry: "MouseDPrimary";*/
/* me-accept-custom: "Control+MouseDPrimary";*/
timeout {
action: "kb-cancel";
delay: 0;
}
filebrowser {
directories-first: true;
sorting-method: "name";
}
}
@theme "/home/skylar/.guix-home/profile/share/rofi/themes/purple.rasi"

View File

@ -7,22 +7,23 @@
(guix packages)
(gnu home services)
(gnu home services shells)
(gnu home services shepherd))
(gnu home services shepherd)
(gnu home services syncthing))
(define cataclysm-dda-xdg
(package
(inherit cataclysm-dda)
(name "cataclysm-dda-xdg")
(arguments
(list
#:make-flags
#~(list (string-append "PREFIX=" #$output)
"USE_XDG_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
"LOCALIZE=1" "LANGUAGES=all")
#:phases
#~(modify-phases %standard-phases
(delete 'configure))
#:tests? #f))))
(inherit cataclysm-dda)
(name "cataclysm-dda-xdg")
(arguments
(list
#:make-flags
#~(list (string-append "PREFIX=" #$output)
"USE_XDG_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
"LOCALIZE=1" "LANGUAGES=all")
#:phases
#~(modify-phases %standard-phases
(delete 'configure))
#:tests? #f))))
(home-environment
;; Below is the list of packages that will show up in your
@ -30,10 +31,12 @@
(packages (append
(specifications->packages (list "alsa-utils"
"bat"
"calibre"
"curl"
"deluge"
"emacs"
"emacs-aggressive-indent"
"emacs-calibredb"
"emacs-company"
"emacs-geiser"
"emacs-geiser-guile"
@ -41,15 +44,19 @@
"emacs-ligature"
"emacs-magit"
"emacs-paredit"
"emacs-rustic"
"emacs-sly"
"emacs-swiper"
"emacs-which-key"
"emacs-yasnippet"
"firefox-wayland"
"fish"
"flatpak"
"font-awesome"
"font-google-noto"
"font-google-noto-sans-cjk"
"font-google-noto-emoji"
"font-iosevka-aile"
"font-iosevka-etoile"
"font-iosevka-slab"
"font-iosevka-term-slab"
@ -72,6 +79,7 @@
"mpd"
"mpd-mpc"
"mpv"
"mupdf"
"musescore"
"ncmpcpp"
"neomutt"
@ -81,16 +89,24 @@
"picom"
"pinentry-qt"
"python"
"rust"
"rust-analyzer"
"rust-cargo"
"rofi-wayland"
"sbcl"
"skribilo"
"sqlite"
"steam"
"sway"
"syncthing"
"toot"
"tree-sitter-scheme"
"waybar"
"xdg-desktop-portal"
"xdg-utils"
"xterm"
"yt-dlp"
"ytfzf"
"zoom"))
`(,cataclysm-dda-xdg)))
@ -114,16 +130,11 @@
(provision '(mpd-home))
(documentation "it mpd")
(start #~(make-system-constructor "mpd"))
(stop #~(make-system-destructor "mpd" "--kill")))
(shepherd-service
(provision '(syncthing))
(documentation "it syncthing")
(start #~(make-forkexec-constructor
(list "syncthing" "--no-browser")))
(stop #~(make-kill-destructor "syncthing")))))))
(stop #~(make-system-destructor "mpd" "--kill")))))))
(service home-xdg-configuration-files-service-type
`(("sway/config" ,(local-file "./sway"))
("mpd/mpd.conf" ,(local-file "./mpd.conf"))
("waybar" ,(local-file "waybar" #:recursive? #t))
("kitty/kitty.conf" ,(local-file "kitty.conf"))
("fish" ,(local-file "fish" #:recursive? #t)))))))
("waybar" ,(local-file "./waybar" #:recursive? #t))
("kitty/kitty.conf" ,(local-file "./kitty.conf"))
("fish" ,(local-file "./fish" #:recursive? #t))
("rofi/config.rasi" ,(local-file "./rofi")))))))

View File

@ -1,3 +1,4 @@
# -*- mode: conf -*-
# Default config for sway
#
# Copy this to ~/.config/sway/config and edit it to your liking.
@ -227,4 +228,6 @@ bindsym XF86AudioMicMute exec amixer sset 'Capture' toggle
bindsym $mod+home exec mpc toggle
include /gnu/store/vm0yg0pbnn4jpfy463nxiis98xpr6qz7-sway-1.8.1/etc/sway/config.d/*
default_border pixel 2
smart_borders on
gaps inner 10

View File

@ -11,8 +11,9 @@
;; used in this configuration.
(use-modules (gnu)
(nongnu packages linux)
(gnu packages shells))
(use-service-modules cups desktop networking ssh xorg audio)
(gnu packages shells)
(gnu packages cups))
(use-service-modules audio cups desktop networking ssh syncthing xorg)
(operating-system
(kernel linux)
@ -29,25 +30,35 @@
(comment "Skylar")
(group "users")
(home-directory "/home/skylar")
(supplementary-groups '("wheel" "netdev" "audio" "video")))
%base-user-accounts))
(supplementary-groups '("wheel" "netdev" "audio" "video"
"lpadmin")))
%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 "nss-certs"))
%base-packages))
%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 cups-service-type))
;; To configure OpenSSH, pass an 'openssh-configuration'
;; record as a second argument to 'service' below.
(service openssh-service-type)
(service tor-service-type)
(service cups-service-type
(cups-configuration
(web-interface? #t)
(extensions
(list brlaser cups-filters epson-inkjet-printer-escpr
foomatic-filters hplip splix))))
(service syncthing-service-type
(syncthing-configuration
(user "skylar")
(home "/home/skylar"))))
;; This is the default list of services we
;; are appending to.
@ -72,9 +83,9 @@
(target (uuid
"bbfae3a1-8471-4fa6-9cd5-d9c32059820d")))))
;; The list of file systems that get "mounted". The unique
;; file system identifiers there ("UUIDs") can be obtained
;; by running 'blkid' in a terminal.
;; 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 "/")