From 974bd092a28c96f9e72ce664c126ec0d5fac79f8 Mon Sep 17 00:00:00 2001 From: Gonzalo Rafael Acosta Date: Sun, 7 Jul 2024 11:16:34 -0300 Subject: [PATCH 1/8] Use system.timezone for waybar --- user/wm/hyprland/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index b2f5860..5a8d205 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -830,7 +830,7 @@ in clock = { "interval" = 1; "format" = "{:%a %Y-%m-%d %I:%M:%S %p}"; - "timezone" = "America/Chicago"; + "timezone" = systemSettings.timezone; "tooltip-format" = '' {:%Y %B} {calendar}''; From b6f621c964e15e351bf76d094ba038f88d0dc3b7 Mon Sep 17 00:00:00 2001 From: Emmet Date: Mon, 15 Jul 2024 10:42:20 -0500 Subject: [PATCH 2/8] Open ports for syncthing --- system/security/firewall.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/security/firewall.nix b/system/security/firewall.nix index 60d339a..ff582da 100644 --- a/system/security/firewall.nix +++ b/system/security/firewall.nix @@ -4,8 +4,8 @@ # Firewall networking.firewall.enable = true; # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; + networking.firewall.allowedTCPPorts = [ 22000 21027 ]; # syncthing + networking.firewall.allowedUDPPorts = [ 22000 21027 ]; # syncthing # Or disable the firewall altogether. # networking.firewall.enable = false; } From ba2f97ab31325c78373577e964641d88aebad027 Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 16 Jul 2024 08:33:30 -0500 Subject: [PATCH 3/8] Select roam dashboard/inbox from title --- user/app/doom-emacs/config.el | 16 ++++++++++++---- user/app/doom-emacs/doom.org | 20 ++++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index b03e110..ec2d418 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 (file-exists-p (concat org-roam-directory "/dashboard.org")) - (org-open-file (concat org-roam-directory "/dashboard.org")) + (if (org-roam-node-from-title-or-alias "Overview") + (org-roam-node-open (org-roam-node-from-title-or-alias "Overview")) (dired org-roam-directory)) ) @@ -740,11 +740,19 @@ 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-create) + (org-roam-capture- :node (org-roam-node-from-title-or-alias "Inbox") :templates '(("i" "inbox" plain "* %?" - :if-new (file+head "inbox.org" "#+title: Inbox\n"))))) + :if-new (file+head "%<%Y%m%d%H%M%S>-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 eb51346..bb2b94a 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 (file-exists-p (concat org-roam-directory "/dashboard.org")) - (org-open-file (concat org-roam-directory "/dashboard.org")) + (if (org-roam-node-from-title-or-alias "Overview") + (org-roam-node-open (org-roam-node-from-title-or-alias "Overview")) (dired org-roam-directory)) ) @@ -879,11 +879,19 @@ 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-create) + (org-roam-capture- :node (org-roam-node-from-title-or-alias "Inbox") :templates '(("i" "inbox" plain "* %?" - :if-new (file+head "inbox.org" "#+title: Inbox\n"))))) + :if-new (file+head "%<%Y%m%d%H%M%S>-inbox.org" "#+title: Inbox\n"))))) (defun org-roam-switch-db (&optional arg silent) "Switch to a different org-roam database, arg" @@ -932,6 +940,10 @@ 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 ------;;; From 8f739d1583407eb84a5c14941b37924b76cad0c5 Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 16 Jul 2024 08:36:19 -0500 Subject: [PATCH 4/8] Bumped stable to 24.05 and added unstable for servers --- flake.lock | 8 ++++---- flake.nix | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 8e893be..8fc1466 100644 --- a/flake.lock +++ b/flake.lock @@ -943,16 +943,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index a3568f1..e24aefa 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,15 @@ }; }; + 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; }; @@ -192,7 +201,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-23.11"; + nixpkgs-stable.url = "nixpkgs/nixos-24.05"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; From 35c5e4f00ba2f1b518b57a431b1899fe293d87ba Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 16 Jul 2024 08:38:11 -0500 Subject: [PATCH 5/8] Fixes stable home-manager ver --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e24aefa..494ab68 100644 --- a/flake.nix +++ b/flake.nix @@ -209,7 +209,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-23.11"; + home-manager-stable.url = "github:nix-community/home-manager/release-24.05"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; nix-on-droid = { From 8cec3e5299da5f6e8fcc61f230f96b42fdaa06ed Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 16 Jul 2024 08:41:20 -0500 Subject: [PATCH 6/8] Fixes server rebuild error --- profiles/homelab/base.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/profiles/homelab/base.nix b/profiles/homelab/base.nix index 190e145..c0562a5 100644 --- a/profiles/homelab/base.nix +++ b/profiles/homelab/base.nix @@ -89,6 +89,4 @@ # It is ok to leave this unchanged for compatibility purposes system.stateVersion = "22.11"; - news.display = "silent"; - } From c0f7854c2c42402c1c04d11853155bdf323e3857 Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 16 Jul 2024 09:58:42 -0500 Subject: [PATCH 7/8] Updated home-manager-stable lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8fc1466..df2f5aa 100644 --- a/flake.lock +++ b/flake.lock @@ -451,16 +451,16 @@ ] }, "locked": { - "lastModified": 1719827415, - "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } From bef375ef43988a8bfff2d8fccdd173661f42ba92 Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 16 Jul 2024 10:02:28 -0500 Subject: [PATCH 8/8] Fixes for permissions scripts --- harden.sh | 27 ++++++++++++++------------- soften.sh | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/harden.sh b/harden.sh index e1d65d5..05477d6 100755 --- a/harden.sh +++ b/harden.sh @@ -19,17 +19,18 @@ else SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) fi pushd $SCRIPT_DIR &> /dev/null; -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; +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; popd &> /dev/null; diff --git a/soften.sh b/soften.sh index 93476c7..84dde5f 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; -chown -R 1000:users .; +sudo chown -R 1000:users .; popd &> /dev/null;