diff --git a/flake.lock b/flake.lock index 5a8fd63..0a41721 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1717449440, - "narHash": "sha256-QtSCQFBhyQIsKJhOvcIOi+9EN1kEnNeoLo3PeQ5VbIY=", + "lastModified": 1716859594, + "narHash": "sha256-wllEikCX/bMY/ZyRszXvar+AzYqmAx6fcjvcDJBkzfU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "e1a7b23e9769607009d741066b5789a99aaf9923", + "rev": "6b6cba7dc79b459f80ffc44b3dd9973effdbed34", "type": "github" }, "original": { @@ -469,11 +469,11 @@ ] }, "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", + "lastModified": 1716729592, + "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", + "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -589,17 +589,17 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1714862770, - "narHash": "sha256-W6hJa5pWNQ19q9YNGS9s2ZaGkWmBd6yLsT9NqLtI1vg=", + "lastModified": 1714837352, + "narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0b215c5f246d3fde6c023e78b3e3579f7498c172", + "rev": "cba1ade848feac44b2eda677503900639581c3f4", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", - "rev": "0b215c5f246d3fde6c023e78b3e3579f7498c172", + "rev": "cba1ade848feac44b2eda677503900639581c3f4", "type": "github" } }, @@ -799,11 +799,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -814,11 +814,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717530100, - "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", + "lastModified": 1716991068, + "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", + "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "type": "github" }, "original": { @@ -958,11 +958,11 @@ "org-side-tree": { "flake": false, "locked": { - "lastModified": 1717236106, - "narHash": "sha256-b30Yl378DaRQl8DAsAaeyf+WYz0y7L5h0EsbBQGvdjE=", + "lastModified": 1706597780, + "narHash": "sha256-y7a/ouih5Jnug50OJHAv7S5BsfKSxMWoQ63t7cq7XrI=", "owner": "localauthor", "repo": "org-side-tree", - "rev": "e8da5217ce23440a62f4a46ef60e2082b6284b28", + "rev": "62169a26edfafacd681ecaf84289dd6b58be6c32", "type": "github" }, "original": { @@ -1151,11 +1151,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1717726729, - "narHash": "sha256-2WDKLjVRKWXbadnJHSOUb46PTq3D5nS89vhHTphRw1M=", + "lastModified": 1717121863, + "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f52ac9ae95bd60c0780d6e32baea22e542e11e1", + "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", "type": "github" }, "original": { @@ -1195,11 +1195,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1717593209, - "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", + "lastModified": 1717184467, + "narHash": "sha256-d1m43p1Pvh6LMkSHcwDadVIAQrm+2HFhVjQ3m7wzf84=", "owner": "danth", "repo": "stylix", - "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", + "rev": "ebaed9d4bf258f4eda7d0690c4092fadcbeefa9d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b21bb77..ee4e18e 100644 --- a/flake.nix +++ b/flake.nix @@ -182,7 +182,7 @@ home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; - hyprland.url = "github:hyprwm/Hyprland/0b215c5f246d3fde6c023e78b3e3579f7498c172?submodules=1"; + hyprland.url = "github:hyprwm/Hyprland/cba1ade848feac44b2eda677503900639581c3f4?submodules=1"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; hyprland-plugins.inputs.hyprland.follows = "hyprland"; diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index c475bff..56c8faf 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -118,13 +118,11 @@ ;; line 2 ( (,"Git" "" "" (lambda (&rest _)) 'diredfl-exec-priv) (,(all-the-icons-octicon "mark-github" :height 1.0 :v-adjust 0.0) - "GitHub" "" (lambda (&rest _) (browse-url "https://github.com/librephoenix")) 'diredfl-exec-priv) + "GitHub" "" (lambda (&rest _) (browse-url "ext+container:name=Tech&url=https://github.com/librephoenix")) 'diredfl-exec-priv) (,(all-the-icons-faicon "gitlab" :height 1.0 :v-adjust 0.0) - "GitLab" "" (lambda (&rest _) (browse-url "https://gitlab.com/librephoenix")) 'diredfl-exec-priv) + "GitLab" "" (lambda (&rest _) (browse-url "ext+container:name=Tech&url=https://gitlab.com/librephoenix")) 'diredfl-exec-priv) (,(all-the-icons-faicon "coffee" :height 1.0 :v-adjust 0.0) "Gitea" "" (lambda (&rest _) (browse-url my-gitea-domain)) 'diredfl-exec-priv) - (,(all-the-icons-octicon "triangle-up" :height 1.2 :v-adjust -0.1) - "Codeberg" "" (lambda (&rest _) (browse-url "https://codeberg.org/librephoenix")) 'diredfl-exec-priv) ) ;; line 3 ( (,"Agenda" "" "" (lambda (&rest _)) 'dired-warning) @@ -1220,12 +1218,24 @@ If the path from LINK does not exist, nil is returned." :map org-super-agenda-header-map "k" 'org-agenda-previous-line) -(require 'calfw) -(require 'calfw-org) -(setq cfw:org-agenda-schedule-args '(:timestamp)) +(add-load-path! "~/.emacs.d/org-timeblock") +(require 'org-timeblock) -(map! :leader :desc "Open org calendar" - "O c" 'cfw:open-org-calendar) +(map! :leader :desc "Open org timeblock" + "O c" 'org-timeblock) + +(map! :desc "Next day" + :map org-timeblock-mode-map + :nvmeg "l" 'org-timeblock-day-later) +(map! :desc "Previous day" + :map org-timeblock-mode-map + :nvmeg "h" 'org-timeblock-day-earlier) +(map! :desc "Schedule event" + :map org-timeblock-mode-map + :nvmeg "m" 'org-timeblock-schedule) +(map! :desc "Event duration" + :map org-timeblock-mode-map + :nvmeg "d" 'org-timeblock-set-duration) ;;;------ magit configuration ------;;; ;; Need the following two blocks to make magit work with git bare repos diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 68ecb1f..ef89849 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -16,7 +16,7 @@ - [[#dired-configuration][Dired Configuration]] - [[#ranger-configuration][Ranger Configuration]] - [[#hledger-mode-configuration][hledger-mode Configuration]] - - [[#no-tab-bar-configuration][NO Tab Bar Configuration]] + - [[#tab-bar-configuration][Tab Bar Configuration]] - [[#focus-mode-configuration][Focus Mode Configuration]] - [[#helpful-mode-configuration][Helpful Mode Configuration]] - [[#mu4e-configuration][mu4e Configuration]] @@ -181,13 +181,11 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu ;; line 2 ( (,"Git" "" "" (lambda (&rest _)) 'diredfl-exec-priv) (,(all-the-icons-octicon "mark-github" :height 1.0 :v-adjust 0.0) - "GitHub" "" (lambda (&rest _) (browse-url "https://github.com/librephoenix")) 'diredfl-exec-priv) + "GitHub" "" (lambda (&rest _) (browse-url "ext+container:name=Tech&url=https://github.com/librephoenix")) 'diredfl-exec-priv) (,(all-the-icons-faicon "gitlab" :height 1.0 :v-adjust 0.0) - "GitLab" "" (lambda (&rest _) (browse-url "https://gitlab.com/librephoenix")) 'diredfl-exec-priv) + "GitLab" "" (lambda (&rest _) (browse-url "ext+container:name=Tech&url=https://gitlab.com/librephoenix")) 'diredfl-exec-priv) (,(all-the-icons-faicon "coffee" :height 1.0 :v-adjust 0.0) "Gitea" "" (lambda (&rest _) (browse-url my-gitea-domain)) 'diredfl-exec-priv) - (,(all-the-icons-octicon "triangle-up" :height 1.2 :v-adjust -0.1) - "Codeberg" "" (lambda (&rest _) (browse-url "https://codeberg.org/librephoenix")) 'diredfl-exec-priv) ) ;; line 3 ( (,"Agenda" "" "" (lambda (&rest _)) 'dired-warning) @@ -603,7 +601,7 @@ else fi exit #+END_SRC -*** NO Org Sliced Images +*** Org Sliced Images #+begin_src emacs-lisp ;; this is kinda buggy (add-load-path! "~/.emacs.d/org-sliced-images") @@ -1398,7 +1396,7 @@ On Wayland, EAF doesn't work. #+END_SRC -*** NO Org Agenda Notifications +*** Org Agenda Notifications #+BEGIN_SRC emacs-lisp (add-load-path! "~/.emacs.d/org-yaap") (require 'org-yaap) @@ -1409,17 +1407,8 @@ On Wayland, EAF doesn't work. (setq org-yaap-daemon-idle-time 30) (org-yaap-mode 1) #+END_SRC -*** Calfw +*** Org Timeblock #+begin_src emacs-lisp :tangle config.el -(require 'calfw) -(require 'calfw-org) -(setq cfw:org-agenda-schedule-args '(:timestamp)) - -(map! :leader :desc "Open org calendar" - "O c" 'cfw:open-org-calendar) -#+end_src -*** NO Org Timeblock -#+begin_src emacs-lisp (add-load-path! "~/.emacs.d/org-timeblock") (require 'org-timeblock) @@ -1547,7 +1536,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." "t a" 'hledger-edit-amount) #+END_SRC -** NO Tab Bar Configuration +** Tab Bar Configuration I don't have this active right now since it's kinda weird with pgtk... #+BEGIN_SRC emacs-lisp ;;;-- tab-bar-mode configuration ;;;-- @@ -2004,7 +1993,7 @@ This section is the [[./init.el][init.el]] section, which controls which Doom mo ;;(wanderlust +gmail) :app - calendar + ;;calendar ;;emms ;;everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize diff --git a/user/app/doom-emacs/init.el b/user/app/doom-emacs/init.el index bdeb54f..c9eb647 100644 --- a/user/app/doom-emacs/init.el +++ b/user/app/doom-emacs/init.el @@ -163,7 +163,7 @@ ;;(wanderlust +gmail) :app - calendar + ;;calendar ;;emms ;;everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize