reidlab/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: reidlab:ae0689bd24bd76f2edad55876d28c3ffe17f38b9
Branches Tags
reidlab:main
..
compare: reidlab:da23ac3ba194c72a5ea120d50d905ae6d58855e4
Branches Tags
reidlab:main

2 commits
ae0689bd24 ... da23ac3ba1

Author SHA1 Message Date
Reid "reidlab
da23ac3ba1 install fzf 2024-05-21 20:39:51 -07:00
Reid "reidlab
c29ddbdac7 add nvidia vaapi driver to extrapackages32 2024-05-21 20:07:46 -07:00
11 changed files with 133 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -15,6 +15,8 @@ in {
++ (mapModulesRec' (toString ./modules) import); ++ (mapModulesRec' (toString ./modules) import);
hm.imports = [ hm.imports = [
inputs.hyprlock.homeManagerModules.hyprlock
inputs.hypridle.homeManagerModules.hypridle
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
]; ];
@ -39,13 +41,11 @@ in {
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nixpkgs-wayland.cachix.org" "https://nixpkgs-wayland.cachix.org"
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://hydra.soopy.moe"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"hydra.soopy.moe:IZ/bZ1XO3IfGtq66g+C85fxU/61tgXLaJ2MlcGGXU8Q="
]; ];
}; };
}; };
@ -55,7 +55,7 @@ in {
hm.home.stateVersion = config.system.stateVersion; hm.home.stateVersion = config.system.stateVersion;
boot = { boot = {
kernelPackages = mkDefault pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = ["pci_aspm.policy=performance"]; kernelParams = ["pci_aspm.policy=performance"];
}; };

122
flake.lock generated
View file

@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1716179347, "lastModified": 1710544781,
"narHash": "sha256-DPiP4yLRcPgWgrnCC/tRp5vUk9teZIfsCT2r8jr1V8A=", "narHash": "sha256-nkxihb3D85k1nZV1CzlB3seMKtTEeKb688sblIGp/Bs=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "vscode", "repo": "vscode",
"rev": "b7a8806f7532a091b0170f281dbc7f35c3fc7761", "rev": "d7b96ccac36fd29929bd97bc9357413cc4e0240c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1716173274, "lastModified": 1711352745,
"narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1711604890,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716327911, "lastModified": 1713612213,
"narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,11 +121,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1716309977, "lastModified": 1713472482,
"narHash": "sha256-4jDQIcMDSFOOMBxVTEiC6Ck1vdc0kAFvv+StxnnE59Q=", "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "cb169c4e06cec9b4349e3668427e729d22328a54", "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1716417827, "lastModified": 1715027791,
"narHash": "sha256-TYHpA/i9+Ns01+RzknJ5eYskQXL9GTTA7JX9Lo4JKVg=", "narHash": "sha256-9wO+A4oOWpf0WtJ/iIzxy1mwXXfWuKHPW+E3wmsCI0k=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "7ad9116de8d0b7dac27eaf080bd92998a8fb40e5", "rev": "0c446ec5f4c39599ea97cb703dd3ac7718fb9169",
"revCount": 4728, "revCount": 4621,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -162,11 +162,11 @@
"hyprland-catppuccin": { "hyprland-catppuccin": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712161758, "lastModified": 1702668781,
"narHash": "sha256-XTqpmucOeHUgSpXQ0XzbggBFW+ZloRD/3mFhI+Tq4O8=", "narHash": "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "hyprland", "repo": "hyprland",
"rev": "b57375545f5da1f7790341905d1049b1873a8bb3", "rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691753796, "lastModified": 1714869498,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +236,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715791527, "lastModified": 1713121246,
"narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -277,11 +277,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1713121246, "lastModified": 1711250455,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,11 +297,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1716309918, "lastModified": 1713978374,
"narHash": "sha256-XWjBbAsWctkpinaoot+5g0VcO1CmiS90IkL+CGz67DQ=", "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "ba4b08e5f5dacc38af083ef89f8c8c489a900068", "rev": "415262065fff0a04b229cd00165f346a86a0a73a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,11 +317,11 @@
"systems": "systems_7" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1716311836, "lastModified": 1712919696,
"narHash": "sha256-HWsl4uUqEOvrvm8QCNKJWBP2xB3irsy+xMvyvLVHITk=", "narHash": "sha256-93zNQy4LGFP5h/GrQJctd8cPE0VdCDsWigTOx2effrE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "678d0e8959cf7adbc3825d578595e82305573991", "rev": "02ee7ff3bbd9cba72f26be7b09dde4a89fc31c21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716058375, "lastModified": 1714755542,
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "3afed4364790aebe0426077631af1e164a9650cc", "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,11 +376,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1707268954,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +423,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1716330097, "lastModified": 1714253743,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,11 +471,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1711163522,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -487,11 +487,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1716330097, "lastModified": 1715266358,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -644,11 +644,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1716362227, "lastModified": 1714680561,
"narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", "narHash": "sha256-ov7v4OaiMW6gylMFTjKXXtoxrgAjtOTHa09oFmu3B3s=",
"owner": "Alexays", "owner": "Alexays",
"repo": "Waybar", "repo": "Waybar",
"rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", "rev": "0b6476da32d181ee6b2cabdc5205a46a90521a75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -660,11 +660,11 @@
"waybar-catppuccin": { "waybar-catppuccin": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711907468, "lastModified": 1678438606,
"narHash": "sha256-9lY+v1CTbpw2lREG/h65mLLw5KuT8OJdEPOb+NNC6Fo=", "narHash": "sha256-WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "waybar", "repo": "waybar",
"rev": "0830796af6aa64ce8bc7453d42876a628777ac68", "rev": "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -690,11 +690,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716290197, "lastModified": 1714060055,
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -37,10 +37,7 @@
config.allowAliases = false; config.allowAliases = false;
overlays = extraOverlays ++ (lib.attrValues self.overlays); overlays = extraOverlays ++ (lib.attrValues self.overlays);
}; };
pkgs = mkPkgs nixpkgs [ pkgs = mkPkgs nixpkgs [ self.overlays.default inputs.catppuccin-vsc.overlays.default ];
self.overlays.default
#inputs.catppuccin-vsc.overlays.default
];
lib = nixpkgs.lib.extend (final: prev: { lib = nixpkgs.lib.extend (final: prev: {
my = import ./lib { my = import ./lib {

61
hosts/goopnet-interface/hardware.nix
View file

@ -3,13 +3,8 @@
{ {
imports = imports =
[ [
inputs.hardware.nixosModules.common-cpu-intel inputs.hardware.nixosModules.common-cpu-intel-cpu-only
inputs.hardware.nixosModules.common-pc-laptop-ssd inputs.hardware.nixosModules.common-gpu-nvidia-nonprime
inputs.hardware.nixosModules.common-pc-laptop
# this will override your kernel!!!
# use this on macs with t2 chips to get screen, keyboard, trackpad,
# camera, touchbar, and experimental suspend and audio
inputs.hardware.nixosModules.apple-t2
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
@ -29,64 +24,62 @@
# support power features such as suspend to ram # support power features such as suspend to ram
powerManagement.enable = true; powerManagement.enable = true;
# tune power saving options on boot # tune power saving options on boot
powerManagement.powertop.enable = true; # todo: fix usb mice and keyboards from suspending
#powerManagement.powertop.enable = true;
# thermald proactively prevents overheating on intel CPUs and works well with other tools # thermald proactively prevents overheating on intel CPUs and works well with other tools
services.thermald.enable = true; services.thermald.enable = true;
# power-profile-daemon for power management # power-profile-daemon for power management
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
# manage fans for macbook devices
services.mbpfan.enable = true;
# better performance than the actual intel driver # nvidia driver
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "nvidia" ];
# needed for our broadcom/brcm 4377b chip to work hardware.nvidia = {
hardware.firmware = with pkgs; [ package = config.boot.kernelPackages.nvidiaPackages.beta;
my.apple-firmware
modesetting.enable = true;
powerManagement.enable = true;
};
boot.kernelParams = [
# use experimental nvidia supplied framebuffer
"nvidia-drm.fbdev=1"
]; ];
# VA-API # VA-API
hardware.opengl = { hardware.opengl = {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver nvidia-vaapi-driver
intel-vaapi-driver
libvdpau-va-gl
]; ];
extraPackages32 = with pkgs.pkgsi686Linux; [ extraPackages32 = with pkgs.pkgsi686Linux; [
intel-media-driver nvidia-vaapi-driver
intel-vaapi-driver
libvdpau-va-gl
]; ];
}; };
environment.variables = { environment.variables = {
LIBVA_DRIVER_NAME= "iHD"; LIBVA_DRIVER_NAME= "nvidia";
VDPAU_DRIVER = "va_gl"; VDPAU_DRIVER = "nvidia";
# TODO: remove this once nvidia gets their shit together
# https://forums.developer.nvidia.com/t/cueglstreamproducerconnect-returns-error-801-on-525-53-driver/233610/20
NVD_BACKEND = "direct";
# VA-API on firefox # VA-API on firefox
MOZ_DISABLE_RDD_SANDBOX = "1"; MOZ_DISABLE_RDD_SANDBOX = "1";
}; };
boot.kernelParams = [
# enable the i915 sandybridge framebuffer compression (475mw savings)
"i915.i915_enable_fbc=1"
"i915.fastboot=1"
"enable_gvt=1"
];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/0f09afdc-88e4-4764-818b-77828931278f"; { device = "/dev/disk/by-uuid/08cfbb11-5943-4627-a2fc-fd41ce578027";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5659-4909"; { device = "/dev/disk/by-uuid/C321-2746";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/f54a2257-f498-4ca0-82af-58f31705cce7"; } [ { device = "/dev/disk/by-uuid/04eddb76-4925-4192-a472-1c2c7e4ac9f7"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

26
modules/desktop/hypridle.nix
View file

@ -20,36 +20,32 @@ in {
enable = true; enable = true;
package = cfg.package; package = cfg.package;
settings = { lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
general = { unlockCmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock";
lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
unlock_cmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock";
before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock the screen before sleeping beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock the screen before sleeping
after_sleep_cmd = "${hyprctl} dispatch dpms on"; # turn on the screen to avoid moving mouse/pressing key afterSleepCmd = "${hyprctl} dispatch dpms on"; # turn on the screen to avoid moving mouse/pressing key
};
listener = [ listeners = [
{ {
timeout = 60 * 1; timeout = 60 * 1;
on-timeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 1%"; # dim screen, save brightness state onTimeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 20"; # dim screen, save brightness state
on-resume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state onResume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state
} }
{ {
timeout = 90; # 1.5 min timeout = 90; # 1.5 min
on-timeout = "${hyprctl} dispatch dpms off"; # turn off screen onTimeout = "${hyprctl} dispatch dpms off"; # turn off screen
on-resume = "${hyprctl} dispatch dpms on"; # turn it back on onResume = "${hyprctl} dispatch dpms on"; # turn it back on
} }
{ {
timeout = 60 * 2; # 2 min timeout = 60 * 2; # 2 min
on-timeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer onTimeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer
} }
{ {
timeout = 60 * 15; # 15 min timeout = 60 * 15; # 15 min
on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend
} }
]; ];
};
}; };
}; };
} }

33
modules/desktop/hyprland.nix
View file

@ -104,17 +104,15 @@ in {
input = { input = {
kb_layout = "us"; kb_layout = "us";
touchpad = {
disable_while_typing = false;
natural_scroll = true;
};
follow_mouse = 1; follow_mouse = 1;
sensitivity = 0; # -1.0 - 1.0, 0 means no modification sensitivity = 0; # -1.0 - 1.0, 0 means no modification
}; };
monitor=",highrr,auto,auto"; monitor= [
"DVI-D-1, 1920x1080@60, 0x0, 1"
"DP-2, 1920x1080@60, 1920x0, 1"
];
exec-once = [ "${lib.getExe pkgs.networkmanagerapplet}" ]; exec-once = [ "${lib.getExe pkgs.networkmanagerapplet}" ];
@ -138,28 +136,25 @@ in {
# common popups # common popups
"float, class:org.gnome.FileRoller" "float, class:org.gnome.FileRoller"
"center, class:org.gnome.FileRoller" "center, class:org.gnome.FileRoller"
"size 1100 650, class:org.gnome.FileRoller" "size 1100 730, class:org.gnome.FileRoller"
"float, class:org.gnome.Loupe" "float, class:org.gnome.Loupe"
"center, class:org.gnome.Loupe" "center, class:org.gnome.Loupe"
"size 1100 650, class:org.gnome.Loupe" "size 1100 730, class:org.gnome.Loupe"
"float, initialTitle:^Open Folder$" "float, initialTitle:^Open Folder$"
"center, initialTitle:^Open Folder$" "center, initialTitle:^Open Folder$"
"size 1100 650, initialTitle:^Open Folder$" "size 1100 730, initialTitle:^Open Folder$"
"float, initialTitle:^Open File$" "float, initialTitle:^Open File$"
"center, initialTitle:^Open File$" "center, initialTitle:^Open File$"
"size 1100 650, initialTitle:^Open File$" "size 1100 730, initialTitle:^Open File$"
"float, initialTitle:^Open Files$" "float, initialTitle:^Open Files$"
"center, initialTitle:^Open Files$" "center, initialTitle:^Open Files$"
"size 1100 650, initialTitle:^Open Files$" "size 1100 730, initialTitle:^Open Files$"
"float, initialTitle:^Save As$" "float, initialTitle:^Save As$"
"center, initialTitle:^Save As$" "center, initialTitle:^Save As$"
"size 1100 650, initialTitle:^Save As$" "size 1100 730, initialTitle:^Save As$"
"float, initialTitle:^Select a file to open$" "float, initialTitle:^Select a file to open$"
"center, initialTitle:^Select a file to open$" "center, initialTitle:^Select a file to open$"
"size 1100 650, initialTitle:^Select a file to open$" "size 1100 730, initialTitle:^Select a file to open$"
# unsure why this is required, scaling?
"center, class:^pinentry-"
"center, class:^polkit-"
"float, class:\.exe$" "float, class:\.exe$"
@ -181,7 +176,7 @@ in {
blurls = [ blurls = [
"gtk-layer-shell" # nwg-drawer "gtk-layer-shell" # nwg-drawer
#"waybar" "waybar"
]; ];
decoration = { decoration = {
@ -225,10 +220,6 @@ in {
new_is_master = true; new_is_master = true;
}; };
gestures = {
workspace_swipe = true;
};
misc = { misc = {
force_default_wallpaper = 0; force_default_wallpaper = 0;
disable_splash_rendering = true; disable_splash_rendering = true;

22
modules/desktop/hyprlock.nix
View file

@ -19,14 +19,13 @@ in {
enable = true; enable = true;
package = cfg.package; package = cfg.package;
settings = {
general = { general = {
hide_cursor = false; hide_cursor = false;
no_fade_in = true; no_fade_in = true;
no_fade_out = true; no_fade_out = true;
}; };
background = [ backgrounds = [
{ {
path = toString ../../assets/lockscreen.png; path = toString ../../assets/lockscreen.png;
blur_passes = 3; blur_passes = 3;
@ -34,30 +33,26 @@ in {
} }
]; ];
label = [ labels = [
{ {
text = "cmd[update:1000] echo \"$(date +'%H:%M')\""; text = "cmd[update:1000] echo \"$(date +'%H:%M')\"";
font_size = 58; font_size = 58;
color = "rgb(${base05})"; color = "rgb(${base05})";
font_family = config.modules.desktop.fonts.fonts.sansSerif.family; font_family = config.modules.desktop.fonts.fonts.sansSerif.family;
position = "0, 30"; position = { x = 0; y = 30; };
halign = "center";
valign = "center";
} }
{ {
text = "cmd[update:1000] echo \"$(date +'%A %B %e')\""; text = "cmd[update:1000] echo \"$(date +'%A %B %e')\"";
font_size = 14; font_size = 14;
color = "rgb(${base05})"; color = "rgb(${base05})";
font_family = config.modules.desktop.fonts.fonts.sansSerif.family; font_family = config.modules.desktop.fonts.fonts.sansSerif.family;
position = "0, 10"; position = { x = 0; y = 10; };
halign = "center";
valign = "center";
} }
]; ];
input-field = [ input-fields = [
{ {
size = "300, 28"; size = { width = 300; height = 28; };
outline_thickness = 2; outline_thickness = 2;
dots_size = 0.2; dots_size = 0.2;
fade_on_empty = false; fade_on_empty = false;
@ -70,12 +65,9 @@ in {
fail_color = "rgb(${base08})"; fail_color = "rgb(${base08})";
capslock_color = "rgb(${base09})"; capslock_color = "rgb(${base09})";
position = "0, -30"; position = { x = 0; y = -30; };
halign = "center";
valign = "center";
} }
]; ];
};
}; };
}; };
} }

19
modules/desktop/themes/catppuccin/default.nix
View file

@ -46,16 +46,15 @@ in {
vscode = { vscode = {
colorTheme = { colorTheme = {
name = "Catppuccin Mocha"; name = "Catppuccin Mocha";
extension = pkgs.vscode-extensions.catppuccin.catppuccin-vsc; extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
#extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { accent = accent;
# accent = accent; boldKeywords = false;
# boldKeywords = false; italicComments = false;
# italicComments = false; italicKeywords = false;
# italicKeywords = false; extraBordersEnabled = false;
# extraBordersEnabled = false; workbenchMode = "flat";
# workbenchMode = "flat"; bracketMode = "rainbow";
# bracketMode = "rainbow"; });
#});
}; };
iconTheme = { iconTheme = {
name = "material-icon-theme"; name = "material-icon-theme";

2
modules/desktop/themes/default.nix
View file

@ -69,7 +69,7 @@ in {
hm.qt = { hm.qt = {
enable = true; enable = true;
platformTheme.name = "gtk"; platformTheme = "gtk";
style.name = "gtk2"; style.name = "gtk2";
}; };

3
modules/desktop/waybar.nix
View file

@ -8,8 +8,7 @@ in {
enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors."; enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors.";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
#default = inputs.waybar.packages.${system}.default; default = inputs.waybar.packages.${system}.default;
default = pkgs.waybar;
example = "pkgs.waybar"; example = "pkgs.waybar";
}; };
}; };

26
packages/apple-firmware/default.nix
View file

@ -1,26 +0,0 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation {
pname = "apple-firmware";
version = "unstable";
src = fetchFromGitHub {
owner = "AdityaGarg8";
repo = "Apple-Firmware";
rev = "c3ba2bce7b5b7d08a478763c678d71ddded60403";
hash = "sha256-p91pyOYKHnJvaBZ7nxrBqFU63UQhMPWhm2GxabfncY4=";
};
installPhase = ''
mkdir -p "$out/lib/firmware/brcm"
cp -r lib/firmware/brcm/. "$out/lib/firmware/brcm/"
'';
meta = with lib; {
description = "Various apple broadcom drivers, ripped from a runner image";
homepage = "https://github.com/adityagarg8/apple-firmware";
# not sure about the licenses on these
# license = licenses.unfree;
platforms = platforms.all;
};
}