Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase Packaging/nix #77

Merged
merged 28 commits into from
Aug 25, 2024
Merged

Rebase Packaging/nix #77

merged 28 commits into from
Aug 25, 2024

Conversation

Svenum
Copy link
Contributor

@Svenum Svenum commented Aug 24, 2024

I hope I have everything done right. Its my first time rebasing a branch 😅

leopoldhub and others added 18 commits June 1, 2024 19:37
@leopoldhub
Adding @Svenum as an assignee to nix-related issues (TamtamHero#43)
9b9e9c7
@leopoldhub
Fixing adding @Svenum as an assignee to nix-related issues (TamtamHer…
a8755fe 
…o#44)

(non contributors cannot be assigned to issues)
@NAKlama
Reload will report if config couldn't be parsed and the service keeps…
1bc4f60 
… running. (TamtamHero#46)

Authored-by: Nina Alexandra Klama <[email protected]>
@leopoldhub
Removing binary blobs from the project (TamtamHero#51)
d6e6186 
* removing binary blobs from the project.
we now fetch the ectool from the gitlab artifacts and confirm the checksum.

* remove bin references from README.md

* extracting $TEMP_FOLDER from installEctool
@DeflateAwning
Fix README spelling/grammer, fix "FrameWork" capitalization in servic…
6fa5e64 
…e description (TamtamHero#52)

* Review README spelling/grammar

* Fix "FrameWork" capitalization in service
@leopoldhub
Clarify behaviour on service stop or pause (TamtamHero#53) (TamtamHer…
dc6558e 
…o#55)
@leopoldhub
Separating FanController into different subclasses to allow HardwareC…
d4b45c6 
…ontroller and SocketController diversity. 2 (Repost of TamtamHero#50) (TamtamHero#58)

* separating `FanController` into different subclasses to allow `HardwareController` and `SocketController` diversity

* adding the new arguments into the README.md

* fixing an indentation error causing `--strategy <strategy>` not to work (the simple `<strategy>` still worked)
@leopoldhub
fixing missing print for command execution (TamtamHero#63)
fcc85b2
@leopoldhub
forcing utf-8 encoding for socket messages and usage of stopServerSoc…
c9a57de 
…ket method instead of manual closing, as well as updating error detection pattern (TamtamHero#64)
@leopoldhub
README.md documentation update (TamtamHero#65)
2ef31c1 
* forcing utf-8 encoding for socket messages and usage of stopServerSocket method instead of manual closing, as well as updating error detection pattern

* README.md documentation update

* change log format on fatal crash

* fix badges links

* adding windows platform badge and issue template

* fix `:` instead of `=`

* disabling part of the README.md while waiting for merge
@leopoldhub
Command arguments refactoring Pt.1 (TamtamHero#66)
871566f 
* forcing utf-8 encoding for socket messages and usage of stopServerSocket method instead of manual closing, as well as updating error detection pattern

* README.md documentation update

* change log format on fatal crash

* fix badges links

* adding windows platform badge and issue template

* fix `:` instead of `=`

* first part of the command argument refactoring.

the old argument format is deprecated but still usable.

improved feedback when executing commands.

TamtamHero#31

* trim blank lines in README.md
@leopoldhub
finishing touches (TamtamHero#67)
b4f87b6
@saizo80
add no battery mode for mainboards without battery (TamtamHero#69)
80a239d 
* add configuration for no battery mode in hardware controller

* fix wrong line getting noBatteryMode

* dynamically fetching battery sensor on init/reload

* add --no-battery flag for install

* update readme with --no-battery flag

* rework no battery config to come from service args

* change sensors to be ectool specific

- reword the argument to be more clear about battery sensors
- move `noBatteryMode` and `nonBatterySensors` to EctoolHardwareController
- update `getNonBatterySensors` to be able to handle more than one sensor
- update installer and readme accordingly

* update grep command for checking existing `--no-battery-sensors`

* combine getTemperature functions to one

* add documentation for run option `--no-battery-sensors`

* rename variable `NO_BATTERY` to `NO_BATTERY_SENSOR`

* update the installer to use existing placeholder format

* rename noBatterySensorMode variables and functions for clarity

* rename placeholder to `NO_BATTERY_SENSOR_OPTION` for clarity

* update comments in installer to reflect new argument name
@leopoldhub
adding ectool sub-dependency to documentation (TamtamHero#70)
cc65f26
@leopoldhub
typo "tempurature" => "temperature" (TamtamHero#71)
88590e3 
typo "tempurature" => "temperature"
@leopoldhub
typo "tempurature" => "temperature" (TamtamHero#72)
6d2d3de 
typo "tempurature" => "temperature"
@Svenum
Add ToC + link to NixOS Documentation (TamtamHero#75)
ec9a9ae 
* add doc folder

* update nix link

* add toc

* add link

* add missin #

* add doc

* fix link

* add new line under titles
@Svenum
add --no-sudo option (TamtamHero#76)
fe98b44
@Svenum Svenum changed the base branch from main to packaging/nix August 24, 2024 13:56
leopoldhub
leopoldhub reviewed Aug 24, 2024
View reviewed changes
pre-uninstall.sh Outdated Show resolved Hide resolved
leopoldhub
leopoldhub reviewed Aug 24, 2024
View reviewed changes
fanctrl.py Show resolved Hide resolved
leopoldhub
leopoldhub reviewed Aug 24, 2024
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
@leopoldhub
Copy link
Collaborator

Hi,

Except for the small mistakes I pointed out, everything seems fine to me.

If you want to easily see what has changed, you can do a diff between the main branch, the already merged nix branch and yours.

Thanks for your work,
have a nice day.

@Speenah
Add choice to print fan speed percentage (TamtamHero#78)
4a8a3a0 
* Add option to print current speed percentage

* Update README.md

* Update commands.md

* Add print choice descriptions to help text
@Svenum
Copy link
Contributor Author

Svenum commented Aug 25, 2024

If #79 is merged I will rebase again to add the new features, and then should the PR ready to merge. 💪

@leopoldhub
Copy link
Collaborator

Hi, #79 is merged, after the rebase, everything should be good.

Svenum and others added 3 commits August 26, 2024 00:13
@Svenum @thomaseizinger
Add NixOS Flake (TamtamHero#26)
8446f9d 
* initial

* update gitignore

* update inputs

* add fw-ectool dependencie

* add module

* fix tabs

* fix package

* fix typo

* fix service

* fix type

* add options

* fix service

* fix build inputs

* add Readme + add suspend script

* remove unneeded };

* fix pkgs.writeShellScript

* remvoe \

* try

* add self

* fix module

* update package

* fix package

* use sleep script

* add config options

* fix typo

* fix typo

* add defaults

* fix type

* add prettyier

* remove beautifyer

* udpate readme

* update installer script

* add missing path

* Update README.md

Co-authored-by: Thomas Eizinger <[email protected]>

* Update flake.nix

Co-authored-by: Thomas Eizinger <[email protected]>

* Update nix/module.nix

Co-authored-by: Thomas Eizinger <[email protected]>

* add descriptions

* fix uninstall

* update readme

* add description

* remove requiremetns.txt + add github actions

* update action

* rename workflow test

* fix service

* try

* try

* Update README.md

* Update README.md

* chagne flake description

* fix suspend script

* fix script

* fix path

* fix install.sh

* fix --no-sudo

* add --no-sudo to other scripts

* fix check

* add option check

* add missing "

* Rename nix action

---------

Co-authored-by: Thomas Eizinger <[email protected]>
@Svenum @leopoldhub
@NAKlama @DeflateAwning
Update branch to main branch (TamtamHero#54)
40f7b68 
* Adding @Svenum as an assignee to nix-related issues (TamtamHero#43)

* Fixing adding @Svenum as an assignee to nix-related issues (TamtamHero#44)

(non contributors cannot be assigned to issues)

* Reload will report if config couldn't be parsed and the service keeps running. (TamtamHero#46)

Authored-by: Nina Alexandra Klama <[email protected]>

* Removing binary blobs from the project (TamtamHero#51)

* removing binary blobs from the project.
we now fetch the ectool from the gitlab artifacts and confirm the checksum.

* remove bin references from README.md

* extracting $TEMP_FOLDER from installEctool

* Fix README spelling/grammer, fix "FrameWork" capitalization in service description (TamtamHero#52)

* Review README spelling/grammar

* Fix "FrameWork" capitalization in service

* use ectool form nixpkgs

* update flake

* remove old deps

* remove duplicated pkgs

---------

Co-authored-by: Léopold Hubert <[email protected]>
Co-authored-by: Nina Alexandra Klama <[email protected]>
Co-authored-by: DeflateAwning <[email protected]>
@Svenum @leopoldhub
@NAKlama @DeflateAwning
Update to main branch + switch to fw-ectool (TamtamHero#61)
56b86fa 
* Adding @Svenum as an assignee to nix-related issues (TamtamHero#43)

* Fixing adding @Svenum as an assignee to nix-related issues (TamtamHero#44)

(non contributors cannot be assigned to issues)

* Reload will report if config couldn't be parsed and the service keeps running. (TamtamHero#46)

Authored-by: Nina Alexandra Klama <[email protected]>

* Removing binary blobs from the project (TamtamHero#51)

* removing binary blobs from the project.
we now fetch the ectool from the gitlab artifacts and confirm the checksum.

* remove bin references from README.md

* extracting $TEMP_FOLDER from installEctool

* Fix README spelling/grammer, fix "FrameWork" capitalization in service description (TamtamHero#52)

* Review README spelling/grammar

* Fix "FrameWork" capitalization in service

* Clarify behaviour on service stop or pause (TamtamHero#53) (TamtamHero#55)

* Separating FanController into different subclasses to allow HardwareController and SocketController diversity. 2 (Repost of TamtamHero#50) (TamtamHero#58)

* separating `FanController` into different subclasses to allow `HardwareController` and `SocketController` diversity

* adding the new arguments into the README.md

* fixing an indentation error causing `--strategy <strategy>` not to work (the simple `<strategy>` still worked)

* add fw-ectool in module

* fixing missing print for command execution (TamtamHero#63)

---------

Co-authored-by: Léopold Hubert <[email protected]>
Co-authored-by: Nina Alexandra Klama <[email protected]>
Co-authored-by: DeflateAwning <[email protected]>
Svenum and others added 4 commits August 26, 2024 00:13
@Svenum
add doc + .gitignore
a3685fd
@Svenum @thomaseizinger
Add NixOS Flake (TamtamHero#26)
c2245bb 
* initial

* update gitignore

* update inputs

* add fw-ectool dependencie

* add module

* fix tabs

* fix package

* fix typo

* fix service

* fix type

* add options

* fix service

* fix build inputs

* add Readme + add suspend script

* remove unneeded };

* fix pkgs.writeShellScript

* remvoe \

* try

* add self

* fix module

* update package

* fix package

* use sleep script

* add config options

* fix typo

* fix typo

* add defaults

* fix type

* add prettyier

* remove beautifyer

* udpate readme

* update installer script

* add missing path

* Update README.md

Co-authored-by: Thomas Eizinger <[email protected]>

* Update flake.nix

Co-authored-by: Thomas Eizinger <[email protected]>

* Update nix/module.nix

Co-authored-by: Thomas Eizinger <[email protected]>

* add descriptions

* fix uninstall

* update readme

* add description

* remove requiremetns.txt + add github actions

* update action

* rename workflow test

* fix service

* try

* try

* Update README.md

* Update README.md

* chagne flake description

* fix suspend script

* fix script

* fix path

* fix install.sh

* fix --no-sudo

* add --no-sudo to other scripts

* fix check

* add option check

* add missing "

* Rename nix action

---------

Co-authored-by: Thomas Eizinger <[email protected]>
@Svenum @leopoldhub
@NAKlama @DeflateAwning
Update branch to main branch (TamtamHero#54)
a3526c0 
* Adding @Svenum as an assignee to nix-related issues (TamtamHero#43)

* Fixing adding @Svenum as an assignee to nix-related issues (TamtamHero#44)

(non contributors cannot be assigned to issues)

* Reload will report if config couldn't be parsed and the service keeps running. (TamtamHero#46)

Authored-by: Nina Alexandra Klama <[email protected]>

* Removing binary blobs from the project (TamtamHero#51)

* removing binary blobs from the project.
we now fetch the ectool from the gitlab artifacts and confirm the checksum.

* remove bin references from README.md

* extracting $TEMP_FOLDER from installEctool

* Fix README spelling/grammer, fix "FrameWork" capitalization in service description (TamtamHero#52)

* Review README spelling/grammar

* Fix "FrameWork" capitalization in service

* use ectool form nixpkgs

* update flake

* remove old deps

* remove duplicated pkgs

---------

Co-authored-by: Léopold Hubert <[email protected]>
Co-authored-by: Nina Alexandra Klama <[email protected]>
Co-authored-by: DeflateAwning <[email protected]>
@Svenum @leopoldhub
@NAKlama @DeflateAwning
Update to main branch + switch to fw-ectool (TamtamHero#61)
1f2ccb7 
* Adding @Svenum as an assignee to nix-related issues (TamtamHero#43)

* Fixing adding @Svenum as an assignee to nix-related issues (TamtamHero#44)

(non contributors cannot be assigned to issues)

* Reload will report if config couldn't be parsed and the service keeps running. (TamtamHero#46)

Authored-by: Nina Alexandra Klama <[email protected]>

* Removing binary blobs from the project (TamtamHero#51)

* removing binary blobs from the project.
we now fetch the ectool from the gitlab artifacts and confirm the checksum.

* remove bin references from README.md

* extracting $TEMP_FOLDER from installEctool

* Fix README spelling/grammer, fix "FrameWork" capitalization in service description (TamtamHero#52)

* Review README spelling/grammar

* Fix "FrameWork" capitalization in service

* Clarify behaviour on service stop or pause (TamtamHero#53) (TamtamHero#55)

* Separating FanController into different subclasses to allow HardwareController and SocketController diversity. 2 (Repost of TamtamHero#50) (TamtamHero#58)

* separating `FanController` into different subclasses to allow `HardwareController` and `SocketController` diversity

* adding the new arguments into the README.md

* fixing an indentation error causing `--strategy <strategy>` not to work (the simple `<strategy>` still worked)

* add fw-ectool in module

* fixing missing print for command execution (TamtamHero#63)

---------

Co-authored-by: Léopold Hubert <[email protected]>
Co-authored-by: Nina Alexandra Klama <[email protected]>
Co-authored-by: DeflateAwning <[email protected]>
@Svenum
Copy link
Contributor Author

Svenum commented Aug 25, 2024

@leopoldhub please recheck. 😄

@Svenum Svenum requested a review from leopoldhub August 25, 2024 22:25
leopoldhub
leopoldhub approved these changes Aug 25, 2024
View reviewed changes
Copy link
Collaborator

@leopoldhub leopoldhub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except for nix related stuff, everything is the same as the main branch.

Good work!

Since I cannot test the nix files, please do a final check on them and we are ready to merge!

@Svenum
Copy link
Contributor Author

Svenum commented Aug 25, 2024

The nix side seems fine. 👍

@leopoldhub leopoldhub merged commit c5ec1c0 into TamtamHero:packaging/nix Aug 25, 2024
1 check passed
@leopoldhub
Copy link
Collaborator

Here goes the merge! 🎉

Thank you as always for you time and contribution! 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leopoldhub leopoldhub leopoldhub approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Svenum @leopoldhub @dracid @TamtamHero @NAKlama @DeflateAwning @saizo80 @Speenah