atagen/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qtile fixes

Browse source
This commit is contained in:
atagen 2024-01-05 22:30:38 +11:00
parent afa81c7a17
commit 64e0765933
6 changed files with 58 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

68
flake.lock generated
View file

@ -74,11 +74,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"lastModified": 1701473968,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
@ -227,11 +227,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1702485432,
"narHash": "sha256-3wcT7NGgH1Du9w+acJEnrorr49g2c2040m00FNNFLWs=",
"lastModified": 1703879161,
"narHash": "sha256-TNEsdsaCG1+PvGINrV/zw7emzwpfWiml4b77l2n5UEI=",
"owner": "helix-editor",
"repo": "helix",
"rev": "7c55190806f31595e18da2b56c8ca54d8f5b33b7",
"rev": "85fce2f5b6c9f35ab9d3361f3933288a28db83d4",
"type": "github"
},
"original": {
@ -247,11 +247,11 @@
]
},
"locked": {
"lastModified": 1702510888,
"narHash": "sha256-+7Bd9j47gDjD1DD0K9zKwA+8TjnTdTRGMVCERh6w2L0=",
"lastModified": 1704100519,
"narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5e9d1fe19f2d17cdfeb3b7e5e668f763e430cd28",
"rev": "6e91c5df192395753d8e6d55a0352109cb559790",
"type": "github"
},
"original": {
@ -283,11 +283,11 @@
]
},
"locked": {
"lastModified": 1702291765,
"narHash": "sha256-kfxavgLKPIZdYVPUPcoDZyr5lleymrqbr5G9PVfQ2NY=",
"lastModified": 1703992163,
"narHash": "sha256-709CGmwU34dxv8DjSpRBZ+HibVJIVaFcA4JH+GFnhyM=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "45d82e0a8b9dd6c5dd9da835ac0c072239af7785",
"rev": "d6510ce144f5da7dd9bac667ba3d5a4946c00d11",
"type": "github"
},
"original": {
@ -361,11 +361,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1699966122,
"narHash": "sha256-zEN3ET7jfXpIKYeYh/z4xekOBOoaFS+n0q3oL3sVh+0=",
"lastModified": 1704177155,
"narHash": "sha256-9i1Smaqll8x1jxMkALl42qYhBuJd+SzDMQN2ybVlC2c=",
"owner": "nix-community",
"repo": "nixd",
"rev": "b3bb9ea7cd3c2f07c89779a474d6468b2c11e303",
"rev": "09404c1ab9cbc3fe322881fc123d2cd63d84bdd8",
"type": "github"
},
"original": {
@ -408,11 +408,11 @@
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1685564631,
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
},
"original": {
@ -477,11 +477,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1702221085,
"narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=",
"lastModified": 1704018918,
"narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af",
"rev": "2c9c58e98243930f8cb70387934daa4bc8b00373",
"type": "github"
},
"original": {
@ -493,11 +493,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686398752,
"narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
"lastModified": 1703134684,
"narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
"rev": "d6863cbcbbb80e71cecfc03356db1cda38919523",
"type": "github"
},
"original": {
@ -509,11 +509,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"lastModified": 1703961334,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
"type": "github"
},
"original": {
@ -525,11 +525,11 @@
},
"nur": {
"locked": {
"lastModified": 1702511108,
"narHash": "sha256-DypYWfpRqMLFX8euXxJ4yzLcemBRMtJdeVcXwEMZ3BA=",
"lastModified": 1704199801,
"narHash": "sha256-sg+RrgeW6sTn8x4XKLtz9Yxczq1gbHMf3O3OWTY6HNI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5ced9941645336c3cca15e4a679d7106625a2c7f",
"rev": "6a4c627e8b6504f328d60a0cb1f373f6f6e3f40e",
"type": "github"
},
"original": {
@ -610,7 +610,7 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-LmTjzgFeOoaZS9Z1McM5B1MpJqk4TLNCtrC7m2xb4tg=",
"narHash": "sha256-NsjihT3fK5KekJ4YFrIxJ7ibc7bCYS77V2fOYuy/CuQ=",
"path": "flakes/qtile",
"type": "path"
},
@ -687,11 +687,11 @@
]
},
"locked": {
"lastModified": 1702433821,
"narHash": "sha256-Kxv+dRbzj1fLQG0fyF/H6nswda6cN48r6kjctysnY4o=",
"lastModified": 1704075545,
"narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "cb9016d3a569100a609bb92c0a45beb9e23cd4eb",
"rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5",
"type": "github"
},
"original": {

18
flakes/qtile/flake.nix
View file

@ -88,13 +88,17 @@
wayland
xorg.xcbutilwm
# inputs'.scenefx.packages.default
(wlroots.overrideAttrs (wf: wp: {
postPatch =
wp.postPatch
+ ''
substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
'';
}))
((wlroots_0_16.override {
xwayland = xwayland;
enableXWayland = true;
})
.overrideAttrs (wf: wp: {
postPatch =
wp.postPatch
+ ''
substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
'';
}))
];
# patches = [./scenefx.patch];
makeWrapperArgs = [

3
home/dots/qtile/autostart.sh
View file

@ -9,4 +9,5 @@ xrdb -l ~/.Xresources &
# gsettings set org.gnome.desktop.interface font-name '${rice.fonts.sans.name}'";}
# gsettings set org.gnome.desktop.interface icon-theme '${rice.icons.name}'";}
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL; systemctl --user start qtile-session.target
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL
systemctl --user start qtile-session.target

12
home/dots/qtile/config.py
View file

@ -136,24 +136,24 @@ groups.append(
Apps.term,
width=2.0 / 3.0,
height=2.0 / 3.0,
x=0.5 / 3.0,
y=0.5 / 3.0,
x=1.0 / 6.0,
y=1.0 / 6.0,
),
DropDown(
"pass",
Apps.passmgr,
width=1.0 / 2.0,
height=2.0 / 3.0,
x=0.5 / 2.0,
y=0.5 / 3.0,
x=1.0 / 4.0,
y=1.0 / 6.0,
),
DropDown(
"music",
Apps.music,
width=2.0 / 3.0,
height=2.0 / 3.0,
x=0.5 / 3.0,
y=0.5 / 3.0,
x=1.0 / 6.0,
y=1.0 / 6.0,
),
],
)

1
home/home.nix
View file

@ -12,7 +12,6 @@ in {
home.stateVersion = "22.11";
imports = [
# ./programs/eww/default.nix
./programs/helix.nix
./programs/wlogout.nix
./programs/fuzzel.nix

37
system/adrift.nix
View file

@ -23,7 +23,6 @@
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = ["iwlwifi" "kvm-intel"];
boot.extraModulePackages = [pkgs.linuxPackages.system76-scheduler];
boot.kernelPackages = pkgs.linuxPackages;
fileSystems."/boot" = {
@ -32,16 +31,13 @@
};
fileSystems."/" = {
device = "/dev/mapper/nix-os";
device = "thing goes here";
fsType = "ext4";
};
fileSystems."/home" = {
device = "/dev/mapper/nix-home";
fsType = "ext4";
};
swapDevices = [];
swapDevices = [
"update this"
];
boot.loader.systemd-boot.configurationLimit = 2;
boot.loader.efi.canTouchEfiVariables = true;
@ -54,6 +50,7 @@
services.tlp.enable = true;
environment.sessionVariables = rec {
NIXOS_OZONE_WL = "1";
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5";
EDITOR = "hx";
};
@ -69,29 +66,6 @@
services.xserver.videoDrivers = ["i915"];
programs.xwayland.enable = true;
# systemd.services."com.system76.Scheduler" = {
# wantedBy = ["multi-user.target"];
# description = "the system76 process scheduler";
# serviceConfig = {
# Type = "dbus";
# ExecStart = ''${pkgs.system76-scheduler}/bin/system76-scheduler daemon'';
# ExecReload = ''${pkgs.system76-scheduler}/bin/system76-scheduler daemon reload'';
# BusName = "com.system76.Scheduler";
# };
# };
services.dbus.packages = [
pkgs.linuxPackages.system76-scheduler
];
systemd.packages = [
pkgs.linuxPackages.system76-scheduler
];
environment.etc = {
"system76-scheduler".source = "${pkgs.linuxPackages.system76-scheduler}/etc/system76-scheduler";
};
# xdg.portal = {
# enable = true;
# wlr = {
@ -111,7 +85,6 @@
# };
environment.systemPackages = with pkgs; [
openrgb
wl-clipboard
wl-clipboard-x11
xclip