harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: harald:b4768eef70c22752738ef5eac4c1c3ef513a28b6
Branches Tags
harald:main
harald:b24.05
..
compare: harald:0fb55d0de178b484af89204a79040e8ba4cf0a89
Branches Tags
harald:main
harald:b24.05

No commits in common. "b4768eef70c22752738ef5eac4c1c3ef513a28b6" and "0fb55d0de178b484af89204a79040e8ba4cf0a89" have entirely different histories.
b4768eef70 ... 0fb55d0de1

4 changed files with 45 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

46
homes/x86_64-linux/harald@x1/default.nix
View file

@ -1,4 +1,9 @@
{ config { lib
, pkgs
, config
, nixpkgs
, osConfig ? { }
, format ? "unknown"
, ... , ...
}: }:
{ {
@ -28,44 +33,5 @@
}; };
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
dconf.settings = {
# ...
"org/gnome/shell" = {
disable-user-extensions = false;
# `gnome-extensions list` for a list
enabled-extensions = [
"Vitals@CoreCoding.com"
"appindicatorsupport@rgcjonas.gmail.com"
"dash-to-panel@jderose9.github.com"
"hibernate-status@dromi"
];
favorite-apps = [
"org.gnome.Console.desktop"
"JetBrains Toolbox.desktop"
"org.mozilla.firefox.desktop"
"firefox.desktop"
"thunderbird.desktop"
"org.mozilla.Thunderbird.desktop"
"slack.desktop"
"keybase.desktop"
"spotify.desktop"
"org.gnome.Nautilus.desktop"
];
};
"org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ];
};
};
xdg.enable = true;
xdg.mime.enable = true;
targets.genericLinux.enable = true;
} }

3
modules/nixos/gui/default.nix
View file

@ -15,6 +15,7 @@ in
flatpak.enable = true; flatpak.enable = true;
xserver = { xserver = {
layout = "de+us"; layout = "de+us";
xkbVariant = "nodeadkeys";
enable = true; enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
@ -88,7 +89,7 @@ in
gnomeExtensions.vitals gnomeExtensions.vitals
gnupg gnupg
go go
jetbrains-toolbox jetbrains-toolbox
jq jq
kbfs kbfs
keybase keybase

55
systems/x86_64-linux/x1/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib; with lib;
with lib.plusultra; with lib.plusultra;
@ -11,6 +11,7 @@ with lib.plusultra;
plusultra.gui.enable = true; plusultra.gui.enable = true;
programs.dconf.enable = true;
boot = { boot = {
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;
@ -23,7 +24,7 @@ with lib.plusultra;
}; };
# Configure console keymap # Configure console keymap
console.keyMap = "us"; console.keyMap = "de-latin1-nodeadkeys";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
LC_MESSAGES = "en_US.UTF-8"; LC_MESSAGES = "en_US.UTF-8";
LC_TIME = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8";
@ -32,8 +33,6 @@ with lib.plusultra;
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
age age
appimage-run
cifs-utils
clevis clevis
delta delta
efibootmgr efibootmgr
@ -69,7 +68,6 @@ appimage-run
}; };
programs = { programs = {
dconf.enable = true;
bash = { bash = {
## shellInit = '' ## shellInit = ''
interactiveShellInit = '' interactiveShellInit = ''
@ -124,19 +122,19 @@ appimage-run
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
]; ];
# users.users.harald = { # users.users.harald = {
# shell = pkgs.fish; # shell = pkgs.fish;
# isNormalUser = true; # isNormalUser = true;
# description = "harald"; # description = "harald";
# extraGroups = [ "networkmanager" "wheel" "sgx" "libvirtd" "tss" "rspamd" ]; # extraGroups = [ "networkmanager" "wheel" "sgx" "libvirtd" "tss" "rspamd" ];
# openssh.authorizedKeys.keys = [ # openssh.authorizedKeys.keys = [
# "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" # "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
# "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" # "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz"
# "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAYbUTKpy4QR3s944/hjJ1UK05asFEs/SmWeUbtS0cdA660sT4xHnRfals73FicOoz+uIucJCwn/SCM804j+wtM=" # "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAYbUTKpy4QR3s944/hjJ1UK05asFEs/SmWeUbtS0cdA660sT4xHnRfals73FicOoz+uIucJCwn/SCM804j+wtM="
# "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box" # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box"
# ]; # ];
# }; # };
# #
virtualisation = { virtualisation = {
podman = { podman = {
@ -149,25 +147,4 @@ appimage-run
defaultNetwork.settings = { dns_enabled = true; }; defaultNetwork.settings = { dns_enabled = true; };
}; };
}; };
programs.nix-ld.enable = true;
# Sets up all the libraries to load
programs.nix-ld.libraries = with pkgs; [
appimage-run
stdenv.cc.cc
libclang.lib
zlib
fuse3
fuse
icu
nss
curl
expat
freetype
glib
openssl
# ...
];
} }

30
systems/x86_64-linux/x1/hardware-configuration.nix
View file

@ -5,24 +5,34 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = boot.initrd.luks.devices.data = {
{ device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955"; device = "/dev/nvme0n1p5";
fsType = "btrfs"; preLVM = true;
options = [ "subvol=@" ]; };
boot.initrd.luks.devices.swap = {
device = "/dev/nvme0n1p5";
preLVM = true;
}; };
boot.initrd.luks.devices."luks-0e2792db-1b80-49a7-b2eb-54e4b5fc3502".device = "/dev/disk/by-uuid/0e2792db-1b80-49a7-b2eb-54e4b5fc3502";
fileSystems."/" =
{
device = "/dev/disk/by-uuid/ebb90474-ddcb-484b-9663-d71863827af4";
fsType = "ext4";
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/13C4-A825"; {
device = "/dev/disk/by-uuid/941C-7B02";
fsType = "vfat"; fsType = "vfat";
}; };
@ -33,9 +43,7 @@
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp82s0u1u3u4.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }