From 8b9c10866b72b9f0e9153561f1240a7d3bb49df9 Mon Sep 17 00:00:00 2001 From: DACHXY Date: Thu, 26 Dec 2024 12:46:23 +0800 Subject: [PATCH] replace rofi with rofi-wayland --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 18 ++++++++++++++---- system/modules/dn-ca.nix | 28 +++++++++++++++------------- system/modules/environment.nix | 23 +++++++++++++++-------- system/modules/hyprland.nix | 3 +-- system/modules/programs.nix | 13 +++++++------ 6 files changed, 73 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 5bdba72..2b8655f 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734838217, + "narHash": "sha256-zvMLS8BGn+kMG7tLLT3PJ67/S9yqZ9B7V8hKBa9cRRY=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "d583b2d142f0428313df099f4a2dcf2a0496aa78", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1733808091, @@ -56,6 +76,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/flake.nix b/flake.nix index d2ae61a..4f96157 100644 --- a/flake.nix +++ b/flake.nix @@ -6,20 +6,27 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs-unstable, nixpkgs, ... }@inputs: + outputs = + { self, nixpkgs-unstable, nixpkgs, nix-index-database, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; pkgsUnstable = nixpkgs-unstable.legacyPackages.${system}; nixvim.url = "github:azuwis/lazyvim-nixvim"; - in { + in + { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; nixosConfigurations.dn-pre7780 = nixpkgs.lib.nixosSystem { - modules = [ ./system/dev/dn-pre7780 ]; + modules = [ + nix-index-database.nixosModules.nix-index + ./system/dev/dn-pre7780 + ]; specialArgs = { inherit inputs; inherit pkgsUnstable; @@ -27,7 +34,10 @@ }; nixosConfigurations.dn-lap = nixpkgs.lib.nixosSystem { - modules = [ ./system/dev/dn-lap ]; + modules = [ + nix-index-database.nixosModules.nix-index + ./system/dev/dn-lap + ]; specialArgs = { inherit inputs; inherit pkgsUnstable; diff --git a/system/modules/dn-ca.nix b/system/modules/dn-ca.nix index ed1e024..bf4e5ed 100644 --- a/system/modules/dn-ca.nix +++ b/system/modules/dn-ca.nix @@ -1,17 +1,19 @@ { ... }: { - security.pki.certificates = ['' - -----BEGIN CERTIFICATE----- - MIIBhzCCAS2gAwIBAgIQUwzjgrU4LTTmE7FTvaCHlzAKBggqhkjOPQQDAjAiMQsw - CQYDVQQKEwJETjETMBEGA1UEAxMKRE4gUm9vdCBDQTAeFw0yNDExMTAwMjE5MzRa - Fw0zNDExMDgwMjE5MzRaMCIxCzAJBgNVBAoTAkROMRMwEQYDVQQDEwpETiBSb290 - IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhjokYiCE96DzqXb0pXgV7/DW - ns8BTBq67KGeLaH77Ywv15PzR1ydwaJ1NvvwNbyZh5TwpkMtXIEG7Cr44w/Ip6NF - MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE - FBgyUYt4st+TkVu4WWEfOhuVjbzqMAoGCCqGSM49BAMCA0gAMEUCIGUdeDfQJ+m0 - tdlSDJgnIXbJyU0u4cSvi8faJa7OtVovAiEAxvEteXU7f4+5U1yyk0NxJ7jg8B6P - K5hP1e2clgjFv/k= - -----END CERTIFICATE----- - '']; + security.pki.certificates = [ + '' + -----BEGIN CERTIFICATE----- + MIIBhzCCAS2gAwIBAgIQUwzjgrU4LTTmE7FTvaCHlzAKBggqhkjOPQQDAjAiMQsw + CQYDVQQKEwJETjETMBEGA1UEAxMKRE4gUm9vdCBDQTAeFw0yNDExMTAwMjE5MzRa + Fw0zNDExMDgwMjE5MzRaMCIxCzAJBgNVBAoTAkROMRMwEQYDVQQDEwpETiBSb290 + IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhjokYiCE96DzqXb0pXgV7/DW + ns8BTBq67KGeLaH77Ywv15PzR1ydwaJ1NvvwNbyZh5TwpkMtXIEG7Cr44w/Ip6NF + MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE + FBgyUYt4st+TkVu4WWEfOhuVjbzqMAoGCCqGSM49BAMCA0gAMEUCIGUdeDfQJ+m0 + tdlSDJgnIXbJyU0u4cSvi8faJa7OtVovAiEAxvEteXU7f4+5U1yyk0NxJ7jg8B6P + K5hP1e2clgjFv/k= + -----END CERTIFICATE----- + '' + ]; } diff --git a/system/modules/environment.nix b/system/modules/environment.nix index 54add56..d366ba0 100644 --- a/system/modules/environment.nix +++ b/system/modules/environment.nix @@ -3,11 +3,18 @@ # Nvidia only let offload = pkgs.writeShellScriptBin "offload" '' - #!/bin/bash - export __NV_PRIME_RENDER_OFFLOAD=1 - export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 - export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __VK_LAYER_NV_optimus=NVIDIA_only - exec "$@" - ''; -in { environment.systemPackages = [ offload ]; } + #!/bin/bash + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + ''; +in +{ + environment.systemPackages = [ offload ]; + environment.variables = { + NIXOS_OZONE_WL = "1"; + ELECTRON_OZONE_PLATFORM_HINT = "auto"; + }; +} diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix index ab8d708..81345c6 100644 --- a/system/modules/hyprland.nix +++ b/system/modules/hyprland.nix @@ -21,8 +21,7 @@ swaylock-effects wlogout wl-clipboard - wofi - rofi + rofi-wayland-unwrapped waybar ]; diff --git a/system/modules/programs.nix b/system/modules/programs.nix index 9abf7ca..11b3d0a 100644 --- a/system/modules/programs.nix +++ b/system/modules/programs.nix @@ -85,12 +85,13 @@ zsh.enable = true; mtr.enable = true; fish.enable = true; - nix-index = { - enable = true; - enableFishIntegration = true; - enableBashIntegration = false; - enableZshIntegration = false; - }; + + # nix-index = { + # enable = true; + # enableFishIntegration = true; + # enableBashIntegration = false; + # enableZshIntegration = false; + # }; # Set fish as default shell but not login shell bash = {