use rust flake

This commit is contained in:
zoe 2023-07-08 16:01:56 +02:00
parent cffe8d38cf
commit 7be08c80fa
3 changed files with 18 additions and 25 deletions

View File

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ pkgs, config, ... }: { { pkgs, ... }: {
imports = [ imports = [
<home-manager/nixos> <home-manager/nixos>
./hardware-configuration.nix ./hardware-configuration.nix
@ -16,10 +16,9 @@
]; ];
nix.settings = { nix.settings = {
substituters = [ substituters = [ "https://helix.cachix.org" ];
"https://helix.cachix.org" trusted-public-keys =
]; [ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ];
trusted-public-keys = [ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ];
}; };
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -57,8 +56,10 @@
any-nix-shell fish --info-right | source any-nix-shell fish --info-right | source
''; '';
xdg.portal.enable = true; xdg.portal = {
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; enable = true;
wlr.enable = true;
};
# hostname # hostname
networking.hostName = "bat"; # Define your hostname. networking.hostName = "bat"; # Define your hostname.
@ -147,7 +148,7 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
wireplumber.enable = true; wireplumber.enable = true;
# jack.enable = true; jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default, # use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now) # no need to redefine it in your config for now)
@ -192,7 +193,5 @@
# vars # vars
environment.variables = { MOZ_USE_XINPUT2 = "DEFAULT=1"; }; environment.variables = { MOZ_USE_XINPUT2 = "DEFAULT=1"; };
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [ "python-2.7.18.6" ];
"python-2.7.18.6"
];
} }

View File

@ -1,6 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs.url = "nixpkgs/nixos-23.05";
mozilla.url = "github:mozilla/nixpkgs-mozilla";
# hyprland.url = "github:hyprwm/Hyprland"; # hyprland.url = "github:hyprwm/Hyprland";
supercolor.url = "github:zoe-bat/supercolor"; supercolor.url = "github:zoe-bat/supercolor";
kaokao.url = "github:zoe-bat/kaokao"; kaokao.url = "github:zoe-bat/kaokao";
@ -10,16 +11,14 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs outputs = { self, nixpkgs, home-manager, supercolor, i3layouts-rofi, kaokao
, home-manager, supercolor, i3layouts-rofi, kaokao , mozilla }@inputs:
}@inputs: let system = "x86_64-linux";
let
system = "x86_64-linux";
in { in {
nixosConfigurations.bat = nixpkgs.lib.nixosSystem { nixosConfigurations.bat = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = system;
modules = [ modules = [
({ config, pkgs, ... }: { nixpkgs.overlays = [ ]; }) ({ config, pkgs, ... }: { nixpkgs.overlays = [ mozilla.overlays.rust ]; })
./configuration.nix ./configuration.nix
]; ];
specialArgs = inputs; specialArgs = inputs;

View File

@ -1,10 +1,5 @@
{ pkgs, supercolor, kaokao, i3layouts-rofi, ... }: { pkgs, supercolor, kaokao, i3layouts-rofi, ... }:
let let my-python-packages = p: with p; [ pytest i3ipc python-lsp-server ];
my-python-packages = p:
with p; [
i3ipc
python-lsp-server
];
in { in {
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.zoe = { users.users.zoe = {
@ -149,11 +144,11 @@ in {
nodePackages_latest.svelte-language-server nodePackages_latest.svelte-language-server
nodePackages_latest.svelte-check nodePackages_latest.svelte-check
## rust ## rust
latest.rustChannels.stable.rust
cargo-watch cargo-watch
llvmPackages_rocm.clang llvmPackages_rocm.clang
mold mold
libclang libclang
rustup
taplo taplo
cargo-outdated cargo-outdated
cargo-generate cargo-generate