i3 updates
This commit is contained in:
Miguel Palhas
Generated
+3
-3
@@ -921,11 +921,11 @@
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751858709,
|
||||
"narHash": "sha256-xghd1GDPRSa6aD6tEk2JCuQDZWdHITlCA/stwSVoZJQ=",
|
||||
"lastModified": 1752468108,
|
||||
"narHash": "sha256-fOCyGg3nv2C9dC3W1WjU38iS8JmQ9+T/WPi29ssHZK4=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "216dd333fa41aa013bf8aab9322d7c1a2aee5b4a",
|
||||
"rev": "ea79cbda8e685dd0f9c6e88adcfa7762a83e9067",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -135,7 +135,7 @@ in
|
||||
"$mod" = "SUPER";
|
||||
|
||||
bind = [
|
||||
"$mod, t, exec, ghostty"
|
||||
"$mod, t, exec, kitty"
|
||||
"$mod, e, exec, thunar"
|
||||
"$mod, v, togglefloating"
|
||||
"$mod, q, killactive"
|
||||
|
||||
@@ -1,14 +1,50 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
package = pkgs.i3-gaps;
|
||||
config = {
|
||||
modifier = "Mod4";
|
||||
terminal = "${pkgs.kitty}/bin/kitty";
|
||||
gaps = {
|
||||
inner = 10;
|
||||
outer = 5;
|
||||
outer = 0;
|
||||
};
|
||||
keybindings =
|
||||
let
|
||||
modifier = config.xsession.windowManager.i3.config.modifier;
|
||||
in
|
||||
lib.mkOptionDefault {
|
||||
"${modifier}+h" = "focus left";
|
||||
"${modifier}+j" = "focus down";
|
||||
"${modifier}+k" = "focus up";
|
||||
"${modifier}+l" = "focus right";
|
||||
|
||||
"${modifier}+space" = "exec launcher_t2";
|
||||
};
|
||||
bars = [
|
||||
{
|
||||
position = "top";
|
||||
statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
|
||||
}
|
||||
];
|
||||
};
|
||||
extraConfig = ''
|
||||
smart_gaps on
|
||||
hide_edge_borders smart_no_gaps
|
||||
|
||||
for_window [class="kitty"] border none
|
||||
for_window [class="kitty"] gaps inner current set 0
|
||||
for_window [class="kitty"] gaps outer current set 0
|
||||
'';
|
||||
};
|
||||
|
||||
programs.i3status-rust = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -51,5 +51,29 @@
|
||||
"kitty_mod+k" = "neighboring_window up";
|
||||
"kitty_mod+l" = "neighboring_window right";
|
||||
};
|
||||
|
||||
extraConfig = ''
|
||||
background #1c1c1c
|
||||
foreground #ddeedd
|
||||
cursor #e2bbef
|
||||
selection_background #4d4d4d
|
||||
color0 #3d352a
|
||||
color8 #554444
|
||||
color1 #cd5c5c
|
||||
color9 #cc5533
|
||||
color2 #86af80
|
||||
1color10 #88aa22
|
||||
1color3 #e8ae5b
|
||||
1color11 #ffa75d
|
||||
1color4 #6495ed
|
||||
1color12 #87ceeb
|
||||
1color5 #deb887
|
||||
1color13 #996600
|
||||
1color6 #b0c4de
|
||||
1color14 #b0c4de
|
||||
1color7 #bbaa99
|
||||
2color15 #ddccbb
|
||||
2selection_foreground #1c1c1c
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -111,6 +111,7 @@
|
||||
swift.disabled = true;
|
||||
terraform.disabled = true;
|
||||
zig.disabled = true;
|
||||
dotnet.disabled = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -127,6 +128,14 @@
|
||||
fd
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
"ASDF_NODEJS_AUTO_ENABLE_COREPACK" = "true";
|
||||
};
|
||||
|
||||
home.file.".default-npm-packages".text = ''
|
||||
@anthropic-ai/claude-code
|
||||
'';
|
||||
|
||||
home.sessionPath = [
|
||||
"./.git/safe/../../node_modules/.bin"
|
||||
"./.git/safe/../../bin"
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
LIBVA_DRIVER_NAME = "nvidia";
|
||||
GDM_BACKEND = "nvidia-drm";
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
QT_SCALE_FACTOR = 2;
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
@@ -44,10 +43,6 @@
|
||||
"fullscreen, class:bevy-.*"
|
||||
];
|
||||
|
||||
# env = [
|
||||
# "GDK_SCALE, 2"
|
||||
# ];
|
||||
|
||||
render = {
|
||||
explicit_sync = 2;
|
||||
explicit_sync_kms = 0;
|
||||
@@ -93,6 +88,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
programs.kitty.settings.font_size = 14;
|
||||
|
||||
home = {
|
||||
username = lib.mkDefault "naps62";
|
||||
stateVersion = lib.mkDefault "24.05";
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
@@ -23,20 +24,36 @@ in
|
||||
monitor = [
|
||||
# monitor, res, position, scale, transform, rotation
|
||||
"HDMI-A-1, 3840x2160, 0x1620, 1.333333"
|
||||
"DP-3, 3840x2160, 0x0, 1.333333"
|
||||
"DP-1, 3840x2160, 0x0, 1.333333"
|
||||
# 300 instead of 0 is so that 'move left' actually focuses the bottom one instead of the top one
|
||||
# for some reason, that's the minimum value for which this works
|
||||
"DP-2, 3840x2160, 2880x180, 1.333333, transform, 1"
|
||||
];
|
||||
workspace = [
|
||||
"1, monitor=DP-2"
|
||||
"2, monitor=DP-3"
|
||||
"2, monitor=DP-1"
|
||||
"3, monitor=DP-2"
|
||||
"4, monitor=HDMI-A-1"
|
||||
"5, monitor=HDMI-A-1"
|
||||
];
|
||||
};
|
||||
|
||||
xsession.windowManager.i3 = {
|
||||
extraConfig = lib.mkAfter ''
|
||||
workspace 1 output HDMI-0
|
||||
workspace 2 output DP-2
|
||||
workspace 3 output DP-0
|
||||
'';
|
||||
|
||||
# config.bars = [
|
||||
# {
|
||||
# position = "top";
|
||||
# trayOutput = "DP-0";
|
||||
# statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
|
||||
# }
|
||||
# ];
|
||||
};
|
||||
|
||||
services.hyprpaper.settings.preload = [
|
||||
(builtins.toString wallpaper1)
|
||||
(builtins.toString wallpaper2)
|
||||
@@ -44,7 +61,7 @@ in
|
||||
];
|
||||
services.hyprpaper.settings.wallpaper = [
|
||||
"HDMI-A-1,${builtins.toString wallpaper1}"
|
||||
"DP-3,${builtins.toString wallpaper2}"
|
||||
"DP-1,${builtins.toString wallpaper2}"
|
||||
"DP-2,${builtins.toString wallpaper-vertical}"
|
||||
];
|
||||
}
|
||||
|
||||
@@ -5,18 +5,9 @@
|
||||
desktopManager = {
|
||||
gnome.enable = true;
|
||||
};
|
||||
xserver.windowManager = {
|
||||
i3 = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
dmenu
|
||||
i3status
|
||||
];
|
||||
};
|
||||
};
|
||||
xserver.windowManager.i3.enable = true;
|
||||
sysprof.enable = true;
|
||||
gnome = {
|
||||
evolution-data-server.enable = true;
|
||||
glib-networking.enable = true;
|
||||
gnome-keyring.enable = true;
|
||||
gnome-online-accounts.enable = true;
|
||||
|
||||
@@ -38,9 +38,14 @@
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# environment.variables = {
|
||||
# GDK_SCALE = 2;
|
||||
# };
|
||||
services.xserver.displayManager.sessionCommands = ''
|
||||
BOTTOM='HDMI-0'
|
||||
TOP='DP-0'
|
||||
RIGHT='DP-2'
|
||||
touch /home/naps62/foo
|
||||
${pkgs.xorg.xrandr}/bin/xrandr --output $BOTTOM --primary --mode 3840x2160 --pos 0x0 --rotate normal --output $TOP --mode 3840x2160 --above $BOTTOM --rotate normal --output $RIGHT --mode 3840x2160 --pos 3840x-1680 --rotate left
|
||||
${pkgs.xorg.xrandr}/bin/xrandr --dpi 160
|
||||
'';
|
||||
|
||||
users.users.naps62 = {
|
||||
isNormalUser = true;
|
||||
|
||||
@@ -1,63 +1,40 @@
|
||||
# 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,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"vmd"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"thunderbolt"
|
||||
"virtio-pci"
|
||||
];
|
||||
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" "virtio-pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c8b56d56-3482-48d4-a8dd-825c4c2cf10e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/1f8625f0-5e97-4679-9885-f7ef21d5351c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
"luks-51347cdc-de81-4132-b21c-f1d089e387eb".device =
|
||||
"/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb";
|
||||
"luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a".device =
|
||||
"/dev/disk/by-uuid/9ffb64c6-54c2-46f2-9df5-e42c33a52d1a";
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/AE7C-876F";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/D86A-A762";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/2c16b0a2-9b42-40d1-ada1-6b5e09525716"; }
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/mapper/luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; }
|
||||
];
|
||||
|
||||
# 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.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
Reference in New Issue
Block a user