Compare commits

..

1 commit

Author SHA1 Message Date
Gonzalo Rafael Acosta 7a4ec3c346
Merge 974bd092a2 into 464b511f23 2024-07-12 01:21:07 -03:00
8 changed files with 36 additions and 64 deletions

View file

@ -451,16 +451,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720042825, "lastModified": 1719827415,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -943,16 +943,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720954236, "lastModified": 1719957072,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-23.11",
"type": "indirect" "type": "indirect"
} }
}, },

View file

@ -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 { pkgs-emacs = import inputs.emacs-pin-nixpkgs {
system = systemSettings.system; system = systemSettings.system;
}; };
@ -201,7 +192,7 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; 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"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6";
kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94";
nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; 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.url = "github:nix-community/home-manager/master";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; 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"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
nix-on-droid = { nix-on-droid = {

View file

@ -19,18 +19,17 @@ else
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
fi fi
pushd $SCRIPT_DIR &> /dev/null; pushd $SCRIPT_DIR &> /dev/null;
sudo chown 0:0 .; chown 0:0 .;
sudo chown 0:0 profiles/*; chown 0:0 profiles/*;
sudo chown -R 0:0 system; chown -R 0:0 system;
sudo chown -R 0:0 patches; chown -R 0:0 patches;
sudo chown 0:0 flake.lock; chown 0:0 flake.lock;
sudo chown 0:0 flake.nix chown 0:0 flake.nix
sudo chown 0:0 profiles chown 0:0 profiles
sudo chown 0:0 profiles/*/configuration.nix; chown 0:0 profiles/*/configuration.nix;
sudo chown 0:0 profiles/homelab/base.nix; chown 0:0 harden.sh;
sudo chown 0:0 harden.sh; chown 0:0 soften.sh;
sudo chown 0:0 soften.sh; chown 0:0 install.sh;
sudo chown 0:0 install.sh; chown 0:0 update.sh;
sudo chown 0:0 update.sh; chown 1000:users **/README.org;
sudo chown 1000:users **/README.org;
popd &> /dev/null; popd &> /dev/null;

View file

@ -89,4 +89,6 @@
# It is ok to leave this unchanged for compatibility purposes # It is ok to leave this unchanged for compatibility purposes
system.stateVersion = "22.11"; system.stateVersion = "22.11";
news.display = "silent";
} }

View file

@ -23,5 +23,5 @@ else
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
fi fi
pushd $SCRIPT_DIR &> /dev/null; pushd $SCRIPT_DIR &> /dev/null;
sudo chown -R 1000:users .; chown -R 1000:users .;
popd &> /dev/null; popd &> /dev/null;

View file

@ -4,8 +4,8 @@
# Firewall # Firewall
networking.firewall.enable = true; networking.firewall.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22000 21027 ]; # syncthing # networking.firewall.allowedTCPPorts = [ ... ];
networking.firewall.allowedUDPPorts = [ 22000 21027 ]; # syncthing # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
} }

View file

@ -727,8 +727,8 @@ If the path from LINK does not exist, nil is returned."
(defun org-roam-open-dashboard () (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)" "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)"
(interactive) (interactive)
(if (org-roam-node-from-title-or-alias "Overview") (if (file-exists-p (concat org-roam-directory "/dashboard.org"))
(org-roam-node-open (org-roam-node-from-title-or-alias "Overview")) (org-open-file (concat org-roam-directory "/dashboard.org"))
(dired org-roam-directory)) (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")) (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 () (defun org-roam-capture-inbox ()
(interactive) (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 "* %?" :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) (defun org-roam-switch-db (&optional arg silent)
"Switch to a different org-roam database, arg" "Switch to a different org-roam database, arg"

View file

@ -866,8 +866,8 @@ exit
(defun org-roam-open-dashboard () (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)" "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)"
(interactive) (interactive)
(if (org-roam-node-from-title-or-alias "Overview") (if (file-exists-p (concat org-roam-directory "/dashboard.org"))
(org-roam-node-open (org-roam-node-from-title-or-alias "Overview")) (org-open-file (concat org-roam-directory "/dashboard.org"))
(dired org-roam-directory)) (dired org-roam-directory))
) )
@ -879,19 +879,11 @@ exit
(message "No inbox found, capture something with M-x org-roam-capture-inbox")) (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 () (defun org-roam-capture-inbox ()
(interactive) (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 "* %?" :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) (defun org-roam-switch-db (&optional arg silent)
"Switch to a different org-roam database, arg" "Switch to a different org-roam database, arg"
@ -940,10 +932,6 @@ exit
(org-roam-switch-db prev-org-roam-db-choice 1))) (org-roam-switch-db prev-org-roam-db-choice 1)))
#+END_SRC #+END_SRC
#+RESULTS:
: org-roam-switch-db-id-open
*** Org Roam "todos" Tagging for Org Agenda *** Org Roam "todos" Tagging for Org Agenda
#+BEGIN_SRC emacs-lisp :tangle config.el #+BEGIN_SRC emacs-lisp :tangle config.el
;;;------ Org-roam-agenda configuration ------;;; ;;;------ Org-roam-agenda configuration ------;;;