From 4b41ce640c5eddcb50904331e03aac5460caa144 Mon Sep 17 00:00:00 2001 From: adikro Date: Fri, 13 Feb 2026 19:07:38 +0100 Subject: laptop update --- .sops.yaml | 2 ++ flake.lock | 54 ++++++++++++++++++------------------ hosts/desktop/configuration.nix | 6 ---- hosts/laptop/configuration.nix | 21 ++++---------- hosts/laptop/home.nix | 5 +++- hosts/thinkpad/configuration.nix | 1 - os/core/power.nix | 1 + os/srv/sops.nix | 8 +++--- secrets/secrets.yaml | 59 +++++++++++++++++++++++----------------- 9 files changed, 77 insertions(+), 80 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index af3bba6..00d8491 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,6 +2,7 @@ keys: - &admin_gpg EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94 - &host_szpont age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww - &host_pendrive age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q + - &host_laptop age1m4u7n6mt5d3jv39lf4aedr9gqu3khl4sahuqx5n5h7v48gkyc9zqkp9qs8 creation_rules: - path_regex: secrets/.*\.yaml$ @@ -9,5 +10,6 @@ creation_rules: - age: - *host_szpont - *host_pendrive + - *host_laptop pgp: - *admin_gpg diff --git a/flake.lock b/flake.lock index d4c1258..664cb1f 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1770930784, - "narHash": "sha256-J5YzA89ctwpSpfk+SJWVRWLzhuziXRRcFmo+cs+1K5M=", + "lastModified": 1770995331, + "narHash": "sha256-MZOF7PVKDOMAOp6bJpzuKOb1DVcyUT84568r8y3iVGg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2cc195b4783991b30fb8499c0dd2f9a7bf44d347", + "rev": "5e90b62996d56da9acb21e502c078e7c4e6ab40f", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1770857573, - "narHash": "sha256-pSeFA1qRAdivDrrKoybJ1DOcbkXx2v/ExIc6n0DbT4U=", + "lastModified": 1770941087, + "narHash": "sha256-LERqMOoFmStaguCYZSV1kSRvHWZihJRttYkqzEh1WX4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "31e79c73c444b2e51eb34f2305792809839c58e8", + "rev": "6afe464c62eee957282721751d60f9d44651bf97", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1770810897, - "narHash": "sha256-6F/Z/UQxalaSoqewSQ4fL8zSws3Vy4wgA5DgyTaeqTo=", + "lastModified": 1770935891, + "narHash": "sha256-XFde0vvpTf0JBTCfPj7SzLyPOerfeKZV4FVSBoPqkjo=", "owner": "neovim", "repo": "neovim", - "rev": "6b4ec2264e1d8ba027b85f3883d532c5068be92a", + "rev": "fa24df32641c850283ec7f8a35e8ad505d3866e1", "type": "github" }, "original": { @@ -216,11 +216,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770844822, - "narHash": "sha256-QgJZ+W6YE6nAzO/m7ezamAzr9DTflIEXRozMivL0+hc=", + "lastModified": 1770969869, + "narHash": "sha256-a5ZgirQt+wfRTcwsWar8IwdsR+YZxEj6bF4LRYiB/Ow=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7634add8bf2dd225d04f535de4bd0ee60982f367", + "rev": "e39489a418aebcc4841b95600952610f95ddac49", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770735554, - "narHash": "sha256-8GzUa8bCyQ688jYW2waXrOqetTr7oV8UPTO2He+5Hsg=", + "lastModified": 1770966998, + "narHash": "sha256-UDJwlNU7lP6lfHNzYtNM5jgvGrKmZ+R3Tr6lM+8hNLQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "41b5de87692b8262fbdbff7faab93f04ff0be453", + "rev": "c1146c0befd31358910c78672ee987ee336b889a", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1770913930, - "narHash": "sha256-yjquFNZCWM+QPaf5laJUlLvye70NQ0Mwtf6J3fmKVYI=", + "lastModified": 1770971055, + "narHash": "sha256-XYFbDiNsfUKduV0DgV8UYSRey9t9vz/A4ppmzwBW+vQ=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "9269a49b885f43ce3de5ed874db6d4dd7b22514f", + "rev": "77e0320dd37093da79e4f146659c66bb7ae692cc", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -372,11 +372,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1770630823, - "narHash": "sha256-5SEmOnJ61vmbap39vzWEsCX5UQ+3Ul8J4mXWKdqSn3w=", + "lastModified": 1770954048, + "narHash": "sha256-TEXS8Z7K+GsOOtL0QD1hrMxL0lVJjKDl3qZq/mJHu2k=", "owner": "nix-community", "repo": "nixvim", - "rev": "6acc964664ac916c64fe4e394edd467af4d90790", + "rev": "e49b8deda7b1732f5a2ea2a90446e45adb2a121d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1770826362, - "narHash": "sha256-4EIzP/6xNQPmTliuww3B7m7E1MdRexrSJCWviiH+qt4=", + "lastModified": 1770959024, + "narHash": "sha256-r2fZFW+xZxEdyORsAipCrnuxQblGGldtZcx0iSQI1ZQ=", "owner": "sxyazi", "repo": "yazi", - "rev": "c3bc4fecad9308846251ded5aad8509dd7a04158", + "rev": "13bdb164a473091b46e857d37599e7e1ae22665e", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 42be28c..4382320 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -81,12 +81,6 @@ }; }; - programs.wireshark = { - enable = true; - package = pkgs.wireshark; - }; - users.users.adam.extraGroups = [ "wireshark" ]; - boot = { kernelModules = [ "nct6687" ]; extraModulePackages = [ diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index a6c6b56..df4ba29 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -32,14 +32,8 @@ }; locale.enable = true; memory = { - zram = { - enable = true; - percent = 25; - }; - swapfile = { - enable = true; - size = 8; - }; + zram.enable = true; + swapfile.enable = true; }; network.enable = true; power = { @@ -53,16 +47,11 @@ }; srv = { bluetooth.enable = true; - files = { - thunar.enable = true; - utils.enable = true; - }; - gaming = { - enable = true; - steam.enable = true; - }; + files.enable = true; + gaming.enable = true; nix-helper.enable = true; kdeconnect.enable = true; + sops.enable = true; }; wm = { enable = true; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index e5b5f32..272cca3 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -16,6 +16,7 @@ }; git.enable = true; xdg-dirs.enable = true; + xdg-mime.enable = true; }; editors.nixvim.enable = true; env = { @@ -37,9 +38,11 @@ }; soft = { browser.librewolf.enable = true; - mpv.enable = true; + email.thunderbird.enable = true; media.enable = true; + mpv.enable = true; nixcord.enable = true; + onlyoffice.enable = true; obsidian.enable = true; spicetify.enable = true; torrent.enable = true; diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix index 21fc467..ecc1c52 100644 --- a/hosts/thinkpad/configuration.nix +++ b/hosts/thinkpad/configuration.nix @@ -64,7 +64,6 @@ nix-helper.enable = true; monero.enable = true; sops.enable = true; - syncthing.enable = true; }; wm = { enable = true; diff --git a/os/core/power.nix b/os/core/power.nix index b3dbf91..b74c077 100644 --- a/os/core/power.nix +++ b/os/core/power.nix @@ -22,6 +22,7 @@ in config = lib.mkIf cfg.enable ( lib.mkMerge [ { + programs.light.enable = true; powerManagement.powertop.enable = true; boot.kernelParams = [ "nvme_core.default_ps_max_latency_us=0" ]; } diff --git a/os/srv/sops.nix b/os/srv/sops.nix index e5233d6..3c9f0a9 100644 --- a/os/srv/sops.nix +++ b/os/srv/sops.nix @@ -24,13 +24,13 @@ in "obs/websocket_password".owner = username; root_password.neededForUsers = true; user_password.neededForUsers = true; - crypt_key = { }; +# crypt_key = { }; }; }; - boot.initrd.secrets = { - "/tmp/crypt.key" = config.sops.secrets.crypt_key.path; - }; +# boot.initrd.secrets = { +# "/tmp/crypt.key" = config.sops.secrets.crypt_key.path; +# }; environment.systemPackages = with pkgs; [ sops diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 6c24d82..e149d19 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -10,42 +10,51 @@ sops: - recipient: age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBndWtDdC83Z2Y4QW9sWkRZ - QW82OWE4dmp0TW8vR1Zrd3g4UVhCaWplSGswCkx1emswalVka1dOaTFWd3M5UTBh - eDRVWkFvM0d5OW5BNVRTQjY1MWs5OVEKLS0tIGlkS1owM3h1akdtSFlBQ0JFRVc5 - c2JrU0gwNHNtemh2NDNoVis3MUhmdmcK4N1qbjdNwKDTP03gOvhvH6RRJnfCDJxZ - RHA3thFR17iFqcQ3woOKc0MGY4vIgWZYZoX4oYmo3kMGiUkcWtiOww== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBYW9VSEtyVVhFR0QyWWxn + S2UzdDJnWWlqT0pCRDJDN0h2WlFnZ05mRlJRCnA0bVRZdm1qOFo5K1pEU3R2YTJZ + OUVkN240SUlPbnYyM21EZ29rRFZkVGcKLS0tIGxaZFZKcDdoYlI0S1BFRjczVFZP + OXcwWXU1L1h0eW9QVCt1ek5zN3AzODgKyTpQLSpf5nk7khxtXZU3douhu+Aa+0Va + jpuA6HBRSRy4iLfXfn9/XBjTj9kx69pQniWjHUb63DrDEC8djlrd8w== -----END AGE ENCRYPTED FILE----- - recipient: age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0U2srVU1iR1FGZ0gxcUth - WDVOeDdZaWRaZDVLbnVHVkNDTWZjbTFqVW1NCmZHSnlWRklPdnFabkhmN0FqZlZL - cnR4eThjc0Z2SnVCVkMvQ3pZMDJYOG8KLS0tIFdwMzlWWkg1SFRVdHFCU1UwZmxG - b3E5bmZpN0tUclZjck4wUjFBUklOelkKf3v/9uVOgDp7olWyV50PMISVq8Ixf4+S - vLuXJ0kMeTuiW5CweAW9HiD01nwC+aRZaPn5JCLMoxWy/VVgMNNx1g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoc2d3cy9CRjBkRW1PY3I2 + U0dFa21Qdjh6bE1KTUdkMjFXaGxRVitaMjFNCkNVbEZBZ25HRHJ4M3FYZmUvVVhh + QXRTaW9EWXI5Tk9GaGtXWmRhTkF2MmMKLS0tIEs2dlNqUEtuL1ZrRFR4TVJFV0ZC + N2dVZjdZRVkxMXRxN281S0MvdVpTcGsKs0FvPC6P5HJ6I2P1Nxq34xDZl+3yEK/W + YZu38H5dHGqdnh/5OWJ5uZ4w8NDfG6J7RA7qs1+VrFgODbIAxTcZEA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1m4u7n6mt5d3jv39lf4aedr9gqu3khl4sahuqx5n5h7v48gkyc9zqkp9qs8 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPeVlXek9XSjZBbWpFWURM + TU5MWXAxaThZcWkyUTNIaTdCdHJDanpaMDNJCnZwOHEzckZWekl4eVdwNTEvWnZx + MnE1TEVnNXY5UWp0MytYWW1MaXdjY3cKLS0tIG1jTVU5QS8rV0o4NXlIN1MyZit3 + VTZMMDhCcUtCaFRDcWtBbTRvaXF4amsK7mbW8KsfTrHZkdGbORVgIfCfgTZfgOcQ + Q4ejje7WzbEhPVUKeYkbe5cmrA2AhxcLGURPZhZfNihBuKzj/TX+/Q== -----END AGE ENCRYPTED FILE----- lastmodified: "2026-02-12T18:12:27Z" mac: ENC[AES256_GCM,data:X4w7bP1yh8fv9T1g0foqmLGy8d0BJBR82FYUplBbmvoxLELz56cTKs4+SKZ0p9u3OGd2IBtb8HlJCtv2bvllXbFm3dCrQBA6GYJ0yktIgijLuEA4m1iInc3EHh2il4I7/QXcrN/0ogCaNKqLUFsuqJSFQeDy06EZsazkm1xQp04=,iv:abXrgqa9UoTd5ENtOsm6b95ADdBcfrZwUrBaxWq+U3s=,tag:o6ug+kehSzHK2FXCQB1tiw==,type:str] pgp: - - created_at: "2026-02-09T13:58:02Z" + - created_at: "2026-02-13T17:46:13Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA/mKtLqB941HAQ/9H3zo/TeVcacpBg9fM7CFIWu9rEe51Y1b5Tu23zpEtOoO - jGkBbdV/Ef8bhHcKOV+YyyjMtYeXGNWu8CNGfT0K6zGKesFZ3Y5dcgcLxTBOmPBZ - Gv0OgC/BQGegNC8PsnzWZXLK5WhAhta6gdcvhDZqAD15QXtgqquvyQ5FBQbF19ox - x6xq4UqKrREq1svFxInqXU9/o3/JvUPXFNLNZ02O1IkaLP5ceuPr3coj5ZNWMOJe - vNQj8wcdbZJZHKJJzZ8eFOK5MRT8cv+vzWr4CalJPYn9TjB/XypXiTRM7NrjjTOT - PApj9RwtHgz2cncyGbCQ5zptgG4vTlPRUn3GVoTkvw02g3dt9tKkPnVYtvoxprGR - lpF1kxezKgBsN0h68E4+VD6kbcc8T7Dy/f3fF1hmXf/Mojg05qY7+MsFZgUryu6P - EyZffhMS4O15Ltseh+bvJE2GQko2RRgsXPm/s8aQxmECPSZiCX3GHesUiW5/CeK8 - tRm9dqhlDZKANAiegf+maHedD/JKyhqAgcE3CNIj3cIWJlj0WH7O6rCmZZXggLxa - VaWvf+5hEa0Nvl2V71S+JvOJeyjV9tupa422o49NzQ4s1bXYnR3eaP1iIc27cQFX - /hscbZpc2oigWtaSkjafKgBZcAAoT6ZxGKDgYKwcnKVw14B2TEIRZFhpt/OSw6rS - XgHyEjsv3dbIxG2Qeze2dpnedA7KSkYqyY+RreZG+maTYQOvt2GfsVv2bu0jTK1/ - JStWb1Q8RpMpp+EyukITupArBQEbtzMYrgrxi7SGEeD/aOuqleB9E4a75qCwfYY= - =44+d + hQIMA/mKtLqB941HAQ//VdVf9/Xfmg3O0dEYqNLPWl9Nu5dD8MVPB7B7LJxEX2rs + 770ngMcJvBMJZlaT+9nvJoCl/SLzOZHfhAe+ZdzPLoTeGsLbMsf3KCDaNMGbtsJw + +MHkTqKHsYzq13eFaoXCMffcowHjUJ00KECT+QlryOd+5beqMjrKktYESp7huQ++ + Fd3H8qIK2meJsx6SMdM2LaukTigYRDRBievjypgHHr9cPGjREAR4TGUlp6ON5zqU + ZHa74psvpb8aBLGQR3KoC53EpfuHMu1IJDlbTf5YDe5F5T+hlpeW0uqorDBghE0W + nQPwvqC53EgZc3bdh267fgGr9T/OOVJqr64E5AEcY5k+mR8ZC2reyI1y1yo/+YAT + 4jQsBtpenH354VcemRPERbS3rEgFoVb6HfFBdDiuTvvKiGVhmTRzCrOsty93XFBU + XvV/gY2r7WJ9RgawEiAKBfPi6CENajCz5b+OtqpDCpINtgL9JKp6QK5q2QFZPZ/G + 9Yj8NQ2km5DV2e72sUdNibOqVumvcnQ6zI/vHD50BH3AW7cByXKTdF8n+bilUVXa + UpQLQkp5BlRX3UMNQYUov6vHjp36/UYLq+lzE4BqqYsFb13mr+0y/5aVFK51t/gK + v+ClKVJCmFy8vZmhpt4PJwfSH5YqPvOn8Cmpnuujl+UmBD0sjYGSFF4ki9LARpTS + XgEcPJ3mxCbmYQknc2Q/DANUY6/OKE3RHENkgInlu4G3LekbAH3iAzv6bf4qj0Kd + /w8jGik9L1HXTiZdcd9+c4o5rurkehd7fL7nRCbm0NlkVnJQJhbAqaKu9Z8ikiA= + =Wz9R -----END PGP MESSAGE----- fp: EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94 unencrypted_suffix: _unencrypted -- cgit v1.3