Compare commits

...

2 Commits

Author SHA1 Message Date
Ryan Rix fb040ba39e need plugdev for qmk_firmware atmel-dfu builds 2022-09-19 10:52:06 -07:00
Ryan Rix 814eaee41b make cce/update-nixpkgs-checkout use the proper magit-merge command 2022-09-19 10:51:37 -07:00
2 changed files with 4 additions and 2 deletions

View File

@ -143,6 +143,7 @@ ehehehehe thanks homie.
* Keeping my =nixpkgs= checkout up to date
:PROPERTIES:
:ID: 20220526T160150.431487
:ROAM_ALIASES: cce/update-nixpkgs-checkout
:END:
Updating the Nixpkgs checkout can be by invoking something like =cce/update-nixpkgs-checkout=:
@ -150,6 +151,7 @@ Updating the Nixpkgs checkout can be by invoking something like =cce/update-nixp
#+ARROYO_EMACS_MODULE: nixpkgs
#+begin_src emacs-lisp :results none :tangle ~/org/cce/nixpkgs.el
(use-package plz)
(defun cce/update-nixpkgs-checkout ()
(interactive)
(let ((path "/home/rrix/Code/nixpkgs/"))
@ -160,7 +162,7 @@ Updating the Nixpkgs checkout can be by invoking something like =cce/update-nixp
(nixpkgs-unstable-ts (string-to-number (second channel-status)))
(nixpkgs-unstable (first channel-status)))
(magit-fetch-all nil)
(magit-merge-into "origin/nixpkgs-unstable")
(magit-merge-plain "origin/nixpkgs-unstable")
(message "updated nixpkgs checkout to %s"
(format-time-string "%c" nixpkgs-unstable-ts))))))
(provide 'cce/nixpkgs)

View File

@ -30,7 +30,7 @@ This [[id:cce/cce][CCE]] module describes my user and SSH keys for [[id:cce/my_n
isNormalUser = true;
home = "/home/rrix";
description = "Ryan Rix";
extraGroups = [ "audio" "wheel" "networkmanager" "adbusers" "systemd-journal" "docker" "dialout" ];
extraGroups = [ "audio" "wheel" "networkmanager" "adbusers" "systemd-journal" "docker" "dialout" "plugdev" ];
uid = 1000;
group = "humans";
initialPassword = "changeme!";