patrick/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Wiki Activity

feat: switched desktop

Browse source 
feat: sway is running
This commit is contained in:
Patrick Großmann 2023-09-01 20:07:03 +02:00
parent b0a8e65480
commit a4a076b901
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
21 changed files with 133 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -83,6 +83,11 @@
- Alternatively boot an official nixos image connect with password
3. Copy ISO to usb using dd
3. After booting copy the installer to the live system using `nix copy --to <target> .#packages.<target-system>.installer-package.<target>`
4. Run the installer script from the nix store of the live system
- you can get the path using `nix path-info .#packages.<target-system>.installer-package.<target>`
4. Export all zpools and reboot into system
6. Retrieve hostkeys using `ssh-keyscan <host> | grep -o 'ssh-ed25519.*' > host/<target>/secrets/host.pub
5. Deploy system using colmena
## Deploy

2
hosts/common/core/net.nix
View file

@ -1,4 +1,4 @@
{
{lib, ...}: {
networking = {
useNetworkd = true;
dhcpcd.enable = false;

2
hosts/common/core/system.nix
View file

@ -22,7 +22,7 @@
boot = {
initrd.systemd.enable = true;
initrd.systemd.emergencyAccess = true;
initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc"];
initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" "ahci" "uas"];
supportedFilesystems = ["ntfs"];
kernelModules = ["kvm-intel"];
tmp.useTmpfs = true;

5
hosts/common/graphical/hyprland.nix
View file

@ -1,5 +1,8 @@
{pkgs, ...}: {
programs.hyprland.enable = true;
programs.hyprland = {
enableNvidiaPatches = true;
enable = true;
};
services.dbus.enable = true;
xdg.portal = {
enable = true;

7
hosts/common/hardware/nvidia.nix
View file

@ -4,14 +4,13 @@
hardware = {
opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};
nvidia = {
powerManagement = {
enable = true;
finegrained = true;
};
powerManagement.enable = true;
modesetting.enable = true;
open = false;
};
};
}

1
hosts/desktopnix/default.nix
View file

@ -13,6 +13,7 @@
../common/hardware/bluetooth.nix
../common/hardware/intel.nix
../common/hardware/nvidia.nix
../common/hardware/physical.nix
../common/hardware/pipewire.nix
../common/hardware/yubikey.nix

2
hosts/desktopnix/fs.nix
View file

@ -47,4 +47,6 @@
panzer = defaultZpoolOptions // {datasets = {};};
};
};
boot.initrd.luks.devices.enc-rpool.allowDiscards = true;
boot.initrd.luks.devices.enc-infantry-fighting-vehicle.allowDiscards = true;
}

4
hosts/desktopnix/net.nix
View file

@ -7,6 +7,10 @@
DHCP = "yes";
matchConfig.MACAddress = config.secrets.secrets.local.networking.lan1.mac;
dns = ["192.168.178.2"];
networkConfig = {
IPv6PrivacyExtensions = "yes";
MulticastDNS = true;
};
};
};
}

0
hosts/desktopnix/secrets/host.pub Normal file
View file

BIN
hosts/desktopnix/secrets/secrets.nix.age
View file

Binary file not shown.

1
hosts/patricknix/fs.nix
View file

@ -23,4 +23,5 @@
rpool = defaultZpoolOptions // {datasets = defaultZfsDatasets;};
};
};
boot.initrd.luks.devices.enc-rpool.allowDiscards = true;
}

8
hosts/testienix/fs.nix
View file

@ -14,7 +14,7 @@
partitions = [
(partEfiBoot "boot" "0%" "1GiB")
(partSwap "swap" "1GiB" "17GiB")
(partLuksZfs "rpool" "rpool" "17GiB" "100%")
(lib.attrsets.recursiveUpdate (partLuksZfs "rpool" "rpool" "17GiB" "100%") {content.extraFormatArgs = ["--pbkdf pbkdf2"];})
];
};
};
@ -25,7 +25,7 @@
type = "table";
format = "gpt";
partitions = [
(partLuksZfs "panzer-1" "panzer" "0%" "100%")
(lib.attrsets.recursiveUpdate (partLuksZfs "panzer-1" "panzer" "0%" "100%") {content.extraFormatArgs = ["--pbkdf pbkdf2"];})
];
};
};
@ -36,7 +36,7 @@
type = "table";
format = "gpt";
partitions = [
(partLuksZfs "panzer-2" "panzer" "0%" "100%")
(lib.attrsets.recursiveUpdate (partLuksZfs "panzer-2" "panzer" "0%" "100%") {content.extraFormatArgs = ["--pbkdf pbkdf2"];})
];
};
};
@ -54,4 +54,6 @@
};
};
};
boot.initrd.luks.devices.enc-rpool.allowDiscards = true;
}

4
hosts/testienix/net.nix
View file

@ -7,6 +7,10 @@
DHCP = "yes";
matchConfig.MACAddress = config.secrets.secrets.local.networking.lan1.mac;
dns = ["192.168.178.2"];
networkConfig = {
IPv6PrivacyExtensions = "yes";
MulticastDNS = true;
};
};
};
}

1
hosts/testienix/secrets/host.pub Normal file
View file

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB9g6E+f7XMSE4V2YDdw5kZjWpV9o1G4JPKb6f3SHjO4

2
lib/disko.nix
View file

@ -28,7 +28,7 @@ inputs: self: super: {
content = {
type = "luks";
name = "enc-${name}";
extraOpenArgs = ["--allow-discard"];
extraOpenArgs = ["--allow-discards"];
content = {
type = "zfs";
inherit pool;

8
users/common/graphical.nix → users/common/graphical/default.nix
View file

@ -1,9 +1,9 @@
{pkgs, ...}: {
imports = [
./graphical/kitty.nix
./graphical/hyprland
./graphical/rofi.nix
./graphical/firefox.nix
./kitty.nix
./sway
./rofi.nix
./firefox.nix
];
home = {
packages = with pkgs; [

138
users/common/graphical/hyprland/hyprland.conf.nix
View file

@ -1,88 +1,94 @@
MOD: TAGS: pkgs:
''
general {
gaps_in = 1
gaps_out = 0
no_cursor_warps = true
general {
gaps_in = 1
gaps_out = 0
no_cursor_warps = true
}
input {
sensitivity = 0
kb_layout = de,de
kb_variant = bone,
repeat_rate = 60
repeat_delay = 235
# Only change focus on mouse click
follow_mouse = 2
float_switch_override_focus = 0
accel_profile = flat
touchpad {
natural_scroll = true
}
}
input {
sensitivity = 0
kb_layout = de,de
kb_variant = bone,
repeat_rate = 60
repeat_delay = 235
# Only change focus on mouse click
follow_mouse = 2
float_switch_override_focus = 0
accel_profile = flat
touchpad {
natural_scroll = true
}
}
gestures {
workspace_swipe = true
workspace_swipe_numbered = true
}
gestures {
workspace_swipe = true
workspace_swipe_numbered = true
}
misc {
disable_hyprland_logo = true
mouse_move_focuses_monitor = false
}
misc {
disable_hyprland_logo = true
mouse_move_focuses_monitor = false
}
binds {
focus_preferred_method = 1
}
binds {
focus_preferred_method = 1
}
# keybinds
bind=${MOD},q,killactive,
bind=${MOD},return,fullscreen,
bind=${MOD},f,togglefloating
bind=${MOD},tab,cyclenext,
bind=ALT,tab,cyclenext,
bind=,Menu,exec,rofi -show drun
# keybinds
bind=${MOD},q,killactive,
bind=${MOD},return,fullscreen,
bind=${MOD},f,togglefloating
bind=${MOD},tab,cyclenext,
bind=ALT,tab,cyclenext,
bind=,Menu,exec,rofi -show drun
bind=${MOD},left,movefocus,l
bind=${MOD},right,movefocus,r
bind=${MOD},up,movefocus,u
bind=${MOD},down,movefocus,d
bind=${MOD},left,movefocus,l
bind=${MOD},right,movefocus,r
bind=${MOD},up,movefocus,u
bind=${MOD},down,movefocus,d
bind=${MOD},n,movefocus,l
bind=${MOD},s,movefocus,r
bind=${MOD},l,movefocus,u
bind=${MOD},r,movefocus,d
bind=${MOD},n,movefocus,l
bind=${MOD},s,movefocus,r
bind=${MOD},l,movefocus,u
bind=${MOD},r,movefocus,d
bind=${MOD} + SHIFT,left,movewindow,l
bind=${MOD} + SHIFT,right,movewindow,r
bind=${MOD} + SHIFT,up,movewindow,u
bind=${MOD} + SHIFT,down,movewindow,d
bind=${MOD} + SHIFT,left,movewindow,l
bind=${MOD} + SHIFT,right,movewindow,r
bind=${MOD} + SHIFT,up,movewindow,u
bind=${MOD} + SHIFT,down,movewindow,d
bindm=${MOD},mouse:272,movewindow
bindm=${MOD},mouse:272,movewindow
bind=${MOD} + SHIFT,n,movewindow,l
bind=${MOD} + SHIFT,s,movewindow,r
bind=${MOD} + SHIFT,l,movewindow,u
bind=${MOD} + SHIFT,r,movewindow,d
bind=${MOD} + SHIFT,n,movewindow,l
bind=${MOD} + SHIFT,s,movewindow,r
bind=${MOD} + SHIFT,l,movewindow,u
bind=${MOD} + SHIFT,r,movewindow,d
bind=${MOD},comma,workspace,-1
bind=${MOD},period,workspace,+1
bind=${MOD},comma,workspace,-1
bind=${MOD},period,workspace,+1
bind=${MOD},b,exec,firefox
bind=${MOD},t,exec,kitty
bind=${MOD} + SHIFT,l,exec,systemctl suspend -i
bind=${MOD} + SHIFT,Escape,exit
#fix xwayland hidpi
exec-once = ${pkgs.xorg.xprop}/bin/xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2
env = GDK_SCALE,2
env = XCURSOR_SIZE,48
bind=${MOD},b,exec,firefox
bind=${MOD},t,exec,kitty
bind=${MOD} + SHIFT,l,exec,systemctl suspend -i
bind=${MOD} + SHIFT,Escape,exit
#fix xwayland hidpi
exec-once = ${pkgs.xorg.xprop}/bin/xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2
env = GDK_SCALE,2
env = XCURSOR_SIZE,48
workspace = eDP-1, 42
workspace = eDP-1, 42
exec-once=bash -c "waybar >/tmp/waybar_error.log"
env = LIBVA_DRIVER_NAME,nvidia
env = XDG_SESSION_TYPE,wayland
env = GBM_BACKEND,nvidia-drm
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
env = WLR_NO_HARDWARE_CURSORS,1
exec-once=bash -c "waybar >/tmp/waybar_error.log"
''
+ builtins.concatStringsSep "\n" (map (
x: ''

9
users/common/graphical/sway/default.nix Normal file
View file

@ -0,0 +1,9 @@
{config, ...}: {
wayland.windowManager.sway = {
enable = true;
config = {
modifier = "Mod4";
terminal = "kitty";
};
};
}

1
users/common/shells/alias.nix
View file

@ -24,6 +24,5 @@ _: {
rg = "rg -S";
zf = "zathura --fork";
hypr = "Hyprland";
};
}

4
users/patrick/default.nix
View file

@ -5,7 +5,7 @@
}: {
# enable nixos wide hyprland config
imports = [
../../hosts/common/graphical/hyprland.nix
#../../hosts/common/graphical/hyprland.nix
];
users.users.patrick = {
@ -31,7 +31,7 @@
./impermanence.nix
../common
../common/interactive.nix
../common/graphical.nix
../common/graphical
];
};
}

13
users/patrick/ssh.nix
View file

@ -16,12 +16,25 @@
user = "root";
inherit identityFile;
};
"patricknix" = {
hostname = "patricknix.local";
user = "root";
inherit identityFile;
};
"testienix" = {
hostname = "192.168.178.74";
user = "root";
inherit identityFile;
};
"desktopnix" = {
hostname = "192.168.178.176";
user = "root";
inherit identityFile;
};
"WSALVM" = {
hostname = "172.10.8.156";
user = "root";