fixes for NixOS

This commit is contained in:
Maddie H 2023-04-02 18:01:14 +01:00
parent 8c7aed6264
commit 19db410ad5
Signed by: maddie
GPG Key ID: C296DE8C9053683F
44 changed files with 66 additions and 34 deletions

View File

@ -1,5 +1,5 @@
{ {
description = "Maddie's NixOS configuration"; description = "Maddie's Nix configurations";
inputs = { inputs = {
# Home manager # Home manager
@ -13,39 +13,55 @@
outputs = { self, nixpkgs, home-manager, darwin }: outputs = { self, nixpkgs, home-manager, darwin }:
let let
username = "maddie"; username = "maddie";
pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; config.allowUnsupportedSystem = false; config.allowBroken = false; overlays = import ./overlays.nix; }; utils = import ./utils nixpkgs;
utils = import ./utils pkgs;
specialArgs = { inherit username; inherit pkgs; }; nixpkgs_x86_64 = import nixpkgs {
config.allowUnfree = true;
config.allowUnsupportedSystem = false;
config.allowBroken = false;
overlays = import ./overlays.nix;
system = "x86_64-linux";
};
nixpkgs_aarch64 = import nixpkgs {
config.allowUnfree = true;
config.allowUnsupportedSystem = false;
config.allowBroken = false;
overlays = import ./overlays.nix;
system = "aarch64-darwin";
};
in in
{ {
nixosConfigurations."luna" = nixpkgs.lib.nixosSystem { nixosConfigurations."luna" = nixpkgs.lib.nixosSystem {
inherit specialArgs; specialArgs = { inherit username; };
inherit pkgs; pkgs = nixpkgs_x86_64;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos; home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos;
home-manager.extraSpecialArgs = specialArgs; home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_x86_64; };
} }
] ++ utils.nixFilesIn ./systems/desktop; ] ++ utils.nixFilesIn ./systems/mdesktop;
}; };
darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem { darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem
inherit specialArgs; {
inherit pkgs; pkgs = nixpkgs_aarch64;
specialArgs = { inherit username; };
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos; home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos;
home-manager.extraSpecialArgs = specialArgs; home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_aarch64; };
} }
] ++ utils.nixFilesIn ./systems/macbookpro; ] ++ utils.nixFilesIn ./systems/mmacbookpro;
}; };
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; formatter.x86_64-linux = nixpkgs_x86_64.legacyPackages.x86_64-linux.nixpkgs-fmt;
formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixpkgs-fmt; formatter.aarch64-darwin = nixpkgs_aarch64.legacyPackages.aarch64-darwin.nixpkgs-fmt;
}; };
} }

View File

@ -2,7 +2,6 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# librewolf
amfora amfora
lynx lynx
]; ];

View File

@ -7,13 +7,4 @@
homeDirectory = lib.mkForce "/Users/${username}"; homeDirectory = lib.mkForce "/Users/${username}";
stateVersion = "23.05"; stateVersion = "23.05";
}; };
# Install MacOS applications to the user environment if the targetPlatform is Darwin
home.file."Applications/home-manager-linked".source = let
apps = pkgs.buildEnv {
name = "home-manager-applications";
paths = config.home.packages;
pathsToLink = "/Applications";
};
in lib.mkIf pkgs.stdenv.targetPlatform.isDarwin "${apps}/Applications";
} }

View File

@ -1,5 +0,0 @@
{ config, ... }:
{
programs.kitty.enable = true;
}

View File

@ -2,6 +2,6 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# nodePackages.insect nodePackages.insect
]; ];
} }

View File

@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
drawterm
];
}

View File

@ -0,0 +1,12 @@
{ config, ... }:
{
programs.librewolf = {
enable = true;
settings = {
"browser.uidensity" = 1;
"webgl.disabled" = false;
"privacy.resistFingerprinting" = false;
};
};
}

View File

@ -3,8 +3,8 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
element-desktop # Matrix client element-desktop # Matrix client
# signal-desktop # Signal client signal-desktop # Signal client
discord-canary # Discord client discord-canary # Discord client
#ripcord # Better discord client ripcord # Better discord client
]; ];
} }

View File

@ -0,0 +1,5 @@
{ config, ... }:
{
programs.obs-studio.enable = true;
}

7
maddie/nixos/tor.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
tor-browser-bundle-bin
];
}

View File

@ -7,5 +7,5 @@
settings.passwordAuthentication = false; settings.passwordAuthentication = false;
}; };
programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" ]; programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" ];
users.users.${username}.openssh.authorizedKeys.keyFiles = [ ../maddie/ssh/id_ed25519_sk.pub ]; users.users.${username}.openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/id_ed25519_sk.pub ];
} }