From a2a7a57b524aee22068e9b5b9221bdefe6975685 Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 5 Nov 2024 10:25:03 -0800 Subject: [PATCH 1/4] yay --- hosts/shiroko/configuration.nix | 2 +- hosts/shiroko/hardware-configuration.nix | 12 ++++++------ users/kaitotlex/de/sway/default.nix | 4 ---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hosts/shiroko/configuration.nix b/hosts/shiroko/configuration.nix index 5beb954..64e3bdb 100644 --- a/hosts/shiroko/configuration.nix +++ b/hosts/shiroko/configuration.nix @@ -21,7 +21,7 @@ networking.hostName = "shiroko"; # Define your hostname. services.fprintd.enable = true; - services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.enable = false; services.actkbd = { enable = true; bindings = [ diff --git a/hosts/shiroko/hardware-configuration.nix b/hosts/shiroko/hardware-configuration.nix index d078726..e6a393c 100644 --- a/hosts/shiroko/hardware-configuration.nix +++ b/hosts/shiroko/hardware-configuration.nix @@ -8,26 +8,26 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/0b6e9715-5ce6-49d1-98f9-ea0a5d4237f9"; + { device = "/dev/disk/by-uuid/082ff607-f7a2-4909-95b3-c5c698f26de5"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-fef5cb12-a610-4701-9215-717caf0b27ad".device = "/dev/disk/by-uuid/fef5cb12-a610-4701-9215-717caf0b27ad"; + boot.initrd.luks.devices."luks-292cc751-7ae1-4a4b-8835-502760a9bf9f".device = "/dev/disk/by-uuid/292cc751-7ae1-4a4b-8835-502760a9bf9f"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A91B-FD09"; + { device = "/dev/disk/by-uuid/524F-2940"; fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/7beb9844-e0c3-44dc-998f-ee42e36b9543"; } + [ { device = "/dev/disk/by-uuid/94f5084c-2995-4a62-a492-9071c122bc08"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/users/kaitotlex/de/sway/default.nix b/users/kaitotlex/de/sway/default.nix index 07de918..b6074a4 100644 --- a/users/kaitotlex/de/sway/default.nix +++ b/users/kaitotlex/de/sway/default.nix @@ -62,9 +62,5 @@ ]; }; xwayland = true; - #extraConfigs = { - # keybindings = "bindsym XF86MonBrightnessDown exec brightnessctl -d amdgpu_bl2 set 10%- \n - # bindsym XF86MonBrightnessUp exec brightnessctl -d amdgpu_bl2 set 10%+"; - #}; }; } From d9a8fee795a57c03b01c5a4951777e3a483c92ef Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 5 Nov 2024 17:00:32 -0800 Subject: [PATCH 2/4] i need help --- hosts/shiroko/configuration.nix | 17 +---------------- users/kaitotlex/de/sway/default.nix | 8 ++++++++ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/hosts/shiroko/configuration.nix b/hosts/shiroko/configuration.nix index 64e3bdb..e23aeb9 100644 --- a/hosts/shiroko/configuration.nix +++ b/hosts/shiroko/configuration.nix @@ -13,7 +13,7 @@ ]; boot.initrd.luks.fido2Support = true; - + boot.kernelParams = [ "mem_sleep_default=deep" ]; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -22,21 +22,6 @@ services.fprintd.enable = true; services.desktopManager.plasma6.enable = false; - services.actkbd = { - enable = true; - bindings = [ - { - keys = [ 232 ]; - events = [ "key" ]; - command = "${pkgs.brightnessctl}/bin/brightnessctl set 1000"; - } - { - keys = [ 233 ]; - events = [ "key" ]; - command = "${pkgs.brightnessctl}/bin/brightnessctl set 1000-"; - } - ]; - }; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; diff --git a/users/kaitotlex/de/sway/default.nix b/users/kaitotlex/de/sway/default.nix index b6074a4..93cbfe6 100644 --- a/users/kaitotlex/de/sway/default.nix +++ b/users/kaitotlex/de/sway/default.nix @@ -62,5 +62,13 @@ ]; }; xwayland = true; + extraConfig = '' + bindsym XF86AudioRaiseVolume exec pamixer -i 5 + bindsym XF86AudioLowerVolume exec pamixer -d 5 + bindsym XF86AudioMute exec pamixer -t + bindsym XF86MonBrightnessUp exec brightnessctl s 5%+ + bindsym XF86MonBrightnessDown exec brightnessctl s 5%- + ''; }; + } From 00846c059f9cdf4fab5cbd68b2347714e7ec3b5b Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 5 Nov 2024 17:18:59 -0800 Subject: [PATCH 3/4] please --- hosts/shiroko/configuration.nix | 2 ++ users/kaitotlex/home.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hosts/shiroko/configuration.nix b/hosts/shiroko/configuration.nix index e23aeb9..bdb93f4 100644 --- a/hosts/shiroko/configuration.nix +++ b/hosts/shiroko/configuration.nix @@ -19,8 +19,10 @@ boot.loader.efi.canTouchEfiVariables = true; virtualisation.waydroid.enable = true; networking.hostName = "shiroko"; # Define your hostname. + security.pam.yubico.enable = true; services.fprintd.enable = true; + security.pam.services.login.fprintAuth = true; services.desktopManager.plasma6.enable = false; # Configure network proxy if necessary diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix index 0d48bcc..468fb0c 100644 --- a/users/kaitotlex/home.nix +++ b/users/kaitotlex/home.nix @@ -22,6 +22,8 @@ home.packages = with pkgs; [ # here is some command line tools I use frequently # feel free to add your own or remove some of them + + yubikey-personalization typst-live typst tmux From 211a0ef64b1fef669ccb55e74de5a2dda42d7861 Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 19 Nov 2024 08:07:14 -0800 Subject: [PATCH 4/4] Feat: The state of my mental health --- hosts/shiroko/configuration.nix | 46 ++++++++++++++++++++++++++--- users/kaitotlex/de/sway/default.nix | 9 +++++- users/kaitotlex/home.nix | 14 ++++++++- 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/hosts/shiroko/configuration.nix b/hosts/shiroko/configuration.nix index bdb93f4..5820b74 100644 --- a/hosts/shiroko/configuration.nix +++ b/hosts/shiroko/configuration.nix @@ -11,7 +11,8 @@ # Include the results of the hardware scan. ./hardware-configuration.nix ]; - + hardware.graphics.enable32Bit = true; + hardware.pulseaudio.support32Bit = true; boot.initrd.luks.fido2Support = true; boot.kernelParams = [ "mem_sleep_default=deep" ]; # Bootloader. @@ -19,10 +20,15 @@ boot.loader.efi.canTouchEfiVariables = true; virtualisation.waydroid.enable = true; networking.hostName = "shiroko"; # Define your hostname. - security.pam.yubico.enable = true; + #security yargen + # security.pam.yubico.enable = true; + services.fprintd = { + #tod.enable = true; + enable = true; + }; + security.pam.services.root.fprintAuth = true; - services.fprintd.enable = true; - security.pam.services.login.fprintAuth = true; + #If i become a twat services.desktopManager.plasma6.enable = false; # Configure network proxy if necessary @@ -32,6 +38,38 @@ # Enable networking networking.networkmanager.enable = true; + #Here's my Attempt of Sleep XD + systemd.sleep.extraConfig = '' + AllowSuspend=yes + AllowHibernation=yes + AllowHybridSleep=yes + AllowSuspendThenHibernate=yes + ''; + #Conclusion: Intel Hates Me + + #laptop Optmization + powerManagement.enable = true; + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "balance_performance"; + + CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_performance"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 20; + + #Optional helps save long term battery health + START_CHARGE_THRESH_BAT0 = 20; # 40 and bellow it starts to charge + STOP_CHARGE_THRESH_BAT0 = 95; # 80 and above it stops charging + + }; + }; + # Set your time zone. time.timeZone = "America/Los_Angeles"; diff --git a/users/kaitotlex/de/sway/default.nix b/users/kaitotlex/de/sway/default.nix index 93cbfe6..c538bd3 100644 --- a/users/kaitotlex/de/sway/default.nix +++ b/users/kaitotlex/de/sway/default.nix @@ -4,7 +4,7 @@ config = rec { terminal = "kitty"; modifier = "Mod4"; - menu = "rofi -show drun"; + menu = "rofi -show combi"; bars = [ { command = "waybar"; @@ -68,6 +68,13 @@ bindsym XF86AudioMute exec pamixer -t bindsym XF86MonBrightnessUp exec brightnessctl s 5%+ bindsym XF86MonBrightnessDown exec brightnessctl s 5%- + bindsym XF86AudioMicMute exec spotify + input "type:touchpad" { + natural_scroll enabled + tap enabled # enables click-on-tap + tap_button_map lrm # tap with 1 finger = left click, 2 fingers = right click, 3 fingers = middle click + dwt enabled # disable (touchpad) while typing + } ''; }; diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix index 468fb0c..b4d2fb8 100644 --- a/users/kaitotlex/home.nix +++ b/users/kaitotlex/home.nix @@ -22,7 +22,15 @@ home.packages = with pkgs; [ # here is some command line tools I use frequently # feel free to add your own or remove some of them - + xdg-desktop-portal-gtk + pavucontrol + ryujinx + unzip + sixpair + kdePackages.kio-fuse + kdePackages.kio-extras + kdePackages.qtsvg + kdePackages.qtwayland yubikey-personalization typst-live typst @@ -35,6 +43,7 @@ wineWowPackages.waylandFull wget vscode + melonDS gparted gnumake chromium @@ -50,7 +59,9 @@ nwg-displays dolphin xfce.thunar + tailwindcss + nodejs_22 clang macchanger ani-cli @@ -58,6 +69,7 @@ sherlock steam + blueman notion-app-enhanced # archives