diff options
| -rw-r--r-- | flake.lock | 60 | ||||
| -rw-r--r-- | modules/common/nix.nix | 5 | ||||
| -rw-r--r-- | modules/common/shell/default.nix | 4 | ||||
| -rw-r--r-- | modules/common/stylix.nix | 51 | ||||
| -rw-r--r-- | modules/emacs/default.nix | 4 | ||||
| -rw-r--r-- | modules/endlessh-go.nix | 5 | ||||
| -rw-r--r-- | modules/firefox/addons.nix | 6 | ||||
| -rw-r--r-- | modules/profiles/default.nix | 1 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 10 | ||||
| -rw-r--r-- | overlays.nix | 8 |
10 files changed, 77 insertions, 77 deletions
@@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1714298568, - "narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=", + "lastModified": 1714720456, + "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ef4756bcfc8a6791adbcae2b32f87e2f0a00525d", + "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", "type": "gitlab" }, "original": { @@ -629,11 +629,11 @@ ] }, "locked": { - "lastModified": 1714439927, - "narHash": "sha256-XH0jGADqW5Xxd4mJIOafwfAKstn2i+UBuc8ODt3g50k=", + "lastModified": 1714785522, + "narHash": "sha256-CeF/V8MEFXfzQOJlYXA4qln8bleyY+wHFYIRd0tiyng=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "f9dbb7fb95f41d234e53ac3d46501a0aa6b1098c", + "rev": "1929df70e64ca401ea8e07cf38c41fa7a2f78048", "type": "github" }, "original": { @@ -674,11 +674,11 @@ ] }, "locked": { - "lastModified": 1714212743, - "narHash": "sha256-+GmuCvecraSTWylPCVSZYwAiz4lKDEpn1TIZlKz7gSw=", + "lastModified": 1714686485, + "narHash": "sha256-JUIGvx9sHjGqpGAFhY9jpOPzxLh8M7B8p/7ClmE/L24=", "owner": "oddlama", "repo": "nix-topology", - "rev": "ac69cc735c58e0028f8ef6a4b5c14efd57f5381b", + "rev": "79f82222e38c010dfa9367705d2b0142b9ceb635", "type": "github" }, "original": { @@ -689,11 +689,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714465198, - "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", + "lastModified": 1714746424, + "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", + "rev": "3f017311191fe6d501ca2496a835d012f656ee9c", "type": "github" }, "original": { @@ -704,11 +704,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "lastModified": 1714750952, + "narHash": "sha256-oOUdvPrO8CbupgDSaPou+Jv6GL+uQA2QlE33D7OLzkM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "5fd8536a9a5932d4ae8de52b7dc08d92041237fc", "type": "github" }, "original": { @@ -720,11 +720,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1714520284, - "narHash": "sha256-zwVUfqiFf+r5hifj7OwcFDGt1eiMaveim2ihE+m6dLA=", + "lastModified": 1714823303, + "narHash": "sha256-yyD3PfmbpGUw8329ra4oyGa9XSqfhSgxLnSy05QwINc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "097de5af21721e8e36a2e0d015dc3a5917de3fa0", + "rev": "14e704d967cc63fe36afa46aa06204407a11d1d0", "type": "github" }, "original": { @@ -736,11 +736,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1714514061, - "narHash": "sha256-QgR4JVjLFFqd/khJ5Og55iyBVdqoKcrfC0urkP3ZCJA=", + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95d1b593aab60766964d22d8ec0b0847678bdee2", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", "type": "github" }, "original": { @@ -830,11 +830,11 @@ ] }, "locked": { - "lastModified": 1713821140, - "narHash": "sha256-/kGc9R01h8mTmZKhrVyGWaK/w9zgettmHIE3GZW8Khs=", + "lastModified": 1714555012, + "narHash": "sha256-WVUrm3TGVj6c8g5aG20OjJRHMvUtAZjpHQgukDhyOT8=", "owner": "danth", "repo": "stylix", - "rev": "0fe277a3641a849478a94c7900c2d5a90609a306", + "rev": "43d23b1609b87f6a4100db2a09bd118c52c78766", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1714440038, - "narHash": "sha256-+zO77hQMEX9k87QQhuKgqLWNh1ZQZeF+a6sN/ot8RT4=", + "lastModified": 1714785573, + "narHash": "sha256-Q8sRrVL+YerB6ka6cTa2NhYi+n9dNAlfv3ZhWgGQApU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "150f7cf5f7d1c76e36bb5e917c5ac8045d77db45", + "rev": "207b8f0eaeb4d937db21ace9d5e8c14d7ce734ec", "type": "github" }, "original": { diff --git a/modules/common/nix.nix b/modules/common/nix.nix index d6e8edb..c03c1b1 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -3,6 +3,7 @@ inputs, lib, pkgs, + pkgsPr, this, ... }: @@ -125,7 +126,9 @@ in overlays = with inputs; [ self.overlays.default - (_: _super: { }) + (_: _super: { + inherit (pkgsPr 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go; + }) ]; }; diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix index 9ef1c22..4ae41d8 100644 --- a/modules/common/shell/default.nix +++ b/modules/common/shell/default.nix @@ -1,6 +1,5 @@ { config, - inputs, lib, pkgs, this, @@ -19,8 +18,6 @@ in config = { hm = { - imports = [ inputs.nix-index-database.hmModules.nix-index ]; - programs = { bash = { enable = true; @@ -185,7 +182,6 @@ in dircolors.enable = true; command-not-found.enable = false; - nix-index-database.comma.enable = true; }; home.packages = with pkgs; [ grc ]; diff --git a/modules/common/stylix.nix b/modules/common/stylix.nix index 953685e..9a360ad 100644 --- a/modules/common/stylix.nix +++ b/modules/common/stylix.nix @@ -3,6 +3,7 @@ inputs, lib, pkgs, + this, ... }: with lib; @@ -76,29 +77,33 @@ with lib; fonts = { packages = mkAfter config.nixfiles.modules.common.stylix.fonts.extraPackages; - fontconfig.defaultFonts = with config.stylix.fonts; { - serif = mkForce [ - serif.name - "Sarasa Gothic" - "Source Han Serif" - "Noto Serif" - ]; - sansSerif = mkForce [ - sansSerif.name - "Sarasa Gothic" - "Source Han Sans" - "Noto Sans" - ]; - monospace = mkForce [ - monospace.name - "Sarasa Mono" - "Source Han Mono" - "Noto Sans Mono" - ]; - emoji = mkForce [ - "Twitter Color Emoji" - "Noto Color Emoji" - ]; + fontconfig = { + enable = this.isHeadful; + + defaultFonts = with config.stylix.fonts; { + serif = mkForce [ + serif.name + "Sarasa Gothic" + "Source Han Serif" + "Noto Serif" + ]; + sansSerif = mkForce [ + sansSerif.name + "Sarasa Gothic" + "Source Han Sans" + "Noto Sans" + ]; + monospace = mkForce [ + monospace.name + "Sarasa Mono" + "Source Han Mono" + "Noto Sans Mono" + ]; + emoji = mkForce [ + "Twitter Color Emoji" + "Noto Color Emoji" + ]; + }; }; }; }; diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 2230ee0..8a6707c 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -60,11 +60,11 @@ in if [[ -x "$EMACSDIR/bin/doom" ]]; then if [[ ! -d "$EMACSDIR/.local" ]]; then - PATH="''${PATH:-/bin:/usr/bin:/usr/local/bin}:${emacs.package}/bin:${git.package}/bin" \ + PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin" \ "$EMACSDIR/bin/doom" install --force --verbose fi - PATH="''${PATH:-/bin:/usr/bin:/usr/local/bin}:${emacs.package}/bin:${git.package}/bin" \ + PATH="''${PATH:-/bin:}:${emacs.package}/bin:${git.package}/bin" \ "$EMACSDIR/bin/doom" sync -e --gc --force --verbose fi ''; diff --git a/modules/endlessh-go.nix b/modules/endlessh-go.nix index efaaa8f..2919534 100644 --- a/modules/endlessh-go.nix +++ b/modules/endlessh-go.nix @@ -25,10 +25,7 @@ in listenAddress = this.wireguard.ipv4.address; port = 9229; }; - extraOptions = [ - "-geoip_supplier=ip-api" - "-v=1" - ]; + extraOptions = [ "-geoip_supplier=ip-api" ]; }; networking.firewall.allowedTCPPorts = [ port ]; diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix index 54e67ee..1845701 100644 --- a/modules/firefox/addons.nix +++ b/modules/firefox/addons.nix @@ -50,10 +50,10 @@ }; "darkreader" = buildFirefoxXpiAddon { pname = "darkreader"; - version = "4.9.83"; + version = "4.9.84"; addonId = "addon@darkreader.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4262984/darkreader-4.9.83.xpi"; - sha256 = "a43cca2449de202d17040b0d91b2fb3ed4dd58ac81ec5d3fde4c9940d326c822"; + url = "https://addons.mozilla.org/firefox/downloads/file/4278339/darkreader-4.9.84.xpi"; + sha256 = "d418b40fc2cb69cfffabf6cc291f2cc5ca4c9d6a99e46562b44f4e2c0148374c"; meta = with lib; { homepage = "https://darkreader.org/"; description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing."; diff --git a/modules/profiles/default.nix b/modules/profiles/default.nix index e3002b0..5edfd7a 100644 --- a/modules/profiles/default.nix +++ b/modules/profiles/default.nix @@ -55,7 +55,6 @@ in psmisc sysstat tree - usbutils util-linux ]; }; diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index 6e58dae..7060e49 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, this, @@ -40,6 +41,8 @@ in }; hm = { + imports = [ inputs.nix-index-database.hmModules.nix-index ]; + home = { file.".digrc".text = '' +answer @@ -62,7 +65,11 @@ in ]; }; - programs.bash.shellAliases.open = "xdg-open"; + programs = { + bash.shellAliases.open = "xdg-open"; + + nix-index-database.comma.enable = true; + }; }; boot = { @@ -113,6 +120,7 @@ in lm_sensors socat tcpdump + usbutils ]; my.extraGroups = [ diff --git a/overlays.nix b/overlays.nix index 0adbc88..4555d38 100644 --- a/overlays.nix +++ b/overlays.nix @@ -61,14 +61,6 @@ _: { parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix { }; - # FIXME https://nixpk.gs/pr-tracker.html?pr=307505 - poetry = prev.poetry.overrideAttrs (finalAttrs: { - nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [ - prev.python3Packages.pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "dulwich" ]; - }); - prismlauncher-unwrapped = (prev.prismlauncher-unwrapped.override (finalAttrs: { stdenv = final.useMoldLinker finalAttrs.stdenv; |