From 3e3d25a279c7ba344d893a698b5e111f1e67aa09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Wed, 12 Mar 2025 10:01:55 +0100 Subject: [PATCH] feat: update flake --- SwarselSystems.org | 53 ++++--- flake.lock | 230 +++++++++++++++-------------- flake.nix | 2 +- hosts/nixos/nbl-imba-2/default.nix | 21 ++- profiles/home/common/emacs.nix | 2 +- programs/emacs/init.el | 28 ++-- 6 files changed, 189 insertions(+), 147 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index d514b3f..a08ac17 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -234,7 +234,7 @@ When setting this option normally, the password would normally be written world- #+begin_src nix :tangle no :noweb-ref flakeinputs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?rev=5f385baff93c728400d2c4ec8c9b0745b8f9e5b6"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default-linux"; home-manager = { @@ -861,7 +861,26 @@ My work machine. Built for more security, this is the gold standard of my config }; }; - programs.fw-fanctrl.enable = true; + programs.fw-fanctrl = { + enable = true; + config = { + defaultStrategy = "lazy"; + strategies = { + "lazy" = { + fanSpeedUpdateFrequency = 5; + movingAverageInterval = 30; + speedCurve = [ + { temp = 0; speed = 15; } + { temp = 50; speed = 15; } + { temp = 65; speed = 25; } + { temp = 70; speed = 35; } + { temp = 75; speed = 50; } + { temp = 85; speed = 100; } + ]; + }; + }; + }; + }; networking = { hostName = "nbl-imba-2"; @@ -9770,7 +9789,7 @@ Lastly, I am defining some more packages here that the parser has problems findi enable = true; package = pkgs.emacsWithPackagesFromUsePackage { config = self + /programs/emacs/init.el; - package = pkgs.emacs-pgtk; + package = pkgs.emacs-git-pgtk; alwaysEnsure = true; alwaysTangle = true; extraEmacsPackages = epkgs: [ @@ -13709,18 +13728,18 @@ This sets up rustic-mode with tree-sitter support - there is still one issue to #+begin_src emacs-lisp - (use-package rustic - :init - (setq rust-mode-treesitter-derive t) - :config - (define-key rust-ts-mode-map (kbd "C-c C-c C-r") 'rustic-cargo-run) - (define-key rust-ts-mode-map (kbd "C-c C-c C-b") 'rustic-cargo-build) - (define-key rust-ts-mode-map (kbd "C-c C-c C-k") 'rustic-cargo-check) - (define-key rust-ts-mode-map (kbd "C-c C-c d") 'rustic-cargo-doc) - (define-key rust-ts-mode-map (kbd "C-c C-c a") 'rustic-cargo-add) - (setq rustic-format-on-save t) - (setq rustic-lsp-client 'eglot) - :mode ("\\.rs" . rustic-mode)) + ;;(use-package rustic + ;; :init + ;; (setq rust-mode-treesitter-derive t) + ;; :config + ;; (define-key rust-ts-mode-map (kbd "C-c C-c C-r") 'rustic-cargo-run) + ;; (define-key rust-ts-mode-map (kbd "C-c C-c C-b") 'rustic-cargo-build) + ;; (define-key rust-ts-mode-map (kbd "C-c C-c C-k") 'rustic-cargo-check) + ;; (define-key rust-ts-mode-map (kbd "C-c C-c d") 'rustic-cargo-doc) + ;; (define-key rust-ts-mode-map (kbd "C-c C-c a") 'rustic-cargo-add) + ;; (setq rustic-format-on-save t) + ;; (setq rustic-lsp-client 'eglot) + ;; :mode ("\\.rs" . rustic-mode)) #+end_src @@ -13832,8 +13851,8 @@ A blocking issue can still occur while entering a direnv that has a longer evalu c++-ts-mode go-mode go-ts-mode - rust-ts-mode - rustic-mode + ;;rust-ts-mode + ;;rustic-mode tex-mode LaTeX-mode ) . (lambda () (progn diff --git a/flake.lock b/flake.lock index e65ae7a..abef9fc 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1741148495, + "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1741684000, + "narHash": "sha256-NQykaWIrn5zilncefIvW4jPQ76YMXVK/dMTzkSVDmdk=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "2db1d64fc084b1d15e3871dffc02c62a94ed6ed7", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740302110, - "narHash": "sha256-rQY2wY+KTGIH2oZFyqdsODjqmOJqyn+0BNURADQHi/s=", + "lastModified": 1741710368, + "narHash": "sha256-P9Qt8QQC6cFssiIvNEmj8BabRZS7EWMqCrA3oNj70x4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "920cd4e86af18bd67a60013d80a79ff2cd7a176b", + "rev": "2695d53827b4200a195f932a5beb47fe5f9e3213", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -446,11 +446,11 @@ ] }, "locked": { - "lastModified": 1738441377, - "narHash": "sha256-5+CDb9ed+nV81aPPPuco1shoIPGolzfFEhaKDbYA4js=", + "lastModified": 1741730296, + "narHash": "sha256-WR983BGc2wSc8ks8C2Tq/eevkRJ9oiYnBQ6ykgoXtms=", "owner": "TamtamHero", "repo": "fw-fanctrl", - "rev": "c7943533476994ab43fcf54496490cba20320131", + "rev": "c80945681dabb6bc57bc3e113e850294582d6d38", "type": "github" }, "original": { @@ -473,11 +473,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -597,11 +597,11 @@ ] }, "locked": { - "lastModified": 1740318342, - "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", + "lastModified": 1741701235, + "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", + "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", "type": "github" }, "original": { @@ -639,11 +639,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -677,11 +677,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739186342, - "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", + "lastModified": 1741442524, + "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", + "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", "type": "github" }, "original": { @@ -717,11 +717,11 @@ ] }, "locked": { - "lastModified": 1739933872, - "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", + "lastModified": 1741229100, + "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", + "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", "type": "github" }, "original": { @@ -781,11 +781,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1741619381, + "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", "type": "github" }, "original": { @@ -901,11 +901,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -916,11 +916,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1741325094, + "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "type": "github" }, "original": { @@ -932,11 +932,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731919951, - "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", + "lastModified": 1741241576, + "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", + "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee", "type": "github" }, "original": { @@ -992,11 +992,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -1008,27 +1008,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1740339700, - "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -1103,17 +1087,17 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741680361, + "narHash": "sha256-SxKcbEuuLHlEc0GBO776DX+Zvi1ESe6avChu3uoA32w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "5f385baff93c728400d2c4ec8c9b0745b8f9e5b6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "5f385baff93c728400d2c4ec8c9b0745b8f9e5b6", "type": "github" } }, @@ -1135,11 +1119,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -1167,11 +1151,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -1261,11 +1245,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740324936, - "narHash": "sha256-kzhWrl9IU6ZJDbjrjpUGklLlitLUwOWsYTdkDSmAZZs=", + "lastModified": 1741723036, + "narHash": "sha256-L9tVnZpa6Cb0DgSStIbV5QPRAQ8F94UvKcfiQ1ZZSAA=", "owner": "nix-community", "repo": "NUR", - "rev": "c459157201e0a37dbf123256065be3f9a06508b0", + "rev": "20ff961c7fbaf9ecb7a808c0e27bb0984d93f74f", "type": "github" }, "original": { @@ -1284,11 +1268,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740408283, - "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", "owner": "nix-community", "repo": "NUR", - "rev": "496a4a11162bdffb9a7b258942de138873f019f7", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", "type": "github" }, "original": { @@ -1334,15 +1318,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -1360,11 +1343,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1391,10 +1374,11 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_2", "nswitch-rcm-nix": "nswitch-rcm-nix", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks_2", + "scenefx": "scenefx", "sops-nix": "sops-nix", "stylix": "stylix", "systems": "systems_3", @@ -1409,11 +1393,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1741228283, + "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "type": "github" }, "original": { @@ -1443,6 +1427,26 @@ "type": "github" } }, + "scenefx": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740440098, + "narHash": "sha256-kcK57JKbQ+tr0W10ipe2yGvWa9nJD+mLCMo3w2sp8AQ=", + "owner": "wlrfx", + "repo": "scenefx", + "rev": "1775286a04a3c60d6b15221693586ac8174a0b88", + "type": "github" + }, + "original": { + "owner": "wlrfx", + "repo": "scenefx", + "type": "github" + } + }, "scss-reset": { "flake": false, "locked": { @@ -1464,11 +1468,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741644481, + "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "e653d71e82575a43fe9d228def8eddb73887b866", "type": "github" }, "original": { @@ -1499,11 +1503,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740520441, - "narHash": "sha256-CWK3L7i7YqubbcrdS/5D/+Vo+IuClrNR+5B+ByhBlEo=", + "lastModified": 1741706258, + "narHash": "sha256-Frn1vjiJlyzI9QcosZNWDrgKQjoCbsNAkCrLw2pUYZ4=", "owner": "danth", "repo": "stylix", - "rev": "a98c363a58accad047a2580382d90433619a08e0", + "rev": "4a8718e5a14faeef3e57ededb4efb88b0deed329", "type": "github" }, "original": { @@ -1609,11 +1613,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1740351358, - "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", "owner": "tinted-theming", "repo": "schemes", - "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", "type": "github" }, "original": { @@ -1625,11 +1629,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740272597, - "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { @@ -1705,11 +1709,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739984347, - "narHash": "sha256-uVCct8KcApApcl2dV6UQ/T5AjUAzk0DtyWjsVNZmvxo=", + "lastModified": 1740510704, + "narHash": "sha256-AMGLqcSS9eNWM1K2lm7lZz5t6RFHgLSNTAGI1vYF2VY=", "owner": "dj95", "repo": "zjstatus", - "rev": "378ea2602f374fa23f09b8a41648b0f2338cbe9b", + "rev": "331ae24595e0c1c612f343547559d1e058128646", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 384b1cc..f1317b7 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?rev=5f385baff93c728400d2c4ec8c9b0745b8f9e5b6"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default-linux"; home-manager = { diff --git a/hosts/nixos/nbl-imba-2/default.nix b/hosts/nixos/nbl-imba-2/default.nix index 1aaffd9..e760801 100644 --- a/hosts/nixos/nbl-imba-2/default.nix +++ b/hosts/nixos/nbl-imba-2/default.nix @@ -54,7 +54,26 @@ in }; }; - programs.fw-fanctrl.enable = true; + programs.fw-fanctrl = { + enable = true; + config = { + defaultStrategy = "lazy"; + strategies = { + "lazy" = { + fanSpeedUpdateFrequency = 5; + movingAverageInterval = 30; + speedCurve = [ + { temp = 0; speed = 15; } + { temp = 50; speed = 15; } + { temp = 65; speed = 25; } + { temp = 70; speed = 35; } + { temp = 75; speed = 50; } + { temp = 85; speed = 100; } + ]; + }; + }; + }; + }; networking = { hostName = "nbl-imba-2"; diff --git a/profiles/home/common/emacs.nix b/profiles/home/common/emacs.nix index 409dbe7..de074e6 100644 --- a/profiles/home/common/emacs.nix +++ b/profiles/home/common/emacs.nix @@ -10,7 +10,7 @@ enable = true; package = pkgs.emacsWithPackagesFromUsePackage { config = self + /programs/emacs/init.el; - package = pkgs.emacs-pgtk; + package = pkgs.emacs-git-pgtk; alwaysEnsure = true; alwaysTangle = true; extraEmacsPackages = epkgs: [ diff --git a/programs/emacs/init.el b/programs/emacs/init.el index 503c866..2ff1d74 100644 --- a/programs/emacs/init.el +++ b/programs/emacs/init.el @@ -1277,18 +1277,18 @@ create a new one." ("C-z r" . cape-rfc1345) ) -(use-package rustic - :init - (setq rust-mode-treesitter-derive t) - :config - (define-key rust-ts-mode-map (kbd "C-c C-c C-r") 'rustic-cargo-run) - (define-key rust-ts-mode-map (kbd "C-c C-c C-b") 'rustic-cargo-build) - (define-key rust-ts-mode-map (kbd "C-c C-c C-k") 'rustic-cargo-check) - (define-key rust-ts-mode-map (kbd "C-c C-c d") 'rustic-cargo-doc) - (define-key rust-ts-mode-map (kbd "C-c C-c a") 'rustic-cargo-add) - (setq rustic-format-on-save t) - (setq rustic-lsp-client 'eglot) - :mode ("\\.rs" . rustic-mode)) +;;(use-package rustic +;; :init +;; (setq rust-mode-treesitter-derive t) +;; :config +;; (define-key rust-ts-mode-map (kbd "C-c C-c C-r") 'rustic-cargo-run) +;; (define-key rust-ts-mode-map (kbd "C-c C-c C-b") 'rustic-cargo-build) +;; (define-key rust-ts-mode-map (kbd "C-c C-c C-k") 'rustic-cargo-check) +;; (define-key rust-ts-mode-map (kbd "C-c C-c d") 'rustic-cargo-doc) +;; (define-key rust-ts-mode-map (kbd "C-c C-c a") 'rustic-cargo-add) +;; (setq rustic-format-on-save t) +;; (setq rustic-lsp-client 'eglot) +;; :mode ("\\.rs" . rustic-mode)) (use-package tramp :init @@ -1335,8 +1335,8 @@ create a new one." c++-ts-mode go-mode go-ts-mode - rust-ts-mode - rustic-mode + ;;rust-ts-mode + ;;rustic-mode tex-mode LaTeX-mode ) . (lambda () (progn