replace rofi with rofi-wayland

This commit is contained in:
DACHXY 2024-12-26 12:46:23 +08:00
parent b999f6cf80
commit 8b9c10866b
6 changed files with 73 additions and 33 deletions

21
flake.lock generated
View file

@ -21,6 +21,26 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733808091, "lastModified": 1733808091,
@ -56,6 +76,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }

View file

@ -6,20 +6,27 @@
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; 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 let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
pkgsUnstable = nixpkgs-unstable.legacyPackages.${system}; pkgsUnstable = nixpkgs-unstable.legacyPackages.${system};
nixvim.url = "github:azuwis/lazyvim-nixvim"; nixvim.url = "github:azuwis/lazyvim-nixvim";
in { in
{
formatter.x86_64-linux = formatter.x86_64-linux =
nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
nixosConfigurations.dn-pre7780 = nixpkgs.lib.nixosSystem { nixosConfigurations.dn-pre7780 = nixpkgs.lib.nixosSystem {
modules = [ ./system/dev/dn-pre7780 ]; modules = [
nix-index-database.nixosModules.nix-index
./system/dev/dn-pre7780
];
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit pkgsUnstable; inherit pkgsUnstable;
@ -27,7 +34,10 @@
}; };
nixosConfigurations.dn-lap = nixpkgs.lib.nixosSystem { nixosConfigurations.dn-lap = nixpkgs.lib.nixosSystem {
modules = [ ./system/dev/dn-lap ]; modules = [
nix-index-database.nixosModules.nix-index
./system/dev/dn-lap
];
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit pkgsUnstable; inherit pkgsUnstable;

View file

@ -1,7 +1,8 @@
{ ... }: { ... }:
{ {
security.pki.certificates = ['' security.pki.certificates = [
''
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBhzCCAS2gAwIBAgIQUwzjgrU4LTTmE7FTvaCHlzAKBggqhkjOPQQDAjAiMQsw MIIBhzCCAS2gAwIBAgIQUwzjgrU4LTTmE7FTvaCHlzAKBggqhkjOPQQDAjAiMQsw
CQYDVQQKEwJETjETMBEGA1UEAxMKRE4gUm9vdCBDQTAeFw0yNDExMTAwMjE5MzRa CQYDVQQKEwJETjETMBEGA1UEAxMKRE4gUm9vdCBDQTAeFw0yNDExMTAwMjE5MzRa
@ -13,5 +14,6 @@
tdlSDJgnIXbJyU0u4cSvi8faJa7OtVovAiEAxvEteXU7f4+5U1yyk0NxJ7jg8B6P tdlSDJgnIXbJyU0u4cSvi8faJa7OtVovAiEAxvEteXU7f4+5U1yyk0NxJ7jg8B6P
K5hP1e2clgjFv/k= K5hP1e2clgjFv/k=
-----END CERTIFICATE----- -----END CERTIFICATE-----
'']; ''
];
} }

View file

@ -10,4 +10,11 @@ let
export __VK_LAYER_NV_optimus=NVIDIA_only export __VK_LAYER_NV_optimus=NVIDIA_only
exec "$@" exec "$@"
''; '';
in { environment.systemPackages = [ offload ]; } in
{
environment.systemPackages = [ offload ];
environment.variables = {
NIXOS_OZONE_WL = "1";
ELECTRON_OZONE_PLATFORM_HINT = "auto";
};
}

View file

@ -21,8 +21,7 @@
swaylock-effects swaylock-effects
wlogout wlogout
wl-clipboard wl-clipboard
wofi rofi-wayland-unwrapped
rofi
waybar waybar
]; ];

View file

@ -85,12 +85,13 @@
zsh.enable = true; zsh.enable = true;
mtr.enable = true; mtr.enable = true;
fish.enable = true; fish.enable = true;
nix-index = {
enable = true; # nix-index = {
enableFishIntegration = true; # enable = true;
enableBashIntegration = false; # enableFishIntegration = true;
enableZshIntegration = false; # enableBashIntegration = false;
}; # enableZshIntegration = false;
# };
# Set fish as default shell but not login shell # Set fish as default shell but not login shell
bash = { bash = {