diff options
| -rw-r--r-- | flake.lock | 122 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | modules/common/qutebrowser.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/common/console.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/profiles/default.nix | 1 | ||||
| -rw-r--r-- | nixosConfigurations/eonwe/default.nix | 2 |
6 files changed, 35 insertions, 102 deletions
diff --git a/flake.lock b/flake.lock index b1ad15d..7ba829e 100644 --- a/flake.lock +++ b/flake.lock @@ -101,29 +101,6 @@ "url": "https://git.azahi.cc/azahi-cc" } }, - "beautysh": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "utils": "utils" - }, - "locked": { - "lastModified": 1680308980, - "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -266,11 +243,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -309,11 +286,11 @@ ] }, "locked": { - "lastModified": 1701739256, - "narHash": "sha256-18huXq/fGUwrP22Qrits4+hBYNnfFmoULyDR3E59Z0A=", + "lastModified": 1702257656, + "narHash": "sha256-rzN94y0C6R1t+5eV83yyxEJ9K9281iSFbulqBlAMyt8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "16eafd7c8003ba32f4be5f5b0d0f69edbcc5771e", + "rev": "90710b0ac178ee6d77dbc18b251334b52c3581b9", "type": "github" }, "original": { @@ -336,11 +313,11 @@ ] }, "locked": { - "lastModified": 1701739320, - "narHash": "sha256-OsL6DBP/Hdy7HGcIrNB6JDsprgQuJXaFmGPGkZE4ebU=", + "lastModified": 1702257609, + "narHash": "sha256-T8KfGBwuVVd3Yc1PYjjAFlj2W9Bmz3CIN5KmBWH0KkY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f0be3d039fd7500d927b7584ddd632e5e5dce45f", + "rev": "8a06aeb711a34ec1dad6ee1e2a3db90e473945a6", "type": "github" }, "original": { @@ -352,11 +329,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701656485, - "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", + "lastModified": 1702245580, + "narHash": "sha256-tTVRB42Ljo2uWGP7ei5h5/qQjOsdXoz0GHRy9hrVrdw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", + "rev": "030edbb68e69f2b97231479f98a9597024650df2", "type": "github" }, "original": { @@ -368,11 +345,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701626906, - "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=", + "lastModified": 1702206697, + "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361", + "rev": "29d6c96900b9b576c2fb89491452f283aa979819", "type": "github" }, "original": { @@ -384,11 +361,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1701806076, - "narHash": "sha256-gT8QjpAccrRortO21EOnPBzou4vADkeobnkGl0heRkM=", + "lastModified": 1702317192, + "narHash": "sha256-jYzBIMW18oQG+uQ9TVZwiYFHVafYIqllW+zFLROtwcE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa2ab930dd7c82bb91edd051db7a7222ae2bc3c8", + "rev": "a8dac2fa64af92360f126d2e20f47cd4ccf1c905", "type": "github" }, "original": { @@ -400,23 +377,22 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701805708, - "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", + "lastModified": 1702313274, + "narHash": "sha256-C5SJTaqRqHVvBf5+bLS2oAY321UlCaj8d8RT9Mq+rEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", + "rev": "4b4a8e497989e28121a759fbbd3dd3b16be03a25", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixvim": { "inputs": { - "beautysh": "beautysh", "flake-utils": [ "flake-utils" ], @@ -428,11 +404,11 @@ ] }, "locked": { - "lastModified": 1701772025, - "narHash": "sha256-Q8U9c39+aX9dsyMWFjRLLCav5m+M6IrE1V7X9AWfreM=", + "lastModified": 1702303976, + "narHash": "sha256-xOsTE50vcY3WQ1SPzGq0RaFauUMYdOylqlRXv8LoDzg=", "owner": "nix-community", "repo": "nixvim", - "rev": "903e2a1ccb92f17ac5810bc1229f5dd0addd7ba6", + "rev": "7fbb9240de5f9c72f096dba0c8554f1eed053322", "type": "github" }, "original": { @@ -476,33 +452,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "nixvim", - "beautysh", - "utils" - ], - "nixpkgs": [ - "nixvim", - "beautysh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658665240, - "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -520,11 +469,11 @@ ] }, "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", + "lastModified": 1702290759, + "narHash": "sha256-DUPtcei6GJlrC05Y3cqwLLSst+sp07334aAZw4Uk118=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", + "rev": "f99ed8523fc3aef67a7c838ca31f4b94ef902837", "type": "github" }, "original": { @@ -610,21 +559,6 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "xmonad-ng": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index e7a4624..cbc7324 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "release-23.05"; + ref = "release-23.11"; }; nixos-hardware = { diff --git a/modules/common/qutebrowser.nix b/modules/common/qutebrowser.nix index 8eadf5a..96da894 100644 --- a/modules/common/qutebrowser.nix +++ b/modules/common/qutebrowser.nix @@ -532,8 +532,9 @@ in { home.activation.installQutebrowserDictionaries = let dictcli = "${pkgs.qutebrowser}/share/qutebrowser/scripts/dictcli.py"; in '' - # TODO Check if already installed. - ${dictcli} install en-US en-GB ru-RU + if [[ ! -d "''${XDG_DATA_HOME:-$HOME/.local/share}/qutebrowser/qtwebengine_dictionaries" ]]; then + ${dictcli} install en-US en-GB ru-RU + fi ''; }; }; diff --git a/modules/nixos/common/console.nix b/modules/nixos/common/console.nix index 60a7153..e280919 100644 --- a/modules/nixos/common/console.nix +++ b/modules/nixos/common/console.nix @@ -1,13 +1,10 @@ { config, - lib, pkgs, ... -}: -with lib; { +}: { console = { earlySetup = true; - colors = take 16 (mapAttrsToList (_: removePrefix "#") config.colourScheme); font = "${pkgs.terminus_font}/share/consolefonts/ter-v16b.psf.gz"; useXkbConfig = config.services.xserver.enable; }; diff --git a/modules/nixos/profiles/default.nix b/modules/nixos/profiles/default.nix index e19d8b1..2027758 100644 --- a/modules/nixos/profiles/default.nix +++ b/modules/nixos/profiles/default.nix @@ -27,6 +27,7 @@ in { lsof pciutils psmisc + sysstat usbutils util-linux ]; diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix index a469fff..c8077b2 100644 --- a/nixosConfigurations/eonwe/default.nix +++ b/nixosConfigurations/eonwe/default.nix @@ -97,7 +97,7 @@ with lib; { nixpkgs.config.allowBroken = true; boot = { - kernelPackages = pkgs.linuxPackages_xanmod; + kernelPackages = pkgs.linuxPackages_xanmod_latest; kernelParams = [ # Silence benign MCE errors: |