Compare commits

...

3 Commits

Author SHA1 Message Date
5f9b7cac2c Add vesktop and signal to linux 2024-07-03 19:01:45 +02:00
292544f602 Disable iwd for mac 2024-07-03 19:01:45 +02:00
2a63264f1e mount foxshare in nixos 2024-07-03 19:01:45 +02:00
5 changed files with 15 additions and 4 deletions

View File

@ -162,7 +162,7 @@
}; };
networking = mkNixOsNetworking { networking = mkNixOsNetworking {
inherit pkgs; inherit pkgs;
use-iwd = true; use-iwd = false;
}; };
graphical = mkNixOsGraphical { graphical = mkNixOsGraphical {
inherit pkgs; inherit pkgs;
@ -204,7 +204,7 @@
modules = [ modules = [
nixos-apple-silicon.nixosModules.apple-silicon-support nixos-apple-silicon.nixosModules.apple-silicon-support
./nixos/machines/foxhut/hardware.nix ./nixos/machines/foxhut/hardware.nix
(import ./nixos/machines/foxhut/boot.nix { inherit asahi-firmware; }) (import ./nixos/machines/foxhut/boot.nix { inherit pkgs asahi-firmware; })
base base
networking networking
graphical graphical

View File

@ -22,7 +22,7 @@ in rec {
fira-code ibm-plex fira-code ibm-plex
] ]
++ (if pkgs.stdenv.isDarwin then [alloy6-mac] else [pkgs.alloy6]) ++ (if pkgs.stdenv.isDarwin then [alloy6-mac] else [pkgs.alloy6])
++ (if pkgs.stdenv.isDarwin then [] else [pkgs.keepassxc]) ++ (if pkgs.stdenv.isDarwin then [] else [pkgs.keepassxc pkgs.vesktop pkgs.signal-desktop])
; ;
programs.alacritty = alacritty; programs.alacritty = alacritty;

View File

@ -48,6 +48,7 @@
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "docker" ]; extraGroups = [ "wheel" "docker" ];
shell = pkgs.zsh; shell = pkgs.zsh;
uid = 1000;
}; };
users.users.guest = { users.users.guest = {
@ -55,6 +56,7 @@
extraGroups = [ ]; extraGroups = [ ];
home = "/home/guest"; home = "/home/guest";
shell = pkgs.zsh; shell = pkgs.zsh;
uid = 1001;
}; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;

View File

@ -48,6 +48,7 @@ in
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "docker" ]; extraGroups = [ "wheel" "docker" ];
shell = pkgs.zsh; shell = pkgs.zsh;
uid = 1002;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@ -2,7 +2,8 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ asahi-firmware, ... }: { pkgs, asahi-firmware, ... }:
{ config, ... }:
{ {
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -15,5 +16,12 @@
hardware.asahi.useExperimentalGPUDriver = true; hardware.asahi.useExperimentalGPUDriver = true;
hardware.asahi.experimentalGPUInstallMode = "replace"; hardware.asahi.experimentalGPUInstallMode = "replace";
fileSystems.foxshare = {
fsType = "exfat";
device = "/dev/disk/by-label/foxshare";
mountPoint = "/home/xenia/foxshare";
options = ["uid=${builtins.toString config.users.users.xenia.uid}" "nofail"];
};
} }