diff --git a/default.nix b/default.nix index 97a5645..d00411f 100755 --- a/default.nix +++ b/default.nix @@ -15,6 +15,8 @@ in { ++ (mapModulesRec' (toString ./modules) import); hm.imports = [ + inputs.hyprlock.homeManagerModules.hyprlock + inputs.hypridle.homeManagerModules.hypridle inputs.hyprland.homeManagerModules.default ]; @@ -39,13 +41,11 @@ in { "https://nix-community.cachix.org" "https://nixpkgs-wayland.cachix.org" "https://hyprland.cachix.org" - "https://hydra.soopy.moe" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "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; boot = { - kernelPackages = mkDefault pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; kernelParams = ["pci_aspm.policy=performance"]; }; diff --git a/flake.lock b/flake.lock index ca37175..8adaae6 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1716179347, - "narHash": "sha256-DPiP4yLRcPgWgrnCC/tRp5vUk9teZIfsCT2r8jr1V8A=", + "lastModified": 1710544781, + "narHash": "sha256-nkxihb3D85k1nZV1CzlB3seMKtTEeKb688sblIGp/Bs=", "owner": "catppuccin", "repo": "vscode", - "rev": "b7a8806f7532a091b0170f281dbc7f35c3fc7761", + "rev": "d7b96ccac36fd29929bd97bc9357413cc4e0240c", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "type": "github" }, "original": { @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1711604890, + "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1716327911, - "narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -121,11 +121,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1716309977, - "narHash": "sha256-4jDQIcMDSFOOMBxVTEiC6Ck1vdc0kAFvv+StxnnE59Q=", + "lastModified": 1713472482, + "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", "owner": "hyprwm", "repo": "hypridle", - "rev": "cb169c4e06cec9b4349e3668427e729d22328a54", + "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716417827, - "narHash": "sha256-TYHpA/i9+Ns01+RzknJ5eYskQXL9GTTA7JX9Lo4JKVg=", + "lastModified": 1715027791, + "narHash": "sha256-9wO+A4oOWpf0WtJ/iIzxy1mwXXfWuKHPW+E3wmsCI0k=", "ref": "refs/heads/main", - "rev": "7ad9116de8d0b7dac27eaf080bd92998a8fb40e5", - "revCount": 4728, + "rev": "0c446ec5f4c39599ea97cb703dd3ac7718fb9169", + "revCount": 4621, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -162,11 +162,11 @@ "hyprland-catppuccin": { "flake": false, "locked": { - "lastModified": 1712161758, - "narHash": "sha256-XTqpmucOeHUgSpXQ0XzbggBFW+ZloRD/3mFhI+Tq4O8=", + "lastModified": 1702668781, + "narHash": "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no=", "owner": "catppuccin", "repo": "hyprland", - "rev": "b57375545f5da1f7790341905d1049b1873a8bb3", + "rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017", "type": "github" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1716309918, - "narHash": "sha256-XWjBbAsWctkpinaoot+5g0VcO1CmiS90IkL+CGz67DQ=", + "lastModified": 1713978374, + "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "ba4b08e5f5dacc38af083ef89f8c8c489a900068", + "rev": "415262065fff0a04b229cd00165f346a86a0a73a", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1716311836, - "narHash": "sha256-HWsl4uUqEOvrvm8QCNKJWBP2xB3irsy+xMvyvLVHITk=", + "lastModified": 1712919696, + "narHash": "sha256-93zNQy4LGFP5h/GrQJctd8cPE0VdCDsWigTOx2effrE=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "678d0e8959cf7adbc3825d578595e82305573991", + "rev": "02ee7ff3bbd9cba72f26be7b09dde4a89fc31c21", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1714755542, + "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -423,11 +423,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -487,11 +487,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -644,11 +644,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716362227, - "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", + "lastModified": 1714680561, + "narHash": "sha256-ov7v4OaiMW6gylMFTjKXXtoxrgAjtOTHa09oFmu3B3s=", "owner": "Alexays", "repo": "Waybar", - "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", + "rev": "0b6476da32d181ee6b2cabdc5205a46a90521a75", "type": "github" }, "original": { @@ -660,11 +660,11 @@ "waybar-catppuccin": { "flake": false, "locked": { - "lastModified": 1711907468, - "narHash": "sha256-9lY+v1CTbpw2lREG/h65mLLw5KuT8OJdEPOb+NNC6Fo=", + "lastModified": 1678438606, + "narHash": "sha256-WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=", "owner": "catppuccin", "repo": "waybar", - "rev": "0830796af6aa64ce8bc7453d42876a628777ac68", + "rev": "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff", "type": "github" }, "original": { @@ -690,11 +690,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1714060055, + "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 485bae5..ed965f2 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,7 @@ config.allowAliases = false; overlays = extraOverlays ++ (lib.attrValues self.overlays); }; - pkgs = mkPkgs nixpkgs [ - self.overlays.default - #inputs.catppuccin-vsc.overlays.default - ]; + pkgs = mkPkgs nixpkgs [ self.overlays.default inputs.catppuccin-vsc.overlays.default ]; lib = nixpkgs.lib.extend (final: prev: { my = import ./lib { diff --git a/hosts/goopnet-interface/hardware.nix b/hosts/goopnet-interface/hardware.nix index b9dfe29..1a00b93 100755 --- a/hosts/goopnet-interface/hardware.nix +++ b/hosts/goopnet-interface/hardware.nix @@ -3,13 +3,8 @@ { imports = [ - inputs.hardware.nixosModules.common-cpu-intel - inputs.hardware.nixosModules.common-pc-laptop-ssd - 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 + inputs.hardware.nixosModules.common-cpu-intel-cpu-only + inputs.hardware.nixosModules.common-gpu-nvidia-nonprime (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -29,64 +24,62 @@ # support power features such as suspend to ram powerManagement.enable = true; # 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 services.thermald.enable = true; # power-profile-daemon for power management services.power-profiles-daemon.enable = true; - # manage fans for macbook devices - services.mbpfan.enable = true; - # better performance than the actual intel driver - services.xserver.videoDrivers = [ "modesetting" ]; + # nvidia driver + services.xserver.videoDrivers = [ "nvidia" ]; - # needed for our broadcom/brcm 4377b chip to work - hardware.firmware = with pkgs; [ - my.apple-firmware + hardware.nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.beta; + + modesetting.enable = true; + + powerManagement.enable = true; + }; + + boot.kernelParams = [ + # use experimental nvidia supplied framebuffer + "nvidia-drm.fbdev=1" ]; # VA-API hardware.opengl = { extraPackages = with pkgs; [ - intel-media-driver - intel-vaapi-driver - libvdpau-va-gl + nvidia-vaapi-driver ]; extraPackages32 = with pkgs.pkgsi686Linux; [ - intel-media-driver - intel-vaapi-driver - libvdpau-va-gl + nvidia-vaapi-driver ]; }; environment.variables = { - LIBVA_DRIVER_NAME= "iHD"; - VDPAU_DRIVER = "va_gl"; + LIBVA_DRIVER_NAME= "nvidia"; + 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 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."/" = - { device = "/dev/disk/by-uuid/0f09afdc-88e4-4764-818b-77828931278f"; + { device = "/dev/disk/by-uuid/08cfbb11-5943-4627-a2fc-fd41ce578027"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5659-4909"; + { device = "/dev/disk/by-uuid/C321-2746"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; }; 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 diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix index 5cea86e..1d79489 100644 --- a/modules/desktop/hypridle.nix +++ b/modules/desktop/hypridle.nix @@ -20,36 +20,32 @@ in { enable = true; package = cfg.package; - settings = { - general = { - lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}"; - unlock_cmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock"; + lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}"; + unlockCmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock"; - before_sleep_cmd = "${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 - }; + beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock the screen before sleeping + afterSleepCmd = "${hyprctl} dispatch dpms on"; # turn on the screen to avoid moving mouse/pressing key - listener = [ + listeners = [ { timeout = 60 * 1; - on-timeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 1%"; # dim screen, save brightness state - on-resume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state + onTimeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 20"; # dim screen, save brightness state + onResume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state } { timeout = 90; # 1.5 min - on-timeout = "${hyprctl} dispatch dpms off"; # turn off screen - on-resume = "${hyprctl} dispatch dpms on"; # turn it back on + onTimeout = "${hyprctl} dispatch dpms off"; # turn off screen + onResume = "${hyprctl} dispatch dpms on"; # turn it back on } { 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 - on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend + onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend } ]; - }; }; }; } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 64642fc..43af1d1 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -104,17 +104,15 @@ in { input = { kb_layout = "us"; - touchpad = { - disable_while_typing = false; - natural_scroll = true; - }; - follow_mouse = 1; 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}" ]; @@ -138,28 +136,25 @@ in { # common popups "float, 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" "center, class:org.gnome.Loupe" - "size 1100 650, class:org.gnome.Loupe" + "size 1100 730, class:org.gnome.Loupe" "float, initialTitle:^Open Folder$" "center, initialTitle:^Open Folder$" - "size 1100 650, initialTitle:^Open Folder$" + "size 1100 730, initialTitle:^Open Folder$" "float, initialTitle:^Open File$" "center, initialTitle:^Open File$" - "size 1100 650, initialTitle:^Open File$" + "size 1100 730, initialTitle:^Open File$" "float, initialTitle:^Open Files$" "center, initialTitle:^Open Files$" - "size 1100 650, initialTitle:^Open Files$" + "size 1100 730, initialTitle:^Open Files$" "float, 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$" "center, initialTitle:^Select a file to open$" - "size 1100 650, initialTitle:^Select a file to open$" - # unsure why this is required, scaling? - "center, class:^pinentry-" - "center, class:^polkit-" + "size 1100 730, initialTitle:^Select a file to open$" "float, class:\.exe$" @@ -181,7 +176,7 @@ in { blurls = [ "gtk-layer-shell" # nwg-drawer - #"waybar" + "waybar" ]; decoration = { @@ -225,10 +220,6 @@ in { new_is_master = true; }; - gestures = { - workspace_swipe = true; - }; - misc = { force_default_wallpaper = 0; disable_splash_rendering = true; diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix index 6d1d670..921aeae 100644 --- a/modules/desktop/hyprlock.nix +++ b/modules/desktop/hyprlock.nix @@ -19,14 +19,13 @@ in { enable = true; package = cfg.package; - settings = { general = { hide_cursor = false; no_fade_in = true; no_fade_out = true; }; - background = [ + backgrounds = [ { path = toString ../../assets/lockscreen.png; blur_passes = 3; @@ -34,30 +33,26 @@ in { } ]; - label = [ + labels = [ { text = "cmd[update:1000] echo \"$(date +'%H:%M')\""; font_size = 58; color = "rgb(${base05})"; font_family = config.modules.desktop.fonts.fonts.sansSerif.family; - position = "0, 30"; - halign = "center"; - valign = "center"; + position = { x = 0; y = 30; }; } { text = "cmd[update:1000] echo \"$(date +'%A %B %e')\""; font_size = 14; color = "rgb(${base05})"; font_family = config.modules.desktop.fonts.fonts.sansSerif.family; - position = "0, 10"; - halign = "center"; - valign = "center"; + position = { x = 0; y = 10; }; } ]; - input-field = [ + input-fields = [ { - size = "300, 28"; + size = { width = 300; height = 28; }; outline_thickness = 2; dots_size = 0.2; fade_on_empty = false; @@ -70,12 +65,9 @@ in { fail_color = "rgb(${base08})"; capslock_color = "rgb(${base09})"; - position = "0, -30"; - halign = "center"; - valign = "center"; + position = { x = 0; y = -30; }; } ]; - }; }; }; } diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index d7258de..519c31b 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -46,16 +46,15 @@ in { vscode = { colorTheme = { name = "Catppuccin Mocha"; - extension = pkgs.vscode-extensions.catppuccin.catppuccin-vsc; - #extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { - # accent = accent; - # boldKeywords = false; - # italicComments = false; - # italicKeywords = false; - # extraBordersEnabled = false; - # workbenchMode = "flat"; - # bracketMode = "rainbow"; - #}); + extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { + accent = accent; + boldKeywords = false; + italicComments = false; + italicKeywords = false; + extraBordersEnabled = false; + workbenchMode = "flat"; + bracketMode = "rainbow"; + }); }; iconTheme = { name = "material-icon-theme"; diff --git a/modules/desktop/themes/default.nix b/modules/desktop/themes/default.nix index 7671167..85f48dc 100644 --- a/modules/desktop/themes/default.nix +++ b/modules/desktop/themes/default.nix @@ -69,7 +69,7 @@ in { hm.qt = { enable = true; - platformTheme.name = "gtk"; + platformTheme = "gtk"; style.name = "gtk2"; }; diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 896dfe0..0c91d10 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -8,8 +8,7 @@ in { enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors."; package = mkOption { type = types.package; - #default = inputs.waybar.packages.${system}.default; - default = pkgs.waybar; + default = inputs.waybar.packages.${system}.default; example = "pkgs.waybar"; }; }; diff --git a/packages/apple-firmware/default.nix b/packages/apple-firmware/default.nix deleted file mode 100644 index 183855a..0000000 --- a/packages/apple-firmware/default.nix +++ /dev/null @@ -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; - }; -}