diff --git a/home/Aloria.nix b/home/Aloria.nix index ca4e85a..f63a29f 100644 --- a/home/Aloria.nix +++ b/home/Aloria.nix @@ -36,9 +36,7 @@ in services.hyprpaper = { settings = { wallpaper = [ - "DP-1,${./hyprland/files/wallpaper.png}" - "DP-5,${./hyprland/files/wallpaper.png}" - "DP-6,${./hyprland/files/wallpaper.png}" + "HDMI-A-1,${./hyprland/files/wallpaper.png}" "eDP-1,${./hyprland/files/wallpaper.png}" ]; }; @@ -47,7 +45,7 @@ in wayland.windowManager.hyprland.settings = { monitor = [ "eDP-1,2880x1800@120.00Hz,0x0,1.2" - "DP-1,1920x1080@60,0x-1080,1" + "HDMI-A-1,1920x1080@60,0x-1080,1" ]; bind = [ ", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${ diff --git a/home/nvim/files/lua/plugins/avante.lua b/home/nvim/files/lua/plugins/avante.lua index a9a3c0e..b5e617d 100644 --- a/home/nvim/files/lua/plugins/avante.lua +++ b/home/nvim/files/lua/plugins/avante.lua @@ -52,9 +52,9 @@ return { -- Make sure to set this up properly if you have lazy=true 'MeanderingProgrammer/render-markdown.nvim', opts = { - file_types = { "markdown", "Avante" }, + file_types = { "Avante" }, }, - ft = { "markdown", "Avante" }, + ft = { "Avante" }, }, }, } diff --git a/home/nvim/files/lua/settings.lua b/home/nvim/files/lua/settings.lua index bf8ad84..038ad58 100644 --- a/home/nvim/files/lua/settings.lua +++ b/home/nvim/files/lua/settings.lua @@ -42,7 +42,7 @@ vim.opt.shada = "!,'2000,f1,<50,s10,h" vim.o.updatetime = 250 vim.opt.conceallevel = 2 vim.opt.foldmethod = "expr" -vim.opt.foldlevel = 0 +vim.opt.foldlevel = 1000 vim.opt.foldexpr = "getline(v:lnum)=~'^X-ExtEditorR'?1:0" vim.opt.wrap = true vim.opt.foldenable = false diff --git a/home/utils/desktop.nix b/home/utils/desktop.nix index e589fe0..b908622 100644 --- a/home/utils/desktop.nix +++ b/home/utils/desktop.nix @@ -22,7 +22,7 @@ element-desktop evince loupe - # gimp + gimp obs-studio inkscape gnome-calendar @@ -41,6 +41,7 @@ zip yubioath-flutter obsidian + nautilus ]; services.kdeconnect = { diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix index 635a810..70e1b10 100644 --- a/hosts/Aloria/default.nix +++ b/hosts/Aloria/default.nix @@ -20,6 +20,11 @@ in { services.logind.extraConfig = ''HandlePowerKey=ignore''; services.throttled.enable = true; + programs.steam = { + enable = true; + gamescopeSession.enable = true; + }; + networking.hostId = "4e859062"; networking.interfaces.wlan0.useDHCP = lib.mkDefault false; networking.wireless.iwd.enable = true; @@ -57,12 +62,6 @@ in { services.tlp = { enable = true; settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging }; diff --git a/hosts/Aloria/hardware-configuration.nix b/hosts/Aloria/hardware-configuration.nix index 8fe8717..b99a7d2 100644 --- a/hosts/Aloria/hardware-configuration.nix +++ b/hosts/Aloria/hardware-configuration.nix @@ -4,40 +4,59 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "rpool/root"; - fsType = "zfs"; - }; + fileSystems."/" = + { device = "rpool/root"; + fsType = "zfs"; + }; - fileSystems."/home" = - { device = "rpool/home"; - fsType = "zfs"; - }; + fileSystems."/home" = + { device = "rpool/home"; + fsType = "zfs"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5C58-A909"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5C58-A909"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - 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 - # 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.wlp0s20f3.useDHCP = lib.mkDefault true; + # 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.wlp0s20f3.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.trackpoint.enable = lib.mkDefault true; + hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable; + hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint"; + hardware.ipu6.enable = true; + hardware.ipu6.platform = "ipu6ep"; + # boot.kernelPackages = pkgs.linuxPackages_latest.extend ( self: super: { + # ipu6-drivers = super.ipu6-drivers.overrideAttrs ( + # final: previous: rec { + # src = builtins.fetchGit { + # url = "https://github.com/intel/ipu6-drivers.git"; + # ref = "master"; + # rev = "b4ba63df5922150ec14ef7f202b3589896e0301a"; + # }; + # patches = [ + # "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch" + # ] ; + # } + # ); + # } ); }