steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge staging to master #12

Merged
steveej merged 30 commits from staging into master 2018-11-10 11:10:55 +00:00
Conversation 5 Commits 30 Files changed 46 +628 -623
steveej commented 2018-11-10 10:31:11 +00:00 (Migrated from gitlab.com)
Copy link
No description provided.
steveej commented 2018-11-10 10:36:24 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 0bb69aad - nix/home: use zathura from stable

Compare with previous version

added 1 commit <ul><li>0bb69aad - nix/home: use zathura from stable</li></ul> [Compare with previous version](https://gitlab.com/steveeJ/infra/merge_requests/6/diffs?diff_id=27032466&start_sha=5585af94e96274165fe34063d4dab18c27d8f6fa)
steveej commented 2018-11-10 10:57:08 +00:00 (Migrated from gitlab.com)
Copy link

added 31 commits

  • 45bd48c5 - move all expressions to nix/; include modularized home-manager config
  • b74214b8 - add envrc and shell.nix with 'just' pkg
  • d443e9ec - nix config udpate; polish top-level Justfile
  • 9da9c2f6 - nix: add channel configuration and rework update process
  • e534490d - home/qtile: add volume keys and ease testing
  • dd34cbd4 - Update roadmap
  • b50bbdca - home-manager: cleanup&rename configuration
  • 1682235c - home-manager: cleanup&rename configuration
  • ff4fcb37 - nix/{os,home-manager}: cleanup
  • eac516a6 - home/qtile: make volume keys work on multiple sinks
  • e686ab24 - home/qtile: use external mute state and act on all sinks
  • 75f433ef - Justfile: move rebuild functionality into rebuild
  • 7e062c0e - home/qtile-desktop: add pavucontrol
  • bc70e93f - Update roadmap
  • 29d12f92 - home/qtile: store tmpfiles in $TEMPDIR
  • e15b6165 - shell: add emergency tools
  • e9a44629 - home/qtile: handle missing TEMPDIR
  • 6ebae697 - home/common: add git helpers
  • c1ef156c - Justfile/hm-iterate-qtile: fallback to building system
  • cfb401d5 - nix/home: fix typo
  • 1e427f2b - nix/home: handle dotfiles via vcsh
  • e2515fd4 - readd pws
  • 3395857c - dotfiles/vcsh: populate nix store with dotfiles mirror
  • aec750e4 - nix/os: more work on partition handling
  • 703cc326 - nix/os: fix /bin activation and some cleanup
  • 492b31e8 - nix/os/devices: add steveej-t480s-work
  • 483d981e - nix/os: tidy up hw/boot handling
  • 54a0b898 - steveej-t480-work: add NVMe support and user packages
  • 53f2580b - README: add bugs
  • 7234c0a5 - nix: bump just and add to common profile
  • 4dc5b17b - nix/home: use zathura from stable

Compare with previous version

added 31 commits <ul><li>45bd48c5 - move all expressions to nix/; include modularized home-manager config</li><li>b74214b8 - add envrc and shell.nix with &#39;just&#39; pkg</li><li>d443e9ec - nix config udpate; polish top-level Justfile</li><li>9da9c2f6 - nix: add channel configuration and rework update process</li><li>e534490d - home/qtile: add volume keys and ease testing</li><li>dd34cbd4 - Update roadmap</li><li>b50bbdca - home-manager: cleanup&amp;rename configuration</li><li>1682235c - home-manager: cleanup&amp;rename configuration</li><li>ff4fcb37 - nix/{os,home-manager}: cleanup</li><li>eac516a6 - home/qtile: make volume keys work on multiple sinks</li><li>e686ab24 - home/qtile: use external mute state and act on all sinks</li><li>75f433ef - Justfile: move rebuild functionality into rebuild</li><li>7e062c0e - home/qtile-desktop: add pavucontrol</li><li>bc70e93f - Update roadmap</li><li>29d12f92 - home/qtile: store tmpfiles in $TEMPDIR</li><li>e15b6165 - shell: add emergency tools</li><li>e9a44629 - home/qtile: handle missing TEMPDIR</li><li>6ebae697 - home/common: add git helpers</li><li>c1ef156c - Justfile/hm-iterate-qtile: fallback to building system</li><li>cfb401d5 - nix/home: fix typo</li><li>1e427f2b - nix/home: handle dotfiles via vcsh</li><li>e2515fd4 - readd pws</li><li>3395857c - dotfiles/vcsh: populate nix store with dotfiles mirror</li><li>aec750e4 - nix/os: more work on partition handling</li><li>703cc326 - nix/os: fix /bin activation and some cleanup</li><li>492b31e8 - nix/os/devices: add steveej-t480s-work</li><li>483d981e - nix/os: tidy up hw/boot handling</li><li>54a0b898 - steveej-t480-work: add NVMe support and user packages</li><li>53f2580b - README: add bugs</li><li>7234c0a5 - nix: bump just and add to common profile</li><li>4dc5b17b - nix/home: use zathura from stable</li></ul> [Compare with previous version](https://gitlab.com/steveeJ/infra/merge_requests/6/diffs?diff_id=27032767&start_sha=0bb69aad5746cf1a6aab6abf5b3856a768a01be7)
steveej commented 2018-11-10 11:04:51 +00:00 (Migrated from gitlab.com)
Copy link

added 32 commits

  • 4dc5b17b...009d66bc - 2 commits from branch master
  • 0e2f704a - add envrc and shell.nix with 'just' pkg
  • 239c2c9c - nix config udpate; polish top-level Justfile
  • dd4cd9aa - nix: add channel configuration and rework update process
  • b53ad263 - home/qtile: add volume keys and ease testing
  • a208015c - Update roadmap
  • eced1a3b - home-manager: cleanup&rename configuration
  • f476755a - home-manager: cleanup&rename configuration
  • 3316605d - nix/{os,home-manager}: cleanup
  • a852067f - home/qtile: make volume keys work on multiple sinks
  • 9d986281 - home/qtile: use external mute state and act on all sinks
  • 220685dd - Justfile: move rebuild functionality into rebuild
  • 952417f6 - home/qtile-desktop: add pavucontrol
  • c98002b7 - Update roadmap
  • 52695c61 - home/qtile: store tmpfiles in $TEMPDIR
  • 726e32d4 - shell: add emergency tools
  • fa8eab4b - home/qtile: handle missing TEMPDIR
  • 7572248b - home/common: add git helpers
  • c996484c - Justfile/hm-iterate-qtile: fallback to building system
  • 48b35e16 - nix/home: fix typo
  • 4081bc63 - nix/home: handle dotfiles via vcsh
  • a71fe67e - readd pws
  • e7f6744b - dotfiles/vcsh: populate nix store with dotfiles mirror
  • f94d3493 - nix/os: more work on partition handling
  • 4ded9d0d - nix/os: fix /bin activation and some cleanup
  • 40fd476f - nix/os/devices: add steveej-t480s-work
  • 8baa3cf4 - nix/os: tidy up hw/boot handling
  • ed6aac61 - steveej-t480-work: add NVMe support and user packages
  • b3d3c8b0 - README: add bugs
  • ef8d63c8 - nix: bump just and add to common profile
  • 8e2f936a - nix/home: use zathura from stable

Compare with previous version

added 32 commits <ul><li>4dc5b17b...009d66bc - 2 commits from branch <code>master</code></li><li>0e2f704a - add envrc and shell.nix with &#39;just&#39; pkg</li><li>239c2c9c - nix config udpate; polish top-level Justfile</li><li>dd4cd9aa - nix: add channel configuration and rework update process</li><li>b53ad263 - home/qtile: add volume keys and ease testing</li><li>a208015c - Update roadmap</li><li>eced1a3b - home-manager: cleanup&amp;rename configuration</li><li>f476755a - home-manager: cleanup&amp;rename configuration</li><li>3316605d - nix/{os,home-manager}: cleanup</li><li>a852067f - home/qtile: make volume keys work on multiple sinks</li><li>9d986281 - home/qtile: use external mute state and act on all sinks</li><li>220685dd - Justfile: move rebuild functionality into rebuild</li><li>952417f6 - home/qtile-desktop: add pavucontrol</li><li>c98002b7 - Update roadmap</li><li>52695c61 - home/qtile: store tmpfiles in $TEMPDIR</li><li>726e32d4 - shell: add emergency tools</li><li>fa8eab4b - home/qtile: handle missing TEMPDIR</li><li>7572248b - home/common: add git helpers</li><li>c996484c - Justfile/hm-iterate-qtile: fallback to building system</li><li>48b35e16 - nix/home: fix typo</li><li>4081bc63 - nix/home: handle dotfiles via vcsh</li><li>a71fe67e - readd pws</li><li>e7f6744b - dotfiles/vcsh: populate nix store with dotfiles mirror</li><li>f94d3493 - nix/os: more work on partition handling</li><li>4ded9d0d - nix/os: fix /bin activation and some cleanup</li><li>40fd476f - nix/os/devices: add steveej-t480s-work</li><li>8baa3cf4 - nix/os: tidy up hw/boot handling</li><li>ed6aac61 - steveej-t480-work: add NVMe support and user packages</li><li>b3d3c8b0 - README: add bugs</li><li>ef8d63c8 - nix: bump just and add to common profile</li><li>8e2f936a - nix/home: use zathura from stable</li></ul> [Compare with previous version](https://gitlab.com/steveeJ/infra/merge_requests/6/diffs?diff_id=27032880&start_sha=4dc5b17b21862bc927965303d41c0276cdd9d880)
steveej commented 2018-11-10 11:10:55 +00:00 (Migrated from gitlab.com)
Copy link

merged

merged
steveej commented 2018-11-10 11:10:55 +00:00 (Migrated from gitlab.com)
Copy link

mentioned in commit 097d8dfd35

mentioned in commit 097d8dfd350280ae7991ccfcf325025a1d65c7e4
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
confirmed

   
critical

   
discussion

   
documentation

   
enhancement

   
suggestion

   
support
No labels
bug
confirmed
critical
discussion
documentation
enhancement
suggestion
support
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: steveej/infra#12
No description provided.
Delete branch "staging"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?