diff --git a/flake.lock b/flake.lock index df2f5aa..8e893be 100644 --- a/flake.lock +++ b/flake.lock @@ -451,16 +451,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1719827415, + "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -943,16 +943,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-23.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 494ab68..a3568f1 100644 --- a/flake.nix +++ b/flake.nix @@ -79,15 +79,6 @@ }; }; - pkgs-unstable = import inputs.nixpkgs-patched { - system = systemSettings.system; - config = { - allowUnfree = true; - allowUnfreePredicate = (_: true); - }; - overlays = [ inputs.rust-overlay.overlays.default ]; - }; - pkgs-emacs = import inputs.emacs-pin-nixpkgs { system = systemSettings.system; }; @@ -201,7 +192,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "nixpkgs/nixos-23.11"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; @@ -209,7 +200,7 @@ home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; - home-manager-stable.url = "github:nix-community/home-manager/release-24.05"; + home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; nix-on-droid = { diff --git a/harden.sh b/harden.sh index 05477d6..e1d65d5 100755 --- a/harden.sh +++ b/harden.sh @@ -19,18 +19,17 @@ else SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) fi pushd $SCRIPT_DIR &> /dev/null; -sudo chown 0:0 .; -sudo chown 0:0 profiles/*; -sudo chown -R 0:0 system; -sudo chown -R 0:0 patches; -sudo chown 0:0 flake.lock; -sudo chown 0:0 flake.nix -sudo chown 0:0 profiles -sudo chown 0:0 profiles/*/configuration.nix; -sudo chown 0:0 profiles/homelab/base.nix; -sudo chown 0:0 harden.sh; -sudo chown 0:0 soften.sh; -sudo chown 0:0 install.sh; -sudo chown 0:0 update.sh; -sudo chown 1000:users **/README.org; +chown 0:0 .; +chown 0:0 profiles/*; +chown -R 0:0 system; +chown -R 0:0 patches; +chown 0:0 flake.lock; +chown 0:0 flake.nix +chown 0:0 profiles +chown 0:0 profiles/*/configuration.nix; +chown 0:0 harden.sh; +chown 0:0 soften.sh; +chown 0:0 install.sh; +chown 0:0 update.sh; +chown 1000:users **/README.org; popd &> /dev/null; diff --git a/profiles/homelab/base.nix b/profiles/homelab/base.nix index c0562a5..190e145 100644 --- a/profiles/homelab/base.nix +++ b/profiles/homelab/base.nix @@ -89,4 +89,6 @@ # It is ok to leave this unchanged for compatibility purposes system.stateVersion = "22.11"; + news.display = "silent"; + } diff --git a/soften.sh b/soften.sh index 84dde5f..93476c7 100755 --- a/soften.sh +++ b/soften.sh @@ -23,5 +23,5 @@ else SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) fi pushd $SCRIPT_DIR &> /dev/null; -sudo chown -R 1000:users .; +chown -R 1000:users .; popd &> /dev/null; diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index ec2d418..b03e110 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -727,8 +727,8 @@ If the path from LINK does not exist, nil is returned." (defun org-roam-open-dashboard () "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)" (interactive) - (if (org-roam-node-from-title-or-alias "Overview") - (org-roam-node-open (org-roam-node-from-title-or-alias "Overview")) + (if (file-exists-p (concat org-roam-directory "/dashboard.org")) + (org-open-file (concat org-roam-directory "/dashboard.org")) (dired org-roam-directory)) ) @@ -740,19 +740,11 @@ If the path from LINK does not exist, nil is returned." (message "No inbox found, capture something with M-x org-roam-capture-inbox")) ) -(defun org-roam-open-inbox () - "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)" - (interactive) - (if (org-roam-node-from-title-or-alias "Inbox") - (org-roam-node-open (org-roam-node-from-title-or-alias "Inbox")) - (message "No inbox found, capture something with M-x org-roam-capture-inbox")) -) - (defun org-roam-capture-inbox () (interactive) - (org-roam-capture- :node (org-roam-node-from-title-or-alias "Inbox") + (org-roam-capture- :node (org-roam-node-create) :templates '(("i" "inbox" plain "* %?" - :if-new (file+head "%<%Y%m%d%H%M%S>-inbox.org" "#+title: Inbox\n"))))) + :if-new (file+head "inbox.org" "#+title: Inbox\n"))))) (defun org-roam-switch-db (&optional arg silent) "Switch to a different org-roam database, arg" diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index bb2b94a..eb51346 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -866,8 +866,8 @@ exit (defun org-roam-open-dashboard () "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)" (interactive) - (if (org-roam-node-from-title-or-alias "Overview") - (org-roam-node-open (org-roam-node-from-title-or-alias "Overview")) + (if (file-exists-p (concat org-roam-directory "/dashboard.org")) + (org-open-file (concat org-roam-directory "/dashboard.org")) (dired org-roam-directory)) ) @@ -879,19 +879,11 @@ exit (message "No inbox found, capture something with M-x org-roam-capture-inbox")) ) -(defun org-roam-open-inbox () - "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)" - (interactive) - (if (org-roam-node-from-title-or-alias "Inbox") - (org-roam-node-open (org-roam-node-from-title-or-alias "Inbox")) - (message "No inbox found, capture something with M-x org-roam-capture-inbox")) -) - (defun org-roam-capture-inbox () (interactive) - (org-roam-capture- :node (org-roam-node-from-title-or-alias "Inbox") + (org-roam-capture- :node (org-roam-node-create) :templates '(("i" "inbox" plain "* %?" - :if-new (file+head "%<%Y%m%d%H%M%S>-inbox.org" "#+title: Inbox\n"))))) + :if-new (file+head "inbox.org" "#+title: Inbox\n"))))) (defun org-roam-switch-db (&optional arg silent) "Switch to a different org-roam database, arg" @@ -940,10 +932,6 @@ exit (org-roam-switch-db prev-org-roam-db-choice 1))) #+END_SRC - -#+RESULTS: -: org-roam-switch-db-id-open - *** Org Roam "todos" Tagging for Org Agenda #+BEGIN_SRC emacs-lisp :tangle config.el ;;;------ Org-roam-agenda configuration ------;;;