From c67e7d779cf0f78644fcdd12c9c6a2791471459b Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 27 May 2026 18:04:34 -0700 Subject: [PATCH] fix --- .gitignore | 1 - home-manager/luke.nix | 3 +++ home-manager/programs/niri/config.kdl | 29 +++++++++++++++----- home-manager/programs/niri/niri.nix | 5 ++++ nixos/configuration.nix | 26 +++++++++++++++++- nixos/hardware-configuration.nix | 39 +++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 8 deletions(-) delete mode 100644 .gitignore create mode 100644 nixos/hardware-configuration.nix diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1093752..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -nixos/hardware-configuration.nix diff --git a/home-manager/luke.nix b/home-manager/luke.nix index 48095cd..82b5763 100644 --- a/home-manager/luke.nix +++ b/home-manager/luke.nix @@ -18,6 +18,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix inputs.spicetify-nix.homeManagerModules.spicetify + + ./programs/niri/niri.nix ]; nixpkgs = { @@ -91,6 +93,7 @@ programs.git = { enable = true; settings = { + init.defaultBranch = "main"; user.name = "winter"; user.email = "winterekisha@gmail.com"; }; diff --git a/home-manager/programs/niri/config.kdl b/home-manager/programs/niri/config.kdl index 713d66f..9ada582 100644 --- a/home-manager/programs/niri/config.kdl +++ b/home-manager/programs/niri/config.kdl @@ -75,7 +75,7 @@ input { // Find more information on the wiki: // https://yalter.github.io/niri/Configuration:-Outputs // Remember to uncomment the node by removing "/-"! -/-output "eDP-1" { +output "DP-2" { // Uncomment this line to disable this output. // off @@ -85,10 +85,10 @@ input { // for the resolution. // If the mode is omitted altogether or is invalid, niri will pick one automatically. // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. - mode "1920x1080@120.030" + mode "2560x1440@144.000" // You can use integer or fractional scale, for example use 1.5 for 150% scale. - scale 2 + scale 1 // Transform allows to rotate the output counter-clockwise, valid values are: // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. @@ -103,8 +103,15 @@ input { // so to put another output directly adjacent to it on the right, set its x to 1920. // If the position is unset or results in an overlap, the output is instead placed // automatically. - position x=1280 y=0 + position x=0 y=0 + variable-refresh-rate on-demand=true } +output "DP-1"{ + mode "1920x1080@60.000" + transform "90" + position x=-1080 y=-240 +} + // Settings that influence how windows are positioned and sized. // Find more information on the wiki: @@ -269,6 +276,7 @@ layout { // This line starts waybar, a commonly used bar for Wayland compositors. spawn-at-startup "waybar" +spawn-at-startup "mako --default-timeout=5000" // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" @@ -346,6 +354,12 @@ window-rule { clip-to-geometry true } +window-rule { + // helps steam compatibility + match app-id=r#"^steam_app_"# + open-fullscreen true +} + binds { // Keys consist of modifiers separated by + signs, followed by an XKB key name // in the end. To find an XKB name for a particular key, you may use a program @@ -362,7 +376,7 @@ binds { Mod+Shift+Slash { show-hotkey-overlay; } // Suggested binds for running programs: terminal, app launcher, screen locker. - Mod+T hotkey-overlay-title="Open a Terminal: alacritty" { spawn "kitty"; } + Mod+T hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; } Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } @@ -455,7 +469,10 @@ binds { // And you can also move a whole workspace to another monitor: // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } // ... - +//TODO: +//y -> monitor left +//o -> monitor right +// get rid of Page* Mod+Page_Down { focus-workspace-down; } Mod+Page_Up { focus-workspace-up; } Mod+U { focus-workspace-down; } diff --git a/home-manager/programs/niri/niri.nix b/home-manager/programs/niri/niri.nix index e69de29..0ef0324 100644 --- a/home-manager/programs/niri/niri.nix +++ b/home-manager/programs/niri/niri.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + xdg.configFile."niri/config.kdl".source = ./config.kdl; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 8b88b9a..4075f72 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -62,6 +62,10 @@ # FIXME: Add the rest of your current configuration + networking.extraHosts = " + 10.0.0.194 thearcticcircle.ddns.net + "; + # build home-manager with nixos-rebuild and not home-manager command home-manager = { extraSpecialArgs = { inherit inputs; }; @@ -86,12 +90,32 @@ services.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; programs.niri.enable = true; + programs.gamescope.enable = true; + + environment.systemPackages = with pkgs; [ + # Steam proton extras + protonplus + # Niri extras + xwayland-satellite + fuzzel + swaylock + waybar + brightnessctl + playerctl + mako + swaylock + ]; #general utils programs.neovim = { enable = true; defaultEditor = true; # Sets $EDITOR to nvim system-wide vimAlias = true; + configure = { + customRC = '' + set number + ''; + }; }; programs.git.enable = true; @@ -101,7 +125,7 @@ "com.vivaldi.Vivaldi" "dev.vencord.Vesktop" #"com.github.tchx84.Flatseal" - #"com.heroicgameslauncher.hgl" + "com.heroicgameslauncher.hgl" #"org.blender.Blender" #"org.kde.krita" #"com.mojang.Minecraft" diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix new file mode 100644 index 0000000..c75774b --- /dev/null +++ b/nixos/hardware-configuration.nix @@ -0,0 +1,39 @@ +# 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 = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/05ca00ef-287b-46a6-87a3-242c26d4f6dc"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/74E9-DC7F"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + + #Steam parition to fstab + fileSystems."/mnt/steamstorage" = { + device = "/dev/disk/by-uuid/4d405cb8-1082-46ef-9248-f10709b85ba9"; + fsType = "ext4"; + options = [ "nofail" "rw" "user" "exec" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}