kekl
This commit is contained in:
meml0rz
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, pkgs-stable, ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
@ -18,11 +18,20 @@
|
||||
font = "Lat2-Terminus16";
|
||||
useXkbConfig = true;
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal-hyprland
|
||||
];
|
||||
};
|
||||
|
||||
services = {
|
||||
pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
mullvad-vpn = {
|
||||
enable = true;
|
||||
@ -93,7 +102,6 @@
|
||||
nodejs
|
||||
gccgo14
|
||||
go
|
||||
|
||||
nixd
|
||||
|
||||
# radio
|
||||
@ -116,7 +124,11 @@
|
||||
libimobiledevice
|
||||
usbmuxd
|
||||
|
||||
]);
|
||||
])
|
||||
++
|
||||
(with pkgs-stable; [
|
||||
|
||||
]);
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
|
||||
@ -8,18 +8,18 @@
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
{ device = "/dev/disk/by-uuid/0869359e-4c7e-4410-aab0-55bc72a45e0b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/ESP";
|
||||
{ device = "/dev/disk/by-uuid/7C74-E1AE";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
@ -31,10 +31,8 @@
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wwp0s20f0u3i12.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
||||
@ -3,14 +3,34 @@
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
settings = {
|
||||
"monitor" = "eDP-1, 1920x1080@60, 0x0, 1";
|
||||
extraConfig = ''
|
||||
windowrulev2 = opacity 0.0 override, class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = noanim, class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = noinitialfocus, class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = maxsize 1 1, class:^(xwaylandvideobridge)$
|
||||
windowrulev2 = noblur, class:^(xwaylandvideobridge)$
|
||||
|
||||
bindel = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
|
||||
bindel = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
|
||||
bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
|
||||
bindl = , XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause
|
||||
bindl = , XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous
|
||||
bindl = , XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next
|
||||
|
||||
'';
|
||||
settings = {
|
||||
"monitor" = "HDMI-A-2, 2560x1440@144, 0x0, 1";
|
||||
"$mod" = "SUPER";
|
||||
bind = [
|
||||
exec-once = [
|
||||
"waybar &"
|
||||
"${pkgs.swaybg}/bin/swaybg -i ~/.wp/temple.png"
|
||||
];
|
||||
bind = [
|
||||
"$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty"
|
||||
"$mod, space, exec, ${pkgs.wofi}/bin/wofi --show drun"
|
||||
"$mod, Q, killactive"
|
||||
|
||||
"$mod SHIFT, space, togglefloating"
|
||||
|
||||
"$mod, 1, workspace, 1"
|
||||
"$mod, 2, workspace, 2"
|
||||
"$mod, 3, workspace, 3"
|
||||
@ -21,19 +41,32 @@
|
||||
"$mod, 8, workspace, 8"
|
||||
"$mod, 9, workspace, 9"
|
||||
|
||||
"bind = $mod SHIFT, 1, movetoworkspace, 1"
|
||||
"bind = $mod SHIFT, 2, movetoworkspace, 2"
|
||||
"bind = $mod SHIFT, 3, movetoworkspace, 3"
|
||||
"bind = $mod SHIFT, 4, movetoworkspace, 4"
|
||||
"bind = $mod SHIFT, 5, movetoworkspace, 5"
|
||||
"bind = $mod SHIFT, 6, movetoworkspace, 6"
|
||||
"bind = $mod SHIFT, 7, movetoworkspace, 7"
|
||||
"bind = $mod SHIFT, 8, movetoworkspace, 8"
|
||||
"bind = $mod SHIFT, 9, movetoworkspace, 9"
|
||||
|
||||
"$mod SHIFT, 1, movetoworkspace, 1"
|
||||
"$mod SHIFT, 2, movetoworkspace, 2"
|
||||
"$mod SHIFT, 3, movetoworkspace, 3"
|
||||
"$mod SHIFT, 4, movetoworkspace, 4"
|
||||
"$mod SHIFT, 5, movetoworkspace, 5"
|
||||
"$mod SHIFT, 6, movetoworkspace, 6"
|
||||
"$mod SHIFT, 7, movetoworkspace, 7"
|
||||
"$mod SHIFT, 8, movetoworkspace, 8"
|
||||
"$mod SHIFT, 9, movetoworkspace, 9"
|
||||
|
||||
#"bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
#"bind = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
#"bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
#"bind = ,XF86AudioPlay, exec, playerctl play-pause"
|
||||
#"bind = ,XF86AudioPrev, exec, playerctl previous"
|
||||
#"bind = ,XF86AudioNext, exec, playerctl next"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
"$mod, mouse:272, movewindow"
|
||||
"$mod, mouse:273, resizewindow"
|
||||
"$mod ALT, mouse:272, resizewindow"
|
||||
];
|
||||
|
||||
decoration = {
|
||||
rounding = 0;
|
||||
rounding = 2;
|
||||
};
|
||||
general = {
|
||||
gaps_in = 8;
|
||||
@ -43,7 +76,7 @@
|
||||
};
|
||||
input = {
|
||||
kb_layout = "us";
|
||||
natural_scroll = true;
|
||||
natural_scroll = false;
|
||||
};
|
||||
gestures = {
|
||||
workspace_swipe = true;
|
||||
|
||||
@ -4,36 +4,11 @@
|
||||
nixvim.homeManagerModules.nixvim
|
||||
./cmp.nix
|
||||
./lsp.nix
|
||||
./neotree.nix
|
||||
];
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
colorschemes.oxocarbon.enable = true;
|
||||
extraConfigLua = ''
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<C-Left>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||
}),
|
||||
'';
|
||||
|
||||
plugins = {
|
||||
lualine = {
|
||||
|
||||
16
modules/nix/nvim/neotree.nix
Normal file
16
modules/nix/nvim/neotree.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{}:
|
||||
{
|
||||
programs.nixvim = {
|
||||
plugins = {
|
||||
neo-tree = {
|
||||
enable = true;
|
||||
enableDiagnostics = true;
|
||||
enableGitStatus = true;
|
||||
window = {
|
||||
position = "right";
|
||||
width = "45"
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 0px;
|
||||
font-family: RobotoMono Nerd Font;
|
||||
font-size: 14px;
|
||||
font-family: Terminus Nerd Font;
|
||||
font-size: 15px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user