updated new user
This commit is contained in:
cnst
@@ -22,20 +22,26 @@ in {
|
||||
"mysql"
|
||||
"docker"
|
||||
"libvirtd"
|
||||
"qemu-libvirtd"
|
||||
"kvm"
|
||||
"network"
|
||||
"adbusers"
|
||||
"rtkit"
|
||||
"users"
|
||||
"plocate"
|
||||
];
|
||||
};
|
||||
|
||||
programs.dconf.enable = true;
|
||||
|
||||
imports = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
../core
|
||||
../services/adampad.nix
|
||||
../hardware/adampad.nix
|
||||
../locale/adampad.nix
|
||||
./imports.nix
|
||||
./system.nix
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
home-manager.users.adam = import ../../home/adam/home.nix;
|
||||
home-manager.users.adam = import ../../../home/users/adam/home.nix;
|
||||
nix = let
|
||||
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
|
||||
in {
|
||||
@@ -62,23 +68,18 @@ in {
|
||||
|
||||
# Bootloader
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
systemd-boot.enable = lib.mkForce false;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
# Enable networking
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
hostName = "adampad";
|
||||
};
|
||||
|
||||
# Garbage collector / Nix helper
|
||||
programs = {
|
||||
nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||
flake = "/home/adam/.nix-config";
|
||||
};
|
||||
environment.sessionVariables = {
|
||||
FLAKE = "/home/adam/.nix-config";
|
||||
};
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
|
||||
@@ -7,10 +7,8 @@
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
@@ -22,16 +20,17 @@
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
kernelModules = ["amdgpu"];
|
||||
};
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelModules = ["kvm-amd"];
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
consoleLogLevel = 3;
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
"amdgpu.ppfeaturemask=0xffffffff"
|
||||
];
|
||||
extraModulePackages = [ ];
|
||||
extraModulePackages = [];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
@@ -50,7 +49,7 @@
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
||||
85
nixos/hosts/adampad/imports.nix
Normal file
85
nixos/hosts/adampad/imports.nix
Normal file
@@ -0,0 +1,85 @@
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
# core
|
||||
../../core/adb.nix
|
||||
../../core/fonts.nix
|
||||
../../core/hyprland.nix
|
||||
../../core/zsh.nix
|
||||
|
||||
# hardware
|
||||
../../hardware/adampad.nix
|
||||
|
||||
# locale
|
||||
../../locale/adampad.nix
|
||||
|
||||
# services
|
||||
../../services/blueman.nix
|
||||
../../services/dbus.nix
|
||||
../../services/gnome-keyring.nix
|
||||
../../services/greetd.nix
|
||||
../../services/gvfs.nix
|
||||
../../services/mullvad.nix
|
||||
../../services/openssh.nix
|
||||
../../services/pipewire.nix
|
||||
../../services/udisks.nix
|
||||
../../services/xserver.nix
|
||||
../../services/locate.nix
|
||||
../../services/fwupd.nix
|
||||
|
||||
# extra
|
||||
#../../extra/gaming.nix
|
||||
#../../extra/workstation
|
||||
# ../../extra/nix-ld
|
||||
];
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
# Core
|
||||
fd
|
||||
git
|
||||
niv
|
||||
nix-output-monitor
|
||||
nvd
|
||||
sbctl
|
||||
|
||||
# Util
|
||||
anyrun
|
||||
curl
|
||||
fzf
|
||||
gnome-disk-utility
|
||||
killall
|
||||
lazygit
|
||||
ntfs3g
|
||||
p7zip
|
||||
ripgrep
|
||||
stow
|
||||
tmux
|
||||
tmuxifier
|
||||
tree-sitter
|
||||
udiskie
|
||||
unrar
|
||||
unzip
|
||||
wget
|
||||
wlroots
|
||||
xdg-user-dirs
|
||||
xdg-utils
|
||||
|
||||
# Dev
|
||||
binutils
|
||||
clang
|
||||
clang-tools
|
||||
cargo-edit
|
||||
cargo-insta
|
||||
cargo-nextest
|
||||
gcc
|
||||
gnumake
|
||||
cmake
|
||||
hyprlang
|
||||
python3
|
||||
python312Packages.httplib2
|
||||
python312Packages.oauth2
|
||||
gtk3
|
||||
gtk4
|
||||
];
|
||||
};
|
||||
}
|
||||
37
nixos/hosts/adampad/system.nix
Normal file
37
nixos/hosts/adampad/system.nix
Normal file
@@ -0,0 +1,37 @@
|
||||
{
|
||||
inputs,
|
||||
outputs,
|
||||
...
|
||||
}: {
|
||||
programs = {
|
||||
nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||
flake = "/home/adam/.nix-config";
|
||||
};
|
||||
};
|
||||
security.rtkit.enable = true;
|
||||
|
||||
environment.localBinInPath = true;
|
||||
|
||||
console.useXkbConfig = true;
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs outputs;
|
||||
};
|
||||
};
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
(_: prev: {
|
||||
python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
|
||||
})
|
||||
];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
input-fonts.acceptLicense = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -5,20 +5,20 @@ xkb_symbols "hhkbse" {
|
||||
|
||||
name[Group1]="Sweden - HHKBse";
|
||||
|
||||
key <AE01> {[ 1, exclam, paragraph, onehalf ]};
|
||||
key <AE02> {[ 2, quotedbl, at ]};
|
||||
key <AE01> {[ 1, exclam, section, onehalf ]};
|
||||
key <AE02> {[ 2, quotedbl, at, paragraph ]};
|
||||
key <AE03> {[ 3, numbersign, sterling ]};
|
||||
key <AE04> {[ 4, dollar, currency ]};
|
||||
key <AE05> {[ 5, percent, EuroSign ]};
|
||||
key <AE05> {[ 5, percent, EuroSign, permille ]};
|
||||
key <AE06> {[ 6, ampersand, yen, radical ]};
|
||||
key <AE07> {[ 7, slash, braceleft ]};
|
||||
key <AE08> {[ 8, parenleft, bracketleft ]};
|
||||
key <AE09> {[ 9, parenright, bracketright ]};
|
||||
key <AE10> {[ 0, equal, braceright ]};
|
||||
key <AE11> {[ plus, question, backslash, questiondown ]};
|
||||
key <AE11> {[ plus, question, backslash, plusminus ]};
|
||||
key <AE12> {[ Next, braceleft, Home ]};
|
||||
key <BKSL> {[ Prior, braceright, End ]};
|
||||
key <TLDE> {[ Delete, asterisk, asciicircum ]};
|
||||
key <TLDE> {[ Delete,asciicircum, asterisk ]};
|
||||
|
||||
key <AD01> {[ q, Q ]};
|
||||
key <AD02> {[ w, W ]};
|
||||
@@ -50,8 +50,8 @@ xkb_symbols "hhkbse" {
|
||||
key <AB04> {[ v, V ]};
|
||||
key <AB05> {[ b, B ]};
|
||||
key <AB06> {[ n, N ]};
|
||||
key <AB07> {[ m, M, mu ]};
|
||||
key <AB07> {[ m, M ]};
|
||||
key <AB08> {[ comma, semicolon ]};
|
||||
key <AB09> {[ period, colon ]};
|
||||
key <AB09> {[ period, colon, ellipsis ]};
|
||||
key <AB10> {[ minus, underscore, endash ]};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user