From 1a700726e2e99d845f7e023370168781e5fa6965 Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 19 May 2024 20:03:19 +0000 Subject: [PATCH 1/4] Puenktchen hardware config --- hosts/Puenktchen/hardware-configuration.nix | 25 ++++++++++++++++++++ users/willifan/applications.nix | 2 +- users/willifan/graphical/hyprland/kanshi.nix | 13 +++------- vars/default.nix | 4 ++-- 4 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 hosts/Puenktchen/hardware-configuration.nix diff --git a/hosts/Puenktchen/hardware-configuration.nix b/hosts/Puenktchen/hardware-configuration.nix new file mode 100644 index 0000000..490c770 --- /dev/null +++ b/hosts/Puenktchen/hardware-configuration.nix @@ -0,0 +1,25 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + # 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix index f45027d..aa2d33f 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/applications.nix @@ -14,7 +14,7 @@ hyfetch enpass webcord - obsidian +# obsidian kicad ]; diff --git a/users/willifan/graphical/hyprland/kanshi.nix b/users/willifan/graphical/hyprland/kanshi.nix index bd704e9..b5c8616 100644 --- a/users/willifan/graphical/hyprland/kanshi.nix +++ b/users/willifan/graphical/hyprland/kanshi.nix @@ -21,31 +21,24 @@ { profile.name = "home"; profile.outputs = [ - { - criteria = "eDP-1"; - mode = "2256x1504"; - position = "0,384"; - scale = 1.6; - transform = "normal"; - } { criteria = "ViewSonic Corporation VX2705-2KP W6Z205100250"; mode = "2560x1440"; - position = "1410,384"; + position = "0,384"; scale = 1.25; transform = "normal"; } { criteria = "ViewSonic Corporation VX2705-2KP W6Z210400766"; mode = "2560x1440@143.91Hz"; - position = "3457,384"; + position = "2048,384"; scale = 1.25; transform = "normal"; } { criteria = "BNQ BenQ BL2283 CAM01567019"; mode = "1920x1080"; - position = "5505,0"; + position = "4096,0"; scale = 1.0; transform = "270"; } diff --git a/vars/default.nix b/vars/default.nix index 6ddc2df..3312995 100644 --- a/vars/default.nix +++ b/vars/default.nix @@ -1,6 +1,6 @@ { ... }: { username = "willifan"; - hostname = "Lenni"; + hostname = "Puenktchen"; email = "willifan@proton.me"; -} \ No newline at end of file +} From 152e38fe8c3db0adfd68a62aa8a35713a8fe2afa Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 20 May 2024 01:08:29 +0200 Subject: [PATCH 2/4] fix kanshi starting eww --- users/willifan/applications.nix | 4 ++++ users/willifan/graphical/hyprland/hyprland.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix index aa2d33f..4178a8b 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/applications.nix @@ -7,6 +7,10 @@ #probe-rs #cargo-binutils + bc + jq + xorg.xrandr + btop feh diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix index f0a2bb9..7fe54a0 100644 --- a/users/willifan/graphical/hyprland/hyprland.nix +++ b/users/willifan/graphical/hyprland/hyprland.nix @@ -3,6 +3,7 @@ home-manager.users.willifan = { wayland.windowManager.hyprland = { enable = true; + systemd.variables = ["--all"]; settings = { misc = { From 221f9e09cf47f0234009a567833393499627218c Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 20 May 2024 01:23:59 +0200 Subject: [PATCH 3/4] add VSCodium user config --- users/willifan/graphical/dev/vscodium.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/users/willifan/graphical/dev/vscodium.nix b/users/willifan/graphical/dev/vscodium.nix index 88ddabc..53b6d62 100644 --- a/users/willifan/graphical/dev/vscodium.nix +++ b/users/willifan/graphical/dev/vscodium.nix @@ -5,6 +5,10 @@ programs.vscode = { enable = true; package = pkgs.vscodium; + + userSettings = { + "[nix]"."editor.tabSize" = 2; + }; extensions = with pkgs.vscode-extensions; [ # System bbenoist.nix From 147a19d2e8c6ca3116ac60fe793485d63747ae03 Mon Sep 17 00:00:00 2001 From: willifan Date: Mon, 20 May 2024 01:28:35 +0200 Subject: [PATCH 4/4] add Steam --- users/willifan/graphical/default.nix | 1 + users/willifan/graphical/steam.nix | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 users/willifan/graphical/steam.nix diff --git a/users/willifan/graphical/default.nix b/users/willifan/graphical/default.nix index db1a023..4861497 100644 --- a/users/willifan/graphical/default.nix +++ b/users/willifan/graphical/default.nix @@ -9,6 +9,7 @@ ./firefox.nix ./kitty.nix + ./steam.nix ./thunar.nix ./thunderbird.nix ]; diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/steam.nix new file mode 100644 index 0000000..d7e6a9d --- /dev/null +++ b/users/willifan/graphical/steam.nix @@ -0,0 +1,6 @@ +{ pkgs, home-manager, ... }: +{ + programs.steam.enable = true; + + hardware.steam-hardware.enable = true; +} \ No newline at end of file