dachxy/nix-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace rofi with rofi-wayland

Browse source
This commit is contained in:
DACHXY 2024-12-26 12:46:23 +08:00
parent 71becb872e
commit aad529ecbc
6 changed files with 80 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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"
} }

34
flake.nix
View file

@ -6,35 +6,39 @@
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 = outputs =
{ self, nixpkgs-unstable, nixpkgs, ... }@inputs: { 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 = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
nixosConfigurations.dn-nix = nixpkgs.lib.nixosSystem { nixosConfigurations.dn-nix = nixpkgs.lib.nixosSystem {
modules = modules =
[ [
./system/configuration.nix nix-index-database.nixosModules.nix-index
]; ./system/configuration.nix
];
specialArgs = { inherit inputs; inherit pkgsUnstable; }; specialArgs = { inherit inputs; inherit pkgsUnstable; };
}; };
# homeConfigurations = { # homeConfigurations = {
# danny = home-manager.lib.homeManagerConfiguration { # danny = home-manager.lib.homeManagerConfiguration {
# inherit pkgs; # inherit pkgs;
# modules = [ ./home ]; # modules = [ ./home ];
# extraSpecialArgs = { # extraSpecialArgs = {
# inherit pkgs-unstable; # inherit pkgs-unstable;
# inherit inputs; # inherit inputs;
# }; # };
# }; # };
# }; # };
# programs.home-manager.enable = true; # programs.home-manager.enable = true;
}; };
} }

30
system/modules/dn-ca.nix
View file

@ -1,19 +1,19 @@
{ ... }: { ... }:
{ {
security.pki.certificates = [ security.pki.certificates = [
'' ''
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBhzCCAS2gAwIBAgIQUwzjgrU4LTTmE7FTvaCHlzAKBggqhkjOPQQDAjAiMQsw MIIBhzCCAS2gAwIBAgIQUwzjgrU4LTTmE7FTvaCHlzAKBggqhkjOPQQDAjAiMQsw
CQYDVQQKEwJETjETMBEGA1UEAxMKRE4gUm9vdCBDQTAeFw0yNDExMTAwMjE5MzRa CQYDVQQKEwJETjETMBEGA1UEAxMKRE4gUm9vdCBDQTAeFw0yNDExMTAwMjE5MzRa
Fw0zNDExMDgwMjE5MzRaMCIxCzAJBgNVBAoTAkROMRMwEQYDVQQDEwpETiBSb290 Fw0zNDExMDgwMjE5MzRaMCIxCzAJBgNVBAoTAkROMRMwEQYDVQQDEwpETiBSb290
IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhjokYiCE96DzqXb0pXgV7/DW IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhjokYiCE96DzqXb0pXgV7/DW
ns8BTBq67KGeLaH77Ywv15PzR1ydwaJ1NvvwNbyZh5TwpkMtXIEG7Cr44w/Ip6NF ns8BTBq67KGeLaH77Ywv15PzR1ydwaJ1NvvwNbyZh5TwpkMtXIEG7Cr44w/Ip6NF
MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE
FBgyUYt4st+TkVu4WWEfOhuVjbzqMAoGCCqGSM49BAMCA0gAMEUCIGUdeDfQJ+m0 FBgyUYt4st+TkVu4WWEfOhuVjbzqMAoGCCqGSM49BAMCA0gAMEUCIGUdeDfQJ+m0
tdlSDJgnIXbJyU0u4cSvi8faJa7OtVovAiEAxvEteXU7f4+5U1yyk0NxJ7jg8B6P tdlSDJgnIXbJyU0u4cSvi8faJa7OtVovAiEAxvEteXU7f4+5U1yyk0NxJ7jg8B6P
K5hP1e2clgjFv/k= K5hP1e2clgjFv/k=
-----END CERTIFICATE----- -----END CERTIFICATE-----
'' ''
]; ];
} }

25
system/modules/environment.nix
View file

@ -1,14 +1,19 @@
{ pkgs, ... }: { pkgs, ... }:
let let
offload = pkgs.writeShellScriptBin "offload" '' offload = pkgs.writeShellScriptBin "offload" ''
#!/bin/bash #!/bin/bash
export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only export __VK_LAYER_NV_optimus=NVIDIA_only
exec "$@" exec "$@"
''; '';
in { in
environment.systemPackages = [ offload ]; {
environment.systemPackages = [ offload ];
environment.variables = {
NIXOS_OZONE_WL = "1";
ELECTRON_OZONE_PLATFORM_HINT = "auto";
};
} }

3
system/modules/hyprland.nix
View file

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

13
system/modules/programs.nix
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 = {