Compare commits

..

No commits in common. "662d978241c2c9e8f65194f2208d0357562933f6" and "6a562e3d457e931b1cf5becbca7aa0f6642d3f5d" have entirely different histories.

5 changed files with 39 additions and 69 deletions

View file

@ -1,60 +1,14 @@
{ { pkgs, username, ... }:
pkgs,
username,
...
}:
{ {
imports = [ imports = [
./desktop.nix ./desktop.nix
./work.nix ./work.nix
]; ];
home-manager.users.${username} = home-manager.users.${username} = {
{ config, ... }:
{
home.stateVersion = "23.05"; home.stateVersion = "23.05";
wayland.windowManager.hyprland.settings.monitor = [ wayland.windowManager.hyprland.settings.monitor = [
"desc:Dell Inc. DELL P3223QE CCG8YN3,preferred,auto,1.5" "desc:Dell Inc. DELL P3223QE CCG8YN3,preferred,auto,1.5"
]; ];
systemd.user.services =
let
inherit (config.xdg) configHome;
in
{
mount-documents =
let
target = "${config.home.homeDirectory}/OneDrive";
in
{
Unit = {
Description = "Mount OneDrive to local directory";
After = [ "network-online.target" ];
};
Service = {
Type = "notify";
ExecStartPre = "/usr/bin/env mkdir -p ${target}";
ExecStart = "${pkgs.rclone}/bin/rclone --config=${configHome}/rclone/rclone.conf --vfs-cache-mode writes --ignore-checksum mount \"OneDrive:\" ${target}";
ExecStop = "/bin/fusermount -u ${target}";
};
Install.WantedBy = [ "default.target" ];
};
mount-downloads =
let
target = config.xdg.userDirs.download;
in
{
Unit = {
Description = "Mount Downloads directory to OneDrive";
After = [ "network-online.target" ];
};
Service = {
Type = "notify";
ExecStartPre = "/usr/bin/env mkdir -p ${target}";
ExecStart = "${pkgs.rclone}/bin/rclone --config=${configHome}/rclone/rclone.conf --vfs-cache-mode writes --ignore-checksum mount \"OneDrive:Downloads\" ${target}";
ExecStop = "/bin/fusermount -u ${target}";
};
Install.WantedBy = [ "default.target" ];
};
};
}; };
boot = { boot = {
loader.efi.efiSysMountPoint = "/boot/efi"; loader.efi.efiSysMountPoint = "/boot/efi";

View file

@ -205,12 +205,7 @@
enable = true; enable = true;
image = ./wallpapers/tropic_island_day.jpg; image = ./wallpapers/tropic_island_day.jpg;
base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml";
opacity = { opacity.popups = 0.8;
applications = 0.9;
desktop = 0.8;
popups = 0.8;
terminal = 0.9;
};
cursor = { cursor = {
package = pkgs.volantes-cursors; package = pkgs.volantes-cursors;
name = "volantes_cursors"; name = "volantes_cursors";

View file

@ -37,6 +37,7 @@
nerd-icons-dired nerd-icons-dired
nerd-icons-ibuffer nerd-icons-ibuffer
nerd-icons-corfu nerd-icons-corfu
visual-fill-column
# Email and Calendar # Email and Calendar
khalel khalel
mu4e mu4e

View file

@ -66,8 +66,33 @@
(column-number-mode +1) (column-number-mode +1)
(size-indication-mode -1) (size-indication-mode -1)
(global-visual-line-mode +1) (add-hook 'help-mode-hook (lambda () (visual-line-mode +1)))
(setopt visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow))
(use-package visual-fill-column
:functions (visual-fill-column-mode)
:hook ((prog-mode . (lambda ()
(visual-line-mode +1)
(visual-fill-column-mode +1)))
((Info-mode man-common) . (lambda ()
(setq-local visual-fill-column-width 80)
(visual-line-mode +1)
(visual-fill-column-mode +1))))
:custom
(visual-fill-column-width 120)
(visual-fill-column-center-text t)
(visual-fill-column-enable-sensible-window-split t)
:config
(setopt visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow)))
(with-eval-after-load 'mu4e
(add-hook 'mu4e-view-mode-hook
#'(lambda ()
(visual-line-mode +1)
(visual-fill-column-mode +1)))
(add-hook 'mu4e-compose-mode-hook
#'(lambda ()
(visual-line-mode +1)
(visual-fill-column-mode +1))))
(use-package ligature (use-package ligature
:load-path "external-packages/ligature.el/" :load-path "external-packages/ligature.el/"
@ -185,7 +210,6 @@
(("C-c m" . mu4e) (("C-c m" . mu4e)
:map mu4e-view-mode-map :map mu4e-view-mode-map
("o n" . mu4e-org-store-and-capture)) ("o n" . mu4e-org-store-and-capture))
:hook ((mu4e-main-mode mu4e-headers-mode) . (lambda () (visual-line-mode -1)))
:custom :custom
(mu4e-read-option-use-builtin nil) (mu4e-read-option-use-builtin nil)
(mu4e-completing-read-function #'completing-read) (mu4e-completing-read-function #'completing-read)
@ -592,9 +616,7 @@
(use-package org (use-package org
:demand :demand
:defines org-mode-map :defines org-mode-map
:hook ((org-mode . (lambda () :hook ((org-mode . turn-on-auto-fill))
(visual-line-mode -1)
(turn-on-auto-fill))))
:bind ( :map org-mode-map :bind ( :map org-mode-map
("<remap> <imenu>" . consult-org-heading) ("<remap> <imenu>" . consult-org-heading)
("<remap> <org-goto>" . consult-org-heading)) ("<remap> <org-goto>" . consult-org-heading))
@ -762,8 +784,7 @@
(use-package org-agenda (use-package org-agenda
:after (org appt) :after (org appt)
:bind (("C-c a" . org-agenda)) :bind (("C-c a" . org-agenda))
:hook ((org-agenda-mode . (lambda () (visual-line-mode -1))) :hook (org-agenda-finalize . org-agenda-to-appt)
(org-agenda-finalize . org-agenda-to-appt))
:custom :custom
(org-agenda-span 'day) (org-agenda-span 'day)
(org-agenda-start-on-weekday 1) (org-agenda-start-on-weekday 1)

View file

@ -292,7 +292,6 @@
style = style =
let let
scheme = config.lib.stylix.scheme.withHashtag; scheme = config.lib.stylix.scheme.withHashtag;
opacity = config.stylix.opacity.desktop;
in in
'' ''
* { * {
@ -308,7 +307,7 @@
} }
window > box { window > box {
color: alpha(${scheme.base05}, ${toString opacity}); color: ${scheme.base05};
background: ${scheme.base00}; background: ${scheme.base00};
margin: 5px 5px 0px; margin: 5px 5px 0px;
padding: 0px; padding: 0px;