fix
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +0,0 @@
|
|||||||
nixos/hardware-configuration.nix
|
|
||||||
@@ -18,6 +18,8 @@
|
|||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
inputs.spicetify-nix.homeManagerModules.spicetify
|
inputs.spicetify-nix.homeManagerModules.spicetify
|
||||||
|
|
||||||
|
./programs/niri/niri.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
@@ -91,6 +93,7 @@
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
init.defaultBranch = "main";
|
||||||
user.name = "winter";
|
user.name = "winter";
|
||||||
user.email = "winterekisha@gmail.com";
|
user.email = "winterekisha@gmail.com";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ input {
|
|||||||
// Find more information on the wiki:
|
// Find more information on the wiki:
|
||||||
// https://yalter.github.io/niri/Configuration:-Outputs
|
// https://yalter.github.io/niri/Configuration:-Outputs
|
||||||
// Remember to uncomment the node by removing "/-"!
|
// Remember to uncomment the node by removing "/-"!
|
||||||
/-output "eDP-1" {
|
output "DP-2" {
|
||||||
// Uncomment this line to disable this output.
|
// Uncomment this line to disable this output.
|
||||||
// off
|
// off
|
||||||
|
|
||||||
@@ -85,10 +85,10 @@ input {
|
|||||||
// for the resolution.
|
// for the resolution.
|
||||||
// If the mode is omitted altogether or is invalid, niri will pick one automatically.
|
// 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.
|
// 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.
|
// 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:
|
// Transform allows to rotate the output counter-clockwise, valid values are:
|
||||||
// normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
|
// 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.
|
// 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
|
// If the position is unset or results in an overlap, the output is instead placed
|
||||||
// automatically.
|
// 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.
|
// Settings that influence how windows are positioned and sized.
|
||||||
// Find more information on the wiki:
|
// Find more information on the wiki:
|
||||||
@@ -269,6 +276,7 @@ layout {
|
|||||||
|
|
||||||
// This line starts waybar, a commonly used bar for Wayland compositors.
|
// This line starts waybar, a commonly used bar for Wayland compositors.
|
||||||
spawn-at-startup "waybar"
|
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:
|
// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
|
||||||
// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
|
// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
|
||||||
@@ -346,6 +354,12 @@ window-rule {
|
|||||||
clip-to-geometry true
|
clip-to-geometry true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
// helps steam compatibility
|
||||||
|
match app-id=r#"^steam_app_"#
|
||||||
|
open-fullscreen true
|
||||||
|
}
|
||||||
|
|
||||||
binds {
|
binds {
|
||||||
// Keys consist of modifiers separated by + signs, followed by an XKB key name
|
// 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
|
// 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; }
|
Mod+Shift+Slash { show-hotkey-overlay; }
|
||||||
|
|
||||||
// Suggested binds for running programs: terminal, app launcher, screen locker.
|
// 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"; }
|
Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
|
||||||
Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
|
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:
|
// And you can also move a whole workspace to another monitor:
|
||||||
// Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; }
|
// 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_Down { focus-workspace-down; }
|
||||||
Mod+Page_Up { focus-workspace-up; }
|
Mod+Page_Up { focus-workspace-up; }
|
||||||
Mod+U { focus-workspace-down; }
|
Mod+U { focus-workspace-down; }
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
xdg.configFile."niri/config.kdl".source = ./config.kdl;
|
||||||
|
}
|
||||||
|
|||||||
@@ -62,6 +62,10 @@
|
|||||||
|
|
||||||
# FIXME: Add the rest of your current configuration
|
# 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
|
# build home-manager with nixos-rebuild and not home-manager command
|
||||||
home-manager = {
|
home-manager = {
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = { inherit inputs; };
|
||||||
@@ -86,12 +90,32 @@
|
|||||||
services.displayManager.sddm.enable = true;
|
services.displayManager.sddm.enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
programs.niri.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
|
#general utils
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true; # Sets $EDITOR to nvim system-wide
|
defaultEditor = true; # Sets $EDITOR to nvim system-wide
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
configure = {
|
||||||
|
customRC = ''
|
||||||
|
set number
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
programs.git.enable = true;
|
programs.git.enable = true;
|
||||||
|
|
||||||
@@ -101,7 +125,7 @@
|
|||||||
"com.vivaldi.Vivaldi"
|
"com.vivaldi.Vivaldi"
|
||||||
"dev.vencord.Vesktop"
|
"dev.vencord.Vesktop"
|
||||||
#"com.github.tchx84.Flatseal"
|
#"com.github.tchx84.Flatseal"
|
||||||
#"com.heroicgameslauncher.hgl"
|
"com.heroicgameslauncher.hgl"
|
||||||
#"org.blender.Blender"
|
#"org.blender.Blender"
|
||||||
#"org.kde.krita"
|
#"org.kde.krita"
|
||||||
#"com.mojang.Minecraft"
|
#"com.mojang.Minecraft"
|
||||||
|
|||||||
39
nixos/hardware-configuration.nix
Normal file
39
nixos/hardware-configuration.nix
Normal file
@@ -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;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user