swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: change fw-fanctrl to upstream module
Some checks failed
Flake check / Check flake (push) Has been cancelled
Details

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-09-26 08:50:06 +02:00
parent 355cf03bd1
commit a896d5eb5d
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
3 changed files with 2382 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

19
SwarselSystems.org
View file

@ -451,11 +451,12 @@ A short overview over each input and what it does:
zjstatus = { zjstatus = {
url = "github:dj95/zjstatus"; url = "github:dj95/zjstatus";
}; };
fw-fanctrl = { # has been upstreamed
# url = "github:TamtamHero/fw-fanctrl/packaging/nix"; # fw-fanctrl = {
url = "github:Swarsel/fw-fanctrl/packaging/nix"; # # url = "github:TamtamHero/fw-fanctrl/packaging/nix";
inputs.nixpkgs.follows = "nixpkgs"; # url = "github:Swarsel/fw-fanctrl/packaging/nix";
}; # inputs.nixpkgs.follows = "nixpkgs";
# };
nix-darwin = { nix-darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -10414,9 +10415,9 @@ This holds configuration that is specific to framework laptops.
#+begin_src nix-ts :tangle modules/nixos/optional/framework.nix #+begin_src nix-ts :tangle modules/nixos/optional/framework.nix
{ lib, config, inputs, ... }: { lib, config, inputs, ... }:
{ {
imports = [ # imports = [
inputs.fw-fanctrl.nixosModules.default # inputs.fw-fanctrl.nixosModules.default
]; # ];
options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings"; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
config = lib.mkIf config.swarselmodules.optional.framework { config = lib.mkIf config.swarselmodules.optional.framework {
services = { services = {
@ -10434,7 +10435,7 @@ This holds configuration that is specific to framework laptops.
ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
''; '';
}; };
programs.fw-fanctrl = { hardware.fw-fanctrl = {
enable = true; enable = true;
config = { config = {
defaultStrategy = "lazy"; defaultStrategy = "lazy";

2700
flake.lock generated
View file

File diff suppressed because it is too large Load diff

39
index.html
View file

@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head> <head>
<!-- 2025-09-24 Mi 13:09 --> <!-- 2025-09-26 Fr 08:49 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>SwarselSystems: NixOS + Emacs Configurationo</title> <title>SwarselSystems: NixOS + Emacs Configurationo</title>
@ -564,7 +564,7 @@
<li><a href="#h:c3362d4e-d3a8-43e8-9ef7-272b6de0572e">3.5.31. swarsel-build</a></li> <li><a href="#h:c3362d4e-d3a8-43e8-9ef7-272b6de0572e">3.5.31. swarsel-build</a></li>
<li><a href="#h:95ebfd13-1f6b-427f-950d-e30c1ed6f9fa">3.5.32. swarsel-instantiate</a></li> <li><a href="#h:95ebfd13-1f6b-427f-950d-e30c1ed6f9fa">3.5.32. swarsel-instantiate</a></li>
<li><a href="#h:02842543-caca-4d4c-a4d2-7ac749b5c136">3.5.33. sshrm</a></li> <li><a href="#h:02842543-caca-4d4c-a4d2-7ac749b5c136">3.5.33. sshrm</a></li>
<li><a href="#org2868447">3.5.34. endme</a></li> <li><a href="#org28ae36a">3.5.34. endme</a></li>
</ul> </ul>
</li> </li>
<li><a href="#h:f0f1c961-3e7a-47b8-99ab-1654bb45dffc">3.6. Profiles</a> <li><a href="#h:f0f1c961-3e7a-47b8-99ab-1654bb45dffc">3.6. Profiles</a>
@ -573,7 +573,7 @@
<ul> <ul>
<li><a href="#h:32d654de-8db2-403a-9a27-4c46d7b9172d">3.6.1.1. Personal</a></li> <li><a href="#h:32d654de-8db2-403a-9a27-4c46d7b9172d">3.6.1.1. Personal</a></li>
<li><a href="#h:b926f0c8-7968-4079-924c-a5d0ae4d3a45">3.6.1.2. Minimal</a></li> <li><a href="#h:b926f0c8-7968-4079-924c-a5d0ae4d3a45">3.6.1.2. Minimal</a></li>
<li><a href="#orgf7d1832">3.6.1.3. Optionals</a></li> <li><a href="#org696836b">3.6.1.3. Optionals</a></li>
<li><a href="#h:b79fbb59-9cf2-48eb-b469-2589223dda95">3.6.1.4. Chaostheatre</a></li> <li><a href="#h:b79fbb59-9cf2-48eb-b469-2589223dda95">3.6.1.4. Chaostheatre</a></li>
<li><a href="#h:cb3631a8-9c1b-42f2-ab01-502c7b4c273d">3.6.1.5. Work</a></li> <li><a href="#h:cb3631a8-9c1b-42f2-ab01-502c7b4c273d">3.6.1.5. Work</a></li>
<li><a href="#h:87a83b10-3c2f-407c-89aa-922ad77748a4">3.6.1.6. Uni</a></li> <li><a href="#h:87a83b10-3c2f-407c-89aa-922ad77748a4">3.6.1.6. Uni</a></li>
@ -816,7 +816,7 @@
</div> </div>
</div> </div>
<p> <p>
<b>This file has 93276 words spanning 23799 lines and was last revised on 2025-09-24 13:09:38 +0200.</b> <b>This file has 93279 words spanning 23800 lines and was last revised on 2025-09-26 08:49:32 +0200.</b>
</p> </p>
<p> <p>
@ -885,7 +885,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry
</p> </p>
<p> <p>
My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-09-24 13:09:38 +0200) My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-09-26 08:49:32 +0200)
</p></li> </p></li>
</ul> </ul>
@ -1371,11 +1371,12 @@ This provides devshell support for flake-parts</li>
zjstatus = { zjstatus = {
url = "github:dj95/zjstatus"; url = "github:dj95/zjstatus";
}; };
fw-fanctrl = { # has been upstreamed
# url = "github:TamtamHero/fw-fanctrl/packaging/nix"; # fw-fanctrl = {
url = "github:Swarsel/fw-fanctrl/packaging/nix"; # # url = "github:TamtamHero/fw-fanctrl/packaging/nix";
inputs.nixpkgs.follows = "nixpkgs"; # url = "github:Swarsel/fw-fanctrl/packaging/nix";
}; # inputs.nixpkgs.follows = "nixpkgs";
# };
nix-darwin = { nix-darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -11707,9 +11708,9 @@ This holds configuration that is specific to framework laptops.
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-nix-ts">{ lib, config, inputs, ... }: <pre class="src src-nix-ts">{ lib, config, inputs, ... }:
{ {
imports = [ # imports = [
inputs.fw-fanctrl.nixosModules.default # inputs.fw-fanctrl.nixosModules.default
]; # ];
options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings"; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
config = lib.mkIf config.swarselmodules.optional.framework { config = lib.mkIf config.swarselmodules.optional.framework {
services = { services = {
@ -11727,7 +11728,7 @@ This holds configuration that is specific to framework laptops.
ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
''; '';
}; };
programs.fw-fanctrl = { hardware.fw-fanctrl = {
enable = true; enable = true;
config = { config = {
defaultStrategy = "lazy"; defaultStrategy = "lazy";
@ -18651,8 +18652,8 @@ writeShellApplication {
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-org2868447" class="outline-4"> <div id="outline-container-org28ae36a" class="outline-4">
<h4 id="org2868447"><span class="section-number-4">3.5.34.</span> endme</h4> <h4 id="org28ae36a"><span class="section-number-4">3.5.34.</span> endme</h4>
<div class="outline-text-4" id="text-3-5-34"> <div class="outline-text-4" id="text-3-5-34">
<p> <p>
Sometimes my DE crashes after putting it to suspend - to be precise, it happens when I put it into suspend when I have multiple screens plugged in. I have never taken the time to debug the issue, but instead just switch to a different TTY and then use this script to kill the hanging session. Sometimes my DE crashes after putting it to suspend - to be precise, it happens when I put it into suspend when I have multiple screens plugged in. I have never taken the time to debug the issue, but instead just switch to a different TTY and then use this script to kill the hanging session.
@ -18812,8 +18813,8 @@ in
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-orgf7d1832" class="outline-5"> <div id="outline-container-org696836b" class="outline-5">
<h5 id="orgf7d1832"><span class="section-number-5">3.6.1.3.</span> Optionals</h5> <h5 id="org696836b"><span class="section-number-5">3.6.1.3.</span> Optionals</h5>
<div class="outline-text-5" id="text-3-6-1-3"> <div class="outline-text-5" id="text-3-6-1-3">
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-nix-ts">{ lib, config, ... }: <pre class="src src-nix-ts">{ lib, config, ... }:
@ -25865,7 +25866,7 @@ similarly, there exists an version that starts from the right.
</div> </div>
<div id="postamble" class="status"> <div id="postamble" class="status">
<p class="author">Author: Leon Schwarzäugl</p> <p class="author">Author: Leon Schwarzäugl</p>
<p class="date">Created: 2025-09-24 Mi 13:09</p> <p class="date">Created: 2025-09-26 Fr 08:49</p>
<p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p> <p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p>
</div> </div>
</body> </body>