From 6d0308ef9b676cbe2890fc980ce6aba04c3096da Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Sun, 7 Dec 2025 03:34:01 -0800 Subject: [PATCH 01/14] feat:natalie add awakened_poe_trade package --- packages/awakened_poe_trade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/awakened_poe_trade/default.nix b/packages/awakened_poe_trade/default.nix index d72e45fdf84352955938190fe3a0b9d586eaa259..3ce10dea1fa25ea836e1d692cfcef74958a7446d 100644 --- a/packages/awakened_poe_trade/default.nix +++ b/packages/awakened_poe_trade/default.nix @@ -17,12 +17,12 @@ pkgs.appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/awakened-poe-trade.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' + --replace 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { -- 2.54.0 From 710e813bec1bae1b7354d4f5d6c8d1f6bd8880c0 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Sun, 7 Dec 2025 03:34:23 -0800 Subject: [PATCH 02/14] chore: remove (most) warnings --- lib/mkNeovim.nix | 2 +- modules/home/default.nix | 6 ++- modules/neovim/default.nix | 2 +- modules/nixos/nvidia.nix | 4 +- users/fish/cattop/hardware-configuration.nix | 48 +++++++++++++------- users/fish/vim/languages.nix | 2 +- users/natalie/configuration.nix | 2 +- users/natalie/desktop/home.nix | 2 +- users/natalie/home/hyprland/plugins.nix | 2 +- users/natalie/home/vicinae.nix | 2 +- users/natalie/vim/languages.nix | 2 +- 11 files changed, 45 insertions(+), 29 deletions(-) diff --git a/lib/mkNeovim.nix b/lib/mkNeovim.nix index d638598ee58e0b5d0d50fb7bed98c8a54181ff43..d22a809c0c461e5a1e88caf629f4edc76ca016e0 100644 --- a/lib/mkNeovim.nix +++ b/lib/mkNeovim.nix @@ -1,7 +1,7 @@ { self, inputs }: user: pkgs: let - darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.system; + darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system; host = { inherit darwin; diff --git a/modules/home/default.nix b/modules/home/default.nix index 6e9a26196dcdf34958881eb89a2316560317139d..88d1c66aca0215de23ec9f7d009cae4034edb60f 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -69,8 +69,10 @@ in git = { enable = true; - userName = lib.mkDefault user.name; - userEmail = lib.mkDefault user.email; + settings.user = { + name = lib.mkDefault user.name; + email = lib.mkDefault user.email; + }; ignores = [ (lib.mkIf host.darwin ".DS_Store") # When using Finder (lib.mkIf host.darwin "._*") # When using non-APFS drives diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 6a31c91a848672da9814e0b6bd9e5c5ad48a29f8..ba0eb9a3070da9d298bb1aaa677260b93cad1194 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -111,7 +111,7 @@ html.enable = true; nix.enable = true; python.enable = true; - rust.crates.enable = true; + rust.extensions.crates-nvim.enable = true; rust.enable = true; ts.enable = true; zig.enable = true; diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 88f2252341a33631e504018b8a531b7c1b32fec9..07da1ea6a0b00b9d2454cfce62b531447bbae0a1 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -84,7 +84,7 @@ in enable32Bit = true; extraPackages = with pkgs; [ nvidia-vaapi-driver - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl mesa egl-wayland @@ -104,7 +104,7 @@ in environment.systemPackages = with pkgs; [ vulkan-tools - glxinfo + mesa-demos libva-utils # VA-API debugging tools ]; } diff --git a/users/fish/cattop/hardware-configuration.nix b/users/fish/cattop/hardware-configuration.nix index b16ddcb14f7da7960d16b1feb84affeece222af5..3ba67c75dbb9e829ad076a7a30a6c0320fdc9ac6 100644 --- a/users/fish/cattop/hardware-configuration.nix +++ b/users/fish/cattop/hardware-configuration.nix @@ -1,32 +1,46 @@ # 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 = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "vmd" + "nvme" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; + fsType = "ext4"; + }; - fileSystems."/boot/EFI" = - { device = "/dev/disk/by-uuid/473A-B8FD"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } + fileSystems."/boot/EFI" = { + device = "/dev/disk/by-uuid/473A-B8FD"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } + ]; # 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 diff --git a/users/fish/vim/languages.nix b/users/fish/vim/languages.nix index 6c370854799533d6388b8eb992df055f6df93b7a..d948dd1884da8b708ee20cb09db340ce269c74d5 100644 --- a/users/fish/vim/languages.nix +++ b/users/fish/vim/languages.nix @@ -14,7 +14,7 @@ lua.lsp.enable = true; lua.lsp.lazydev.enable = true; python = { - format.type = "ruff"; + format.type = [ "ruff" ]; }; markdown = { enable = true; diff --git a/users/natalie/configuration.nix b/users/natalie/configuration.nix index d15641a3c807b1615f9a971e92a0fa2e385b8d6a..625e8920549013d98afcb9560f443592ce2475e4 100644 --- a/users/natalie/configuration.nix +++ b/users/natalie/configuration.nix @@ -13,7 +13,7 @@ iosevka nerd-fonts.symbols-only nerd-fonts.iosevka - inputs.apple-fonts.packages.${pkgs.system}.sf-pro + inputs.apple-fonts.packages.${pkgs.stdenv.hostPlatform.system}.sf-pro sketchybar-app-font ]; diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index 65b4bcabdea99e9732feabd3f5c32a821af45c97..cf6d38ac1ff4064795a753843cb0db6cfd1a3145 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -25,7 +25,7 @@ dxvk_2 steam-run vulkan-tools - path-of-building + rusty-path-of-building wineWowPackages.stable winetricks (prismlauncher.override { gamemodeSupport = true; }) diff --git a/users/natalie/home/hyprland/plugins.nix b/users/natalie/home/hyprland/plugins.nix index 32697739bb1b84b29123d72171c02687fe8b3acd..f1f97902c264ee65fca3a95a5d1ad7d16293cba6 100644 --- a/users/natalie/home/hyprland/plugins.nix +++ b/users/natalie/home/hyprland/plugins.nix @@ -2,7 +2,7 @@ { wayland.windowManager.hyprland = { plugins = [ - inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces + inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces ]; settings = { plugin = { diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index 5276e4bb4a02d62e5e02631b8317a8201c571e9d..eda114a97d7e2c327fab1dc87700f53efda0a2b0 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -18,7 +18,7 @@ }; # extensions = [ - # (inputs.vicinae.mkVicinaeExtension.${pkgs.system} { + # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} { # inherit pkgs; # name = "nixpkgs search"; # src = pkgs.fetchFromGithub { diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index 6c370854799533d6388b8eb992df055f6df93b7a..d948dd1884da8b708ee20cb09db340ce269c74d5 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -14,7 +14,7 @@ lua.lsp.enable = true; lua.lsp.lazydev.enable = true; python = { - format.type = "ruff"; + format.type = [ "ruff" ]; }; markdown = { enable = true; -- 2.54.0 From f86394e5908762008c17f5c0679124734359b613 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 8 Jan 2026 19:30:55 -0800 Subject: [PATCH 03/14] feat (natalie): change hyprland multimonitor package --- flake.lock | 212 +++++++++----------- flake.nix | 6 +- lib/mkSystem.nix | 1 - modules/nixos/nvidia.nix | 2 +- modules/shared/nix.nix | 4 - users/natalie/home/hyprland/binds.nix | 46 ++--- users/natalie/home/hyprland/exec-once.nix | 2 +- users/natalie/home/hyprland/plugins.nix | 7 +- users/natalie/home/hyprland/windowrules.nix | 32 +-- users/natalie/home/vicinae.nix | 3 +- users/natalie/home/waybar/settings.nix | 2 +- 11 files changed, 138 insertions(+), 179 deletions(-) diff --git a/flake.lock b/flake.lock index 5a4b7f887b3e7d6b2bf939e0c4949f441c3cd629..4e9587077e83ebb081bdca0f235d0b4d04d68790 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", + "lastModified": 1766038392, + "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", + "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", "type": "github" }, "original": { @@ -249,7 +249,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -267,7 +267,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -285,7 +285,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1766171975, + "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765104552, - "narHash": "sha256-oaYLaXFEOHrS67UBWUcG8S8lFNTmLo65x8CmT++iLug=", + "lastModified": 1766257984, + "narHash": "sha256-qsrSpSPvOD8RWGdE+dqzQhmJRndG4gSc1Pyli74CYIY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "76ac655c9e624069cf17f470773e37d8172ee290", + "rev": "70f54a1e1ba3478a56faf82431b2770bd727431d", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1764812575, - "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -569,6 +569,26 @@ "type": "github" } }, + "hyprsplit": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1766100188, + "narHash": "sha256-Hi9USQQ+FkouYs4gJ+H0YSrluanjnGrGrhopjssFqOo=", + "owner": "shezdy", + "repo": "hyprsplit", + "rev": "131a2bc5daba1e9cc4845456b44b311ca54f6316", + "type": "github" + }, + "original": { + "owner": "shezdy", + "repo": "hyprsplit", + "type": "github" + } + }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -633,11 +653,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -687,11 +707,11 @@ ] }, "locked": { - "lastModified": 1764872015, - "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", "type": "github" }, "original": { @@ -734,11 +754,11 @@ ] }, "locked": { - "lastModified": 1764208378, - "narHash": "sha256-Qur5AWl4Vx+It65DX+I+sc4lViz52OmXqvg+fL2t9I4=", + "lastModified": 1765916709, + "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "059476af87f7335c05424b805833864d6d9ed0e3", + "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce", "type": "github" }, "original": { @@ -747,18 +767,21 @@ "type": "github" } }, - "nix-filter": { + "ndg": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1693833173, - "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", + "lastModified": 1765435293, + "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", + "owner": "feel-co", + "repo": "ndg", + "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "feel-co", + "repo": "ndg", "type": "github" } }, @@ -769,11 +792,11 @@ ] }, "locked": { - "lastModified": 1765080594, - "narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -789,11 +812,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764771319, - "narHash": "sha256-SllXl+Void1CIMk2jkKJXp7PL/31JeWir/Q8GAsuvEM=", + "lastModified": 1765642879, + "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "cccbb97d813c462bd85012740bc1c02c9c267808", + "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e", "type": "github" }, "original": { @@ -804,11 +827,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -836,11 +859,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -851,11 +874,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -902,17 +925,18 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "mnw": "mnw", + "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], "systems": "systems_4" }, "locked": { - "lastModified": 1764871278, - "narHash": "sha256-ezKJwZeAtZSO9EA3aLl5bmjjAVUoLE69IC+yX/KSqDM=", + "lastModified": 1765537745, + "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=", "owner": "notashelf", "repo": "nvf", - "rev": "43b48909a3d0c96f5c3d9a9e50d6faabbeccc9dd", + "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0", "type": "github" }, "original": { @@ -944,11 +968,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -964,14 +988,13 @@ "darwin": "darwin", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprsplit": "hyprsplit", "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", "nixpkgs": "nixpkgs_3", "nvf": "nvf", "rust-overlay": "rust-overlay", - "split-monitor-workspaces": "split-monitor-workspaces", - "vicinae": "vicinae", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -984,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1766198367, + "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3", "type": "github" }, "original": { @@ -1081,27 +1104,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" } }, - "split-monitor-workspaces": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nix-filter": "nix-filter" - }, - "locked": { - "lastModified": 1764873455, - "narHash": "sha256-ehm3Y0xCUkJnbDwM0wwu9DBj7f3lLTwFW9GBxH93w2s=", - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "rev": "34d1ce459b4f13e77d8f2a0851475497abee2c98", - "type": "github" - }, - "original": { - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1207,40 +1209,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "vicinae": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1764939234, - "narHash": "sha256-o/0emFrTtNzfxQis6U1onAJMR63APCigiZNmqLxVM1E=", - "owner": "vicinaehq", - "repo": "vicinae", - "rev": "d50101fc04c76a9acc3785da5459f6884fc6984b", - "type": "github" - }, - "original": { - "owner": "vicinaehq", - "repo": "vicinae", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1289,11 +1257,11 @@ ] }, "locked": { - "lastModified": 1764648680, - "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=", + "lastModified": 1765772419, + "narHash": "sha256-1mQ1K4fqebT54nz13rcRNjd6a+IbNLwLvYyR62EcyE8=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20", + "rev": "227e836e43fe7985b4c4f8b0076446a6d66f3343", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ffbf73ebbc250227200823d2e60c2cc4139855db..91c6063db024d6e7d3046c65ef662db793ffd4ff 100644 --- a/flake.nix +++ b/flake.nix @@ -25,13 +25,11 @@ moonlight.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; - split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; + hyprsplit = { + url = "github:shezdy/hyprsplit"; inputs.hyprland.follows = "hyprland"; }; - vicinae.url = "github:vicinaehq/vicinae"; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index e8f6a0ce18544893f6ecffe87e6e86b065885c44..9e3a13c459d7382e0c7d888d249f7ccb23a00fff 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -76,7 +76,6 @@ let ) inputs.nvf.homeManagerModules.default inputs.android-nixpkgs.hmModule - inputs.vicinae.homeManagerModules.default ]; in systemFunc { diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 07da1ea6a0b00b9d2454cfce62b531447bbae0a1..70718b5dd8815a83696b806b9d67a14279224192 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -76,7 +76,7 @@ in # #Fixes a glitch # nvidiaPersistenced = true; }; - nvidia-container-toolkit.enable = true; + nvidia-container-toolkit.enable = false; graphics = { enable = true; diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index d07ba84632ced91604678563ceaaa68c313fdc20..7997bf0f9cf8b0613f98f2a09d69e8929a9fe821 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -28,15 +28,11 @@ "https://nix-community.cachix.org" # For haskell "https://cache.iog.io" - #vicinae - "https://vicinae.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # For haskell "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" - #vicinae - "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; }; gc = { diff --git a/users/natalie/home/hyprland/binds.nix b/users/natalie/home/hyprland/binds.nix index 139396467a12283c9eac0839dfed3080b3712384..331a96ce2df08e24f65c323b02e9db86397f5335 100644 --- a/users/natalie/home/hyprland/binds.nix +++ b/users/natalie/home/hyprland/binds.nix @@ -72,29 +72,29 @@ "CTRL ALT, down, exec, hyprctl dispatch focuswindow tiled" # switch workspace - "$mainMod, 1, split-workspace, 1" - "$mainMod, 2, split-workspace, 2" - "$mainMod, 3, split-workspace, 3" - "$mainMod, 4, split-workspace, 4" - "$mainMod, 5, split-workspace, 5" - "$mainMod, 6, split-workspace, 6" - "$mainMod, 7, split-workspace, 7" - "$mainMod, 8, split-workspace, 8" - "$mainMod, 9, split-workspace, 9" - "$mainMod, 0, split-workspace, 10" + "$mainMod, 1, workspace, 1" + "$mainMod, 2, workspace, 2" + "$mainMod, 3, workspace, 3" + "$mainMod, 4, workspace, 4" + "$mainMod, 5, workspace, 5" + "$mainMod, 6, workspace, 6" + "$mainMod, 7, workspace, 7" + "$mainMod, 8, workspace, 8" + "$mainMod, 9, workspace, 9" + "$mainMod, 0, workspace, 10" # same as above, but switch to the workspace - "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1" # movetoworkspacesilent - "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2" - "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3" - "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4" - "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5" - "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6" - "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7" - "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8" - "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9" - "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10" - "$mainMod CTRL, c, split-movetoworkspace, empty" + "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent + "$mainMod SHIFT, 2, movetoworkspacesilent, 2" + "$mainMod SHIFT, 3, movetoworkspacesilent, 3" + "$mainMod SHIFT, 4, movetoworkspacesilent, 4" + "$mainMod SHIFT, 5, movetoworkspacesilent, 5" + "$mainMod SHIFT, 6, movetoworkspacesilent, 6" + "$mainMod SHIFT, 7, movetoworkspacesilent, 7" + "$mainMod SHIFT, 8, movetoworkspacesilent, 8" + "$mainMod SHIFT, 9, movetoworkspacesilent, 9" + "$mainMod SHIFT, 0, movetoworkspacesilent, 10" + "$mainMod CTRL, c, movetoworkspace, empty" # window control "$mainMod SHIFT, left, movewindow, l" @@ -131,8 +131,8 @@ ",XF86AudioPrev,exec, playerctl previous" ",XF86AudioStop,exec, playerctl stop" - "$mainMod, mouse_down, split-workspace, e-1" - "$mainMod, mouse_up, split-workspace, e+1" + "$mainMod, mouse_down, workspace, e-1" + "$mainMod, mouse_up, workspace, e+1" # clipboard manager "$mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history" diff --git a/users/natalie/home/hyprland/exec-once.nix b/users/natalie/home/hyprland/exec-once.nix index 947de457ba8c0b7d42dbd3245fb63264244fed9b..ed8e42349e677086fc831ee06fc6ba60377df180 100644 --- a/users/natalie/home/hyprland/exec-once.nix +++ b/users/natalie/home/hyprland/exec-once.nix @@ -17,7 +17,7 @@ "${pkgs.wl-clipboard}/bin/wl-paste --watch cliphist store &" # "${pkgs.waybar}/bin/waybar &" "${pkgs.swaynotificationcenter}/bin/swaync &" - "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &" + "${pkgs.vicinae}/bin/vicinae server &" "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &" "${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Ice 24 &" "${pkgs.tmux}/bin/tmux setenv -g HYPRLAND_INSTANCE_SIGNATURE '$HYPRLAND_INSTANCE_SIGNATURE'" diff --git a/users/natalie/home/hyprland/plugins.nix b/users/natalie/home/hyprland/plugins.nix index f1f97902c264ee65fca3a95a5d1ad7d16293cba6..3b11db0ee0d0c57ee5622d80e7c6d6289bf3ea51 100644 --- a/users/natalie/home/hyprland/plugins.nix +++ b/users/natalie/home/hyprland/plugins.nix @@ -2,13 +2,12 @@ { wayland.windowManager.hyprland = { plugins = [ - inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces + inputs.hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.hyprsplit ]; settings = { plugin = { - split-monitor-workspaces = { - count = 5; - keep_focused = 0; + hyprsplit = { + num_workspaces = 5; }; }; }; diff --git a/users/natalie/home/hyprland/windowrules.nix b/users/natalie/home/hyprland/windowrules.nix index 9c9a2d248838f16e84f98e73bcf82c86dd046d94..f06d04f98c6413a1da9bab51b14e4ecba7370a78 100644 --- a/users/natalie/home/hyprland/windowrules.nix +++ b/users/natalie/home/hyprland/windowrules.nix @@ -10,22 +10,22 @@ #awakened-poe-trade # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569 - "tag +apt, class:^(awakened-poe-trade)$" - "tag +apt, title:(Awakened PoE Trade)" - "float, tag:apt" - "noblur, tag:apt" - "nofocus, tag:apt" - "noshadow, tag:apt" - "noborder, tag:apt" - "pin, tag:apt" - "renderunfocused, tag:apt" - "size 100% 100%, tag:apt" - "center, tag:apt" - - #POE - "tag +poe, title:(Path of Exile)" - "tag +poe class:(steam_app_238960)" - "fullscreen, tag:poe$" + # "tag +apt, class:^(awakened-poe-trade)$" + # "tag +apt, title:(Awakened PoE Trade)" + # "float, tag:apt" + # "noblur, tag:apt" + # "nofocus, tag:apt" + # "noshadow, tag:apt" + # "noborder, tag:apt" + # "pin, tag:apt" + # "renderunfocused, tag:apt" + # "size 100% 100%, tag:apt" + # "center, tag:apt" + # + # #POE + # "tag +poe, title:(Path of Exile)" + # "tag +poe class:(steam_app_238960)" + # "fullscreen, tag:poe$" # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-3037816727 # "tag +fakefullscreen, title:(Path of Exile),class:(steam_app_238960)" # "tile, tag:fakefullscreen" diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index eda114a97d7e2c327fab1dc87700f53efda0a2b0..301a7a6583d68cd7e2fb2b7921400e2726e15e43 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -1,8 +1,7 @@ { inputs, pkgs, ... }: { - services.vicinae = { + programs.vicinae = { enable = true; - autoStart = false; settings = { faviconService = "twenty"; # twenty | google | none font.size = 11; diff --git a/users/natalie/home/waybar/settings.nix b/users/natalie/home/waybar/settings.nix index 1a883448d70aaff7517c8e629760bab53e4ae430..2d0498d356b9ac6477c229e5174a1751b20b3a0a 100644 --- a/users/natalie/home/waybar/settings.nix +++ b/users/natalie/home/waybar/settings.nix @@ -145,7 +145,7 @@ in "custom/launcher" = { format = ""; on-click = "random-wallpaper"; - on-click-right = "${inputs.vicinae.packages.${currentSystem}.default}vicinae vicinae://toggle"; + on-click-right = "${pkgs.vicinae}/bin/vicinae vicinae://toggle"; tooltip = "true"; tooltip-format = "Random Wallpaper"; }; -- 2.54.0 From c9045e8b43c787d7d9936b846d1a3483936580f6 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 8 Jan 2026 19:33:48 -0800 Subject: [PATCH 04/14] chore: update nvf to 0.8 --- flake.lock | 146 ++++++++++++++++++++++++----------------------------- flake.nix | 2 +- 2 files changed, 67 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 4e9587077e83ebb081bdca0f235d0b4d04d68790..6825dbf42771c99fc231dece223fc40ad5226147 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1764707074, - "narHash": "sha256-XONQ/zRv36w1Cyx+YBPStg+o8xH5J5Kqg0olLWs0O4M=", + "lastModified": 1767903972, + "narHash": "sha256-SvWSEUjrYBYMWuBjAuojqzeb/jIqhMgJs3HuhmJc2Lc=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "f9c31127b45e3955a22c0d76b2d15e239b645879", + "rev": "c1924b3257f203016d91b3cae1fd2b0d0f94953b", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1767024902, + "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1766038392, - "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", + "lastModified": 1767718503, + "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", + "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", "type": "github" }, "original": { @@ -129,15 +129,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1767909183, + "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1766946335, + "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "4af02a3925b454deb1c36603843da528b67ded6c", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766257984, - "narHash": "sha256-qsrSpSPvOD8RWGdE+dqzQhmJRndG4gSc1Pyli74CYIY=", + "lastModified": 1767907620, + "narHash": "sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc+ThpSSHm90s=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "70f54a1e1ba3478a56faf82431b2770bd727431d", + "rev": "5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -576,11 +576,11 @@ ] }, "locked": { - "lastModified": 1766100188, - "narHash": "sha256-Hi9USQQ+FkouYs4gJ+H0YSrluanjnGrGrhopjssFqOo=", + "lastModified": 1767392626, + "narHash": "sha256-sb9VGbCmtOf1UXKQzgoJnyekIiaXaZPb+fifaE4Dgig=", "owner": "shezdy", "repo": "hyprsplit", - "rev": "131a2bc5daba1e9cc4845456b44b311ca54f6316", + "rev": "d8585473531b24c23794b060d9fe2f5f89b05563", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "lastModified": 1767473322, + "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "type": "github" }, "original": { @@ -769,14 +769,17 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1765435293, - "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", + "lastModified": 1765720983, + "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", "owner": "feel-co", "repo": "ndg", - "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", + "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", "type": "github" }, "original": { @@ -827,11 +830,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -859,11 +862,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766125104, - "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -873,22 +876,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -904,7 +891,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -932,16 +919,15 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1765537745, - "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=", + "lastModified": 1767905953, + "narHash": "sha256-Bv2aFymqUptre+n5JxR0FFxhD1ZTu13IyQtOvUNDPRg=", "owner": "notashelf", "repo": "nvf", - "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0", + "rev": "328e096c8bb70cd3aa5da9ebec934b06f5a7869e", "type": "github" }, "original": { "owner": "notashelf", - "ref": "v0.8", "repo": "nvf", "type": "github" } @@ -968,11 +954,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -1007,11 +993,11 @@ ] }, "locked": { - "lastModified": 1766198367, - "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=", + "lastModified": 1767926800, + "narHash": "sha256-x0n73J6ufD/EhDlVdcoAmF0OQHZ+b0a2cKDc8RZyt+o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3", + "rev": "499e9eed88ff9494b6604205b42847e847dfeb91", "type": "github" }, "original": { @@ -1257,11 +1243,11 @@ ] }, "locked": { - "lastModified": 1765772419, - "narHash": "sha256-1mQ1K4fqebT54nz13rcRNjd6a+IbNLwLvYyR62EcyE8=", + "lastModified": 1767618227, + "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "227e836e43fe7985b4c4f8b0076446a6d66f3343", + "rev": "1586e49b3908b058e221f11d843eb46392dba17b", "type": "github" }, "original": { @@ -1274,14 +1260,14 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1764203689, - "narHash": "sha256-ivb0SqCptyIxx5g8ryRrUL0xrJhLrJPlvZbZjxVaui0=", + "lastModified": 1767919086, + "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "8f7347545dea59b75e40247cc1ed55a42f64dbbf", + "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b", "type": "github" }, "original": { @@ -1318,7 +1304,7 @@ "flake-utils": "flake-utils_4", "gitignore": "gitignore_3", "langref": "langref", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 91c6063db024d6e7d3046c65ef662db793ffd4ff..2bb8a7960f39b2ad84e043cfe054460f19134021 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; - nvf.url = "github:notashelf/nvf/v0.8"; + nvf.url = "github:notashelf/nvf"; nvf.inputs.nixpkgs.follows = "nixpkgs"; darwin.url = "github:lnl7/nix-darwin/master"; -- 2.54.0 From 607eb868eec0b819acf61cf1e131e0d5bb05a12f Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 6 Feb 2026 22:45:57 -0800 Subject: [PATCH 05/14] remove hyprland --- flake.lock | 70 +++++++++++++-------- flake.nix | 27 +++++++- modules/neovim/default.nix | 8 --- modules/shared/nix.nix | 3 + users/fish/vim/languages.nix | 3 - users/natalie/desktop/configuration.nix | 16 ++--- users/natalie/home/default.nix | 6 +- users/natalie/home/hyprland/binds.nix | 46 +++++++------- users/natalie/home/hyprland/hyprland.nix | 13 +++- users/natalie/home/hyprland/plugins.nix | 6 +- users/natalie/home/hyprland/settings.nix | 6 +- users/natalie/home/hyprland/windowrules.nix | 15 ++--- users/natalie/packages.nix | 1 + users/natalie/vim/languages.nix | 3 - 14 files changed, 129 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index 6825dbf42771c99fc231dece223fc40ad5226147..2f7707d2c278d97d35d1930bc314d5cc69e21a2b 100644 --- a/flake.lock +++ b/flake.lock @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1767909183, - "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=", + "lastModified": 1767930051, + "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509", + "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767907620, - "narHash": "sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc+ThpSSHm90s=", + "lastModified": 1768074837, + "narHash": "sha256-40JgzyxRdB7Je46J3YpZel+eb6G9m7DmWuapf8WqrG0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6", + "rev": "8f8b31e7a66acb4eb3836aa2fe6d751e5889bdaa", "type": "github" }, "original": { @@ -569,26 +569,6 @@ "type": "github" } }, - "hyprsplit": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1767392626, - "narHash": "sha256-sb9VGbCmtOf1UXKQzgoJnyekIiaXaZPb+fifaE4Dgig=", - "owner": "shezdy", - "repo": "hyprsplit", - "rev": "d8585473531b24c23794b060d9fe2f5f89b05563", - "type": "github" - }, - "original": { - "owner": "shezdy", - "repo": "hyprsplit", - "type": "github" - } - }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -788,6 +768,21 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1693833173, + "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -974,13 +969,13 @@ "darwin": "darwin", "home-manager": "home-manager", "hyprland": "hyprland", - "hyprsplit": "hyprsplit", "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", "nixpkgs": "nixpkgs_3", "nvf": "nvf", "rust-overlay": "rust-overlay", + "split-monitor-workspaces": "split-monitor-workspaces", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -1090,6 +1085,27 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" } }, + "split-monitor-workspaces": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nix-filter": "nix-filter" + }, + "locked": { + "lastModified": 1767711026, + "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=", + "owner": "Duckonaut", + "repo": "split-monitor-workspaces", + "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec", + "type": "github" + }, + "original": { + "owner": "Duckonaut", + "repo": "split-monitor-workspaces", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 2bb8a7960f39b2ad84e043cfe054460f19134021..d2044bb01ef0a1bdf1dc2fb5e775ef7e73cb31af 100644 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,9 @@ moonlight.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; - hyprsplit = { - url = "github:shezdy/hyprsplit"; - inputs.hyprland.follows = "hyprland"; + split-monitor-workspaces = { + url = "github:Duckonaut/split-monitor-workspaces"; + inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended }; zen-browser = { @@ -72,6 +72,27 @@ }; }); }) + # https://github.com/NixOS/nixpkgs/issues/476669#issuecomment-3707850520 + (_: prev: { + vesktop = prev.vesktop.overrideAttrs (_: { + preBuild = '' + cp -r ${prev.electron.dist} electron-dist + chmod -R u+w electron-dist + ''; + buildPhase = '' + runHook preBuild + + pnpm build + pnpm exec electron-builder \ + --dir \ + -c.asarUnpack="**/*.node" \ + -c.electronDist="electron-dist" \ + -c.electronVersion=${prev.electron.version} + + runHook postBuild + ''; + }); + }) # custom packages (_: pkgs: { diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index ba0eb9a3070da9d298bb1aaa677260b93cad1194..00bdc55f942877eca658ffef86d0c7ec89e8bc04 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -84,14 +84,6 @@ treesitter = { enable = true; addDefaultGrammars = true; - # this is buggy and keybind.nix overwrites its keymaps anyways - incrementalSelection.enable = false; - mappings.incrementalSelection = { - decrementByNode = null; - incrementByNode = null; - incrementByScope = null; - init = null; - }; }; debugger.nvim-dap = { enable = true; diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index 7997bf0f9cf8b0613f98f2a09d69e8929a9fe821..3c945aaa1f66bbe8bf071d2633812b2f7fbdc40d 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -28,11 +28,14 @@ "https://nix-community.cachix.org" # For haskell "https://cache.iog.io" + + "https://hyprland.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # For haskell "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; gc = { diff --git a/users/fish/vim/languages.nix b/users/fish/vim/languages.nix index d948dd1884da8b708ee20cb09db340ce269c74d5..136faddae4bf3857ce6518307e5510e495d7c043 100644 --- a/users/fish/vim/languages.nix +++ b/users/fish/vim/languages.nix @@ -69,9 +69,6 @@ enable = true; fold = true; addDefaultGrammars = true; - highlight = { - additionalVimRegexHighlighting = true; - }; grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ markdown_inline diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix index 4a872b330b4d5d554afffaff5293e37653e2d7c4..8fc0ba203558b3b37bcd192c80a45558a09f98f0 100644 --- a/users/natalie/desktop/configuration.nix +++ b/users/natalie/desktop/configuration.nix @@ -19,10 +19,10 @@ }; programs = { - hyprland = { - enable = true; - withUWSM = true; - }; + # hyprland = { + # enable = true; + # withUWSM = true; + # }; gamemode.enable = true; _1password.enable = true; @@ -87,10 +87,10 @@ xdgOpenUsePortal = true; config = { common.default = [ "gtk" ]; - hyprland.default = [ - "gtk" - "hyprland" - ]; + # hyprland.default = [ + # "gtk" + # "hyprland" + # ]; }; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; diff --git a/users/natalie/home/default.nix b/users/natalie/home/default.nix index 445c2f4561b6fe3a0a7c394810c132ce4da4e2e2..c5dd5d8abd082a55398053eb706f198564c9f070 100644 --- a/users/natalie/home/default.nix +++ b/users/natalie/home/default.nix @@ -2,11 +2,11 @@ { imports = [ ./tmux.nix - ./hyprland + # ./hyprland ./vicinae.nix - ./swaync.nix + # ./swaync.nix ./gtk.nix - ./waybar + # ./waybar ./scripts ]; } diff --git a/users/natalie/home/hyprland/binds.nix b/users/natalie/home/hyprland/binds.nix index 331a96ce2df08e24f65c323b02e9db86397f5335..139396467a12283c9eac0839dfed3080b3712384 100644 --- a/users/natalie/home/hyprland/binds.nix +++ b/users/natalie/home/hyprland/binds.nix @@ -72,29 +72,29 @@ "CTRL ALT, down, exec, hyprctl dispatch focuswindow tiled" # switch workspace - "$mainMod, 1, workspace, 1" - "$mainMod, 2, workspace, 2" - "$mainMod, 3, workspace, 3" - "$mainMod, 4, workspace, 4" - "$mainMod, 5, workspace, 5" - "$mainMod, 6, workspace, 6" - "$mainMod, 7, workspace, 7" - "$mainMod, 8, workspace, 8" - "$mainMod, 9, workspace, 9" - "$mainMod, 0, workspace, 10" + "$mainMod, 1, split-workspace, 1" + "$mainMod, 2, split-workspace, 2" + "$mainMod, 3, split-workspace, 3" + "$mainMod, 4, split-workspace, 4" + "$mainMod, 5, split-workspace, 5" + "$mainMod, 6, split-workspace, 6" + "$mainMod, 7, split-workspace, 7" + "$mainMod, 8, split-workspace, 8" + "$mainMod, 9, split-workspace, 9" + "$mainMod, 0, split-workspace, 10" # same as above, but switch to the workspace - "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent - "$mainMod SHIFT, 2, movetoworkspacesilent, 2" - "$mainMod SHIFT, 3, movetoworkspacesilent, 3" - "$mainMod SHIFT, 4, movetoworkspacesilent, 4" - "$mainMod SHIFT, 5, movetoworkspacesilent, 5" - "$mainMod SHIFT, 6, movetoworkspacesilent, 6" - "$mainMod SHIFT, 7, movetoworkspacesilent, 7" - "$mainMod SHIFT, 8, movetoworkspacesilent, 8" - "$mainMod SHIFT, 9, movetoworkspacesilent, 9" - "$mainMod SHIFT, 0, movetoworkspacesilent, 10" - "$mainMod CTRL, c, movetoworkspace, empty" + "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1" # movetoworkspacesilent + "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2" + "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3" + "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4" + "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5" + "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6" + "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7" + "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8" + "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9" + "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10" + "$mainMod CTRL, c, split-movetoworkspace, empty" # window control "$mainMod SHIFT, left, movewindow, l" @@ -131,8 +131,8 @@ ",XF86AudioPrev,exec, playerctl previous" ",XF86AudioStop,exec, playerctl stop" - "$mainMod, mouse_down, workspace, e-1" - "$mainMod, mouse_up, workspace, e+1" + "$mainMod, mouse_down, split-workspace, e-1" + "$mainMod, mouse_up, split-workspace, e+1" # clipboard manager "$mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history" diff --git a/users/natalie/home/hyprland/hyprland.nix b/users/natalie/home/hyprland/hyprland.nix index 0cece8848cead1e0cc27c017d0ea3523983bf6d3..98e84788058905ca61a73eda081d45fe0b865cc2 100644 --- a/users/natalie/home/hyprland/hyprland.nix +++ b/users/natalie/home/hyprland/hyprland.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + inputs, + config, + pkgs, + ... +}: { home.packages = with pkgs; [ swww @@ -23,8 +28,10 @@ # ]; wayland.windowManager.hyprland = { enable = true; - package = null; - portalPackage = null; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + # make sure to also set the portal package, so that they are in sync + portalPackage = + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; xwayland = { enable = true; diff --git a/users/natalie/home/hyprland/plugins.nix b/users/natalie/home/hyprland/plugins.nix index 3b11db0ee0d0c57ee5622d80e7c6d6289bf3ea51..9c3b9f8ddc81f2e7f95e0651dd81e1027bb74e50 100644 --- a/users/natalie/home/hyprland/plugins.nix +++ b/users/natalie/home/hyprland/plugins.nix @@ -2,12 +2,12 @@ { wayland.windowManager.hyprland = { plugins = [ - inputs.hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.hyprsplit + inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ]; settings = { plugin = { - hyprsplit = { - num_workspaces = 5; + split-monitor-workspaces = { + count = 5; }; }; }; diff --git a/users/natalie/home/hyprland/settings.nix b/users/natalie/home/hyprland/settings.nix index 5a14c824e7f5c64c8078dbf4e48cbfb659b3affe..2052cf6bf89dc4f5ae2d0e3de961910b7bda2948 100644 --- a/users/natalie/home/hyprland/settings.nix +++ b/users/natalie/home/hyprland/settings.nix @@ -1,6 +1,7 @@ { ... }: { wayland.windowManager.hyprland.settings = { + "$mainMod" = "SUPER"; # see: https://wiki.hypr.land/Configuring/Variables/#input input = { kb_layout = "us"; @@ -9,9 +10,8 @@ }; # https://wiki.hypr.land/Configuring/Variables/#general general = { - "$mainMod" = "SUPER"; layout = "dwindle"; - no_border_on_floating = false; + #no_border_on_floating = false; }; # https://wiki.hypr.land/Configuring/Variables/#misc @@ -23,7 +23,7 @@ enable_swallow = true; swallow_regex = "^(ghostty)$"; focus_on_activate = true; - new_window_takes_over_fullscreen = 2; + on_focus_under_fullscreen = 2; middle_click_paste = false; }; diff --git a/users/natalie/home/hyprland/windowrules.nix b/users/natalie/home/hyprland/windowrules.nix index f06d04f98c6413a1da9bab51b14e4ecba7370a78..9c32dd93f23d2fab815bd36f93b995b42d5a2076 100644 --- a/users/natalie/home/hyprland/windowrules.nix +++ b/users/natalie/home/hyprland/windowrules.nix @@ -3,10 +3,11 @@ wayland.windowManager.hyprland.settings = { # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules windowrule = [ - "float,class:^(mpv)$" - "pin,class:^(rofi)$" - "pin,class:^(waypaper)$" - "float,title:^(Volume Control)$" + # "float,class:^(mpv)$" + # "pin,class:^(rofi)$" + # "pin,class:^(waypaper)$" + "match:class ^(Volume Control)$, float on" + # "float,title:^(Volume Control)$" #awakened-poe-trade # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569 @@ -97,9 +98,9 @@ # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules layerrule = [ - "blur, vicinae" - "ignorealpha 0, vicinae" - "noanim, vicinae" + "blur on, match:namespace vicinae" + "ignore_alpha 0, match:namespace vicinae" + "no_anim on, match:namespace vicinae" # "dimaround, rofi" # "dimaround, swaync-control-center" ]; diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index 5a280c31a78733af85c510ac97cb52f4a925b804..a7083bae5b85c923822edf5ef228b366399d5957 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -94,6 +94,7 @@ with pkgs; # nodePackages.npm go elan + zola #expo deps watchman diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index d948dd1884da8b708ee20cb09db340ce269c74d5..136faddae4bf3857ce6518307e5510e495d7c043 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -69,9 +69,6 @@ enable = true; fold = true; addDefaultGrammars = true; - highlight = { - additionalVimRegexHighlighting = true; - }; grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ markdown_inline -- 2.54.0 From 0b7bf7ec529f0466cc6d64a4c292cd22cc7d1bbd Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 6 Feb 2026 22:47:00 -0800 Subject: [PATCH 06/14] remove hyprland from flake inputs --- flake.nix | 6 ------ modules/shared/nix.nix | 2 -- 2 files changed, 8 deletions(-) diff --git a/flake.nix b/flake.nix index d2044bb01ef0a1bdf1dc2fb5e775ef7e73cb31af..ae62ec0b2fb114a63a437dd8b200ecef0757ad5a 100644 --- a/flake.nix +++ b/flake.nix @@ -24,12 +24,6 @@ moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. moonlight.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland"; - split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; - inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended - }; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index 3c945aaa1f66bbe8bf071d2633812b2f7fbdc40d..6b787e6697036d252808fbb0bb4a634c0a2d4de0 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -29,13 +29,11 @@ # For haskell "https://cache.iog.io" - "https://hyprland.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # For haskell "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; gc = { -- 2.54.0 From 4d01314383ac53808670daf6fc1e7cefbb5e40ee Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 6 Feb 2026 22:54:49 -0800 Subject: [PATCH 07/14] natalie: readd cosmic --- flake.lock | 601 ++---------------------- users/natalie/desktop/configuration.nix | 16 +- 2 files changed, 49 insertions(+), 568 deletions(-) diff --git a/flake.lock b/flake.lock index 2f7707d2c278d97d35d1930bc314d5cc69e21a2b..aec6f4a0d6d11f57dad53d887ac3f5b2f44a33ef 100644 --- a/flake.lock +++ b/flake.lock @@ -51,39 +51,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1767024902, - "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -127,22 +94,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -158,6 +109,22 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_3": { "flake": false, "locked": { @@ -174,22 +141,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -231,7 +182,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -249,7 +200,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1705309234, @@ -267,7 +218,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -285,7 +236,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -302,28 +253,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "flake": false, "locked": { "lastModified": 1762808025, @@ -339,7 +268,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "zls", @@ -381,325 +310,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1766946335, - "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "4af02a3925b454deb1c36603843da528b67ded6c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1768074837, - "narHash": "sha256-40JgzyxRdB7Je46J3YpZel+eb6G9m7DmWuapf8WqrG0=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "8f8b31e7a66acb4eb3836aa2fe6d751e5889bdaa", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1766253372, - "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1767473322, - "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "langref": { "flake": false, "locked": { @@ -768,21 +378,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1693833173, - "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -806,8 +401,8 @@ "nix-options-search": { "inputs": { "flake-utils": "flake-utils_2", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_2" + "gitignore": "gitignore", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1765642879, @@ -824,22 +419,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1762977756, "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", @@ -855,7 +434,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1767364772, "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", @@ -870,7 +449,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -886,7 +465,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -904,14 +483,14 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "mnw": "mnw", "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1767905953, @@ -939,43 +518,18 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "android-nixpkgs": "android-nixpkgs", "apple-fonts": "apple-fonts", "darwin": "darwin", "home-manager": "home-manager", - "hyprland": "hyprland", "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nvf": "nvf", "rust-overlay": "rust-overlay", - "split-monitor-workspaces": "split-monitor-workspaces", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -1085,27 +639,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" } }, - "split-monitor-workspaces": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nix-filter": "nix-filter" - }, - "locked": { - "lastModified": 1767711026, - "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=", - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec", - "type": "github" - }, - "original": { - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1123,16 +656,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1196,62 +729,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -1274,9 +751,9 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1767919086, @@ -1294,7 +771,7 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_5", "nixpkgs": [ "zls", @@ -1318,9 +795,9 @@ "zls": { "inputs": { "flake-utils": "flake-utils_4", - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "langref": "langref", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix index 8fc0ba203558b3b37bcd192c80a45558a09f98f0..c424d6c49a7b44181886f4f7318da9eb3266b02d 100644 --- a/users/natalie/desktop/configuration.nix +++ b/users/natalie/desktop/configuration.nix @@ -12,12 +12,20 @@ documentation.man.generateCaches = false; services.displayManager = { enable = true; - sddm = { + cosmic-greeter.enable = true; + autoLogin = { enable = true; - wayland.enable = true; + user = user.username; }; }; + services.desktopManager = { + cosmic.enable = true; + }; + + # Slightly improves cosmic performances + services.system76-scheduler.enable = true; + programs = { # hyprland = { # enable = true; @@ -87,10 +95,6 @@ xdgOpenUsePortal = true; config = { common.default = [ "gtk" ]; - # hyprland.default = [ - # "gtk" - # "hyprland" - # ]; }; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; -- 2.54.0 From 9317835503b227f31ea879d8e2b17a87c5ead948 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 12 Feb 2026 17:35:01 -0800 Subject: [PATCH 08/14] chore(autofmt): nixfmt and nixfmt-rfc-style merged --- packages/autofmt/autofmt.js | 2 +- packages/autofmt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/autofmt/autofmt.js b/packages/autofmt/autofmt.js index ef74cbf9a340d1f69c3809cddfafd0a3e95d180e..8986cf9974c2abaa3f9b832f73b77d961d97e0eb 100755 --- a/packages/autofmt/autofmt.js +++ b/packages/autofmt/autofmt.js @@ -101,7 +101,7 @@ const formatters = { `--stdin-file-path=${file}`, ], }, - "nixfmt-rfc-style": { + "nixfmt": { languages: ["nix"], files: { "flake.nix": ({ text }) => text.includes("nixfmt"), diff --git a/packages/autofmt/default.nix b/packages/autofmt/default.nix index fa006e3e7dc0b83bcc7ebb686daafe54b4925e08..45db7d83280d053850fcd1f77fc1a757e338ed38 100644 --- a/packages/autofmt/default.nix +++ b/packages/autofmt/default.nix @@ -6,7 +6,7 @@ pkgs.writeShellApplication { clang-tools deno dprint - nixfmt-rfc-style + nixfmt prettierd # autofmt only runs on a local build of prettier rustfmt zig -- 2.54.0 From b2e57dc4d4ef7dc8bc658d20de86c1c0a1c70490 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 12 Feb 2026 17:38:40 -0800 Subject: [PATCH 09/14] feat(natalie): switch back to cosmic --- flake.lock | 228 +++++++++++++++--------- flake.nix | 5 +- lib/mkSystem.nix | 1 + users/natalie/desktop/configuration.nix | 17 +- users/natalie/desktop/home.nix | 4 +- users/natalie/home/vicinae.nix | 10 +- 6 files changed, 176 insertions(+), 89 deletions(-) diff --git a/flake.lock b/flake.lock index aec6f4a0d6d11f57dad53d887ac3f5b2f44a33ef..3b6136ded72c615c428ffdb20eb0e3f2809b9eab 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1767903972, - "narHash": "sha256-SvWSEUjrYBYMWuBjAuojqzeb/jIqhMgJs3HuhmJc2Lc=", + "lastModified": 1770842388, + "narHash": "sha256-MsJGx3VqumkoV8F1SYE/Ats738vC8CAA/K31eUR/cks=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "c1924b3257f203016d91b3cae1fd2b0d0f94953b", + "rev": "7a6a0f7ad4195b792d8c59caf03e877a535ecd4b", "type": "github" }, "original": { @@ -25,9 +25,7 @@ }, "apple-fonts": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "ny": "ny", "sf-arabic": "sf-arabic", "sf-armenian": "sf-armenian", @@ -38,15 +36,15 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1758228441, - "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=", - "owner": "Lyndeno", + "lastModified": 1770758542, + "narHash": "sha256-MhtCW601b9tAMP20FBToytRSUMoThtefJ3/7kCThwsE=", + "owner": "nmarks413", "repo": "apple-fonts.nix", - "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72", + "rev": "96173002252e90bac2a1f863d709508220cb5db7", "type": "github" }, "original": { - "owner": "Lyndeno", + "owner": "nmarks413", "repo": "apple-fonts.nix", "type": "github" } @@ -58,11 +56,11 @@ ] }, "locked": { - "lastModified": 1767718503, - "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", + "lastModified": 1770736414, + "narHash": "sha256-x5xdJgUxNflO9j2sJHIHnPujDy6eAWJPCMQml5y9XB4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", + "rev": "7c952d9a524ffbbd5b5edca38fe6d943499585cc", "type": "github" }, "original": { @@ -80,11 +78,11 @@ ] }, "locked": { - "lastModified": 1764011051, - "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", + "lastModified": 1768818222, + "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", "owner": "numtide", "repo": "devshell", - "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", + "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", "type": "github" }, "original": { @@ -149,11 +147,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -199,27 +197,27 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -236,7 +234,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -296,11 +294,11 @@ ] }, "locked": { - "lastModified": 1767930051, - "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", + "lastModified": 1770818644, + "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=", "owner": "nix-community", "repo": "home-manager", - "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", + "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7", "type": "github" }, "original": { @@ -324,11 +322,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1769981889, + "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", "type": "github" }, "original": { @@ -344,11 +342,11 @@ ] }, "locked": { - "lastModified": 1765916709, - "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=", + "lastModified": 1770835386, + "narHash": "sha256-Yp0ooU66hXjGq0cAG9WwhmLCfqCVzRxGXx7+nggPlqI=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce", + "rev": "6e0829e81d363e4ebb7c3f04601a50853f752c99", "type": "github" }, "original": { @@ -365,15 +363,16 @@ ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } @@ -385,11 +384,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -402,14 +401,14 @@ "inputs": { "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765642879, - "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=", + "lastModified": 1768731915, + "narHash": "sha256-5lMgfTfLpsqMMlbRbaQ0jZMsh764IocBsM3cbR0QvPU=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e", + "rev": "f8f48b94dd931eff54e17d2185ef310c02bfa0bb", "type": "github" }, "original": { @@ -419,6 +418,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1762977756, "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", @@ -434,13 +449,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1770812194, + "narHash": "sha256-OH+lkaIKAvPXR3nITO7iYZwew2nW9Y7Xxq0yfM/UcUU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "8482c7ded03bae7550f3d69884f1e611e3bd19e8", "type": "github" }, "original": { @@ -449,7 +464,23 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -465,7 +496,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -493,11 +524,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767905953, - "narHash": "sha256-Bv2aFymqUptre+n5JxR0FFxhD1ZTu13IyQtOvUNDPRg=", + "lastModified": 1770813256, + "narHash": "sha256-G6np3C9Zz0ddUevUOox4mPZqclbV3xSyHuhRR0Dzk4g=", "owner": "notashelf", "repo": "nvf", - "rev": "328e096c8bb70cd3aa5da9ebec934b06f5a7869e", + "rev": "bd265fee7e9655e2898e6f6b76267eb832b0f3c9", "type": "github" }, "original": { @@ -527,9 +558,10 @@ "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nvf": "nvf", "rust-overlay": "rust-overlay", + "vicinae": "vicinae", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -542,11 +574,11 @@ ] }, "locked": { - "lastModified": 1767926800, - "narHash": "sha256-x0n73J6ufD/EhDlVdcoAmF0OQHZ+b0a2cKDc8RZyt+o=", + "lastModified": 1770865833, + "narHash": "sha256-oiARqnlvaW6pVGheVi4ye6voqCwhg5hCcGish2ZvQzI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "499e9eed88ff9494b6604205b42847e847dfeb91", + "rev": "c8cfbe26238638e2f3a2c0ae7e8d240f5e4ded85", "type": "github" }, "original": { @@ -582,7 +614,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=", + "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -630,7 +662,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=", + "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -729,6 +761,40 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "vicinae": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" + }, + "locked": { + "lastModified": 1770848661, + "narHash": "sha256-UseItagXTZy3RL5PQU7qh0fzpvJKDV1lEYpfbKo/riA=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "10c98516b63bbb790a63b0ed84724352f32bc08d", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -736,11 +802,11 @@ ] }, "locked": { - "lastModified": 1767618227, - "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", + "lastModified": 1770438797, + "narHash": "sha256-pwnQTmZswF6bu2/Ie7ajOo8w6rXQwVI954S9WX1UG3w=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "1586e49b3908b058e221f11d843eb46392dba17b", + "rev": "d396599774bdbafeb86c122dc2c422c7084ea390", "type": "github" }, "original": { @@ -753,14 +819,14 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1767919086, - "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=", + "lastModified": 1770598090, + "narHash": "sha256-k+82IDgTd9o5sxHIqGlvfwseKln3Ejx1edGtDltuPXo=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b", + "rev": "142495696982c88edddc8e17e4da90d8164acadf", "type": "github" }, "original": { @@ -797,7 +863,7 @@ "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "langref": "langref", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index ae62ec0b2fb114a63a437dd8b200ecef0757ad5a..1679d6231b52b25bdc4506d2765c07b133ef1a78 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,7 @@ rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; - apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; - apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; + apple-fonts.url = "github:nmarks413/apple-fonts.nix"; nvf.url = "github:notashelf/nvf"; nvf.inputs.nixpkgs.follows = "nixpkgs"; @@ -35,6 +34,8 @@ }; + vicinae.url = "github:vicinaehq/vicinae"; + nix-options-search.url = "github:madsbv/nix-options-search"; nix-index-database.url = "github:nix-community/nix-index-database"; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 9e3a13c459d7382e0c7d888d249f7ccb23a00fff..e8f6a0ce18544893f6ecffe87e6e86b065885c44 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -76,6 +76,7 @@ let ) inputs.nvf.homeManagerModules.default inputs.android-nixpkgs.hmModule + inputs.vicinae.homeManagerModules.default ]; in systemFunc { diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix index c424d6c49a7b44181886f4f7318da9eb3266b02d..68f5d35069b919ea9778973afa0381f96fca74a3 100644 --- a/users/natalie/desktop/configuration.nix +++ b/users/natalie/desktop/configuration.nix @@ -94,10 +94,23 @@ enable = true; xdgOpenUsePortal = true; config = { - common.default = [ "gtk" ]; + common = { + default = [ + "cosmic" + "gtk" + ]; + + "org.freedesktop.impl.portal.Secret" = [ + "gnome-keyring" + ]; + }; + }; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-cosmic + ]; }; virtualisation = { waydroid.enable = true; diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index cf6d38ac1ff4064795a753843cb0db6cfd1a3145..85b09dff5eb6236e9cec14f09e711a0d5a70cd02 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -26,12 +26,11 @@ steam-run vulkan-tools rusty-path-of-building - wineWowPackages.stable + wineWow64Packages.stable winetricks (prismlauncher.override { gamemodeSupport = true; }) umu-launcher limo - nexusmods-app-unfree protontricks (pkgs.callPackage ../../../packages/exiled_exchange_2 { }) awakened_poe_trade @@ -55,7 +54,6 @@ mpv wireguard-tools signal-desktop - inputs.zls.packages.x86_64-linux.zls rust-bin.stable.latest.default inputs.zen-browser.packages.x86_64-linux.default ]; diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index 301a7a6583d68cd7e2fb2b7921400e2726e15e43..132ed839a7ca552bb1923bc5f6dbbe537c05cf3e 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -1,7 +1,15 @@ { inputs, pkgs, ... }: { - programs.vicinae = { + services.vicinae = { enable = true; + systemd = { + enable = true; + autoStart = true; + environment = { + USE_LAYER_SHELL = 0; + }; + + }; settings = { faviconService = "twenty"; # twenty | google | none font.size = 11; -- 2.54.0 From da5d73d299727e1ad798b91024d613216bfc5856 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 12 Feb 2026 17:39:01 -0800 Subject: [PATCH 10/14] fix: weird kernel and nvidia driver problems --- modules/nixos/boot.nix | 2 +- modules/nixos/nvidia.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/boot.nix b/modules/nixos/boot.nix index 9593a0cbcaa4203059e068af6c626f6f60e49fbc..ef79eb73e127d7c7a0442f093ec271dcbcc10d40 100644 --- a/modules/nixos/boot.nix +++ b/modules/nixos/boot.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc. + kernelPackages = pkgs.linuxPackages_6_18; # _zen, _hardened, _rt, _rt_latest, etc. loader = { efi = { canTouchEfiVariables = true; diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 70718b5dd8815a83696b806b9d67a14279224192..94b28809f6429dddccb19a9d0a347875f9dac027 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -4,7 +4,7 @@ ... }: let - nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest; + nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.stable; in { services.xserver.videoDrivers = [ -- 2.54.0 From 9f145c7723bd5a743785fc1ed3fb88bc38c30139 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 20 Feb 2026 17:00:52 -0800 Subject: [PATCH 11/14] chore: update flake inputs --- flake.lock | 156 ++++++++++++++++++++--------------------------------- flake.nix | 24 ++++----- 2 files changed, 71 insertions(+), 109 deletions(-) diff --git a/flake.lock b/flake.lock index 2d38f566f70da604f4a5a9d3f7414ba275c5a622..14f9529f3ed1bee011eb19c9fe505ca13cfdd65a 100644 --- a/flake.lock +++ b/flake.lock @@ -9,16 +9,11 @@ ] }, "locked": { - "lastModified": 1770842388, - "narHash": "sha256-MsJGx3VqumkoV8F1SYE/Ats738vC8CAA/K31eUR/cks=", + "lastModified": 1771360638, + "narHash": "sha256-s6dqFccvgDj5+q10/CroMzMzjMWWjEOiQsmi1CFeqiw=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "7a6a0f7ad4195b792d8c59caf03e877a535ecd4b", - "lastModified": 1767990299, - "narHash": "sha256-Jz+cp9Ln4++1XiKw9KvZEM2dJ9AdOvayk97ybi9g7zc=", - "owner": "tadfisher", - "repo": "android-nixpkgs", - "rev": "449f2cadee7cb7b665aea209a67f8ecf30176653", + "rev": "1a9b8a0d2950d9aedb788b74ebd60effae3a58a4", "type": "github" }, "original": { @@ -61,11 +56,11 @@ ] }, "locked": { - "lastModified": 1770736414, - "narHash": "sha256-x5xdJgUxNflO9j2sJHIHnPujDy6eAWJPCMQml5y9XB4=", + "lastModified": 1771371916, + "narHash": "sha256-G14VTfmzzRYxAhtEBNanQgCNA++Cv0/9iV4h/lkqX9U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7c952d9a524ffbbd5b5edca38fe6d943499585cc", + "rev": "aff4c008cec17d6a6760949df641ca0ea9179cac", "type": "github" }, "original": { @@ -152,11 +147,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -202,24 +197,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_6" }, @@ -237,7 +214,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_7" }, @@ -299,11 +276,11 @@ ] }, "locked": { - "lastModified": 1770818644, - "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=", + "lastModified": 1771269455, + "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7", + "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "type": "github" }, "original": { @@ -327,11 +304,11 @@ }, "mnw": { "locked": { - "lastModified": 1769981889, - "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -389,11 +366,11 @@ ] }, "locked": { - "lastModified": 1770315571, - "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -456,11 +433,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770812194, - "narHash": "sha256-OH+lkaIKAvPXR3nITO7iYZwew2nW9Y7Xxq0yfM/UcUU=", + "lastModified": 1771177547, + "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8482c7ded03bae7550f3d69884f1e611e3bd19e8", + "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2", "type": "github" }, "original": { @@ -470,22 +447,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1762111121, "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", @@ -501,23 +462,23 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { - "locked": { - "lastModified": 1708161998, - "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "84d981bae8b5e783b3b548de505b22880559515f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -545,11 +506,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1770813256, - "narHash": "sha256-G6np3C9Zz0ddUevUOox4mPZqclbV3xSyHuhRR0Dzk4g=", + "lastModified": 1771331465, + "narHash": "sha256-lTWc6reKRLQfhh4uRsBWGbdwcHt5fQpOxt6jueHZ20c=", "owner": "notashelf", "repo": "nvf", - "rev": "bd265fee7e9655e2898e6f6b76267eb832b0f3c9", + "rev": "0c650e0801aebbfc2817c11140c90768c178b13b", "type": "github" }, "original": { @@ -595,11 +556,11 @@ ] }, "locked": { - "lastModified": 1770865833, - "narHash": "sha256-oiARqnlvaW6pVGheVi4ye6voqCwhg5hCcGish2ZvQzI=", + "lastModified": 1771384185, + "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c8cfbe26238638e2f3a2c0ae7e8d240f5e4ded85", + "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2", "type": "github" }, "original": { @@ -753,6 +714,7 @@ } }, "systems_5": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -803,11 +765,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1770848661, - "narHash": "sha256-UseItagXTZy3RL5PQU7qh0fzpvJKDV1lEYpfbKo/riA=", + "lastModified": 1771257846, + "narHash": "sha256-2tz4RVC1IwSpQL/t0raRZ+ydHQje0QzN65rcJo+JjyQ=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "10c98516b63bbb790a63b0ed84724352f32bc08d", + "rev": "e9d804bfddad02ff80347401ae0d42ca8202519f", "type": "github" }, "original": { @@ -823,11 +785,11 @@ ] }, "locked": { - "lastModified": 1770438797, - "narHash": "sha256-pwnQTmZswF6bu2/Ie7ajOo8w6rXQwVI954S9WX1UG3w=", + "lastModified": 1771303137, + "narHash": "sha256-CQ0j9kovzdO6pAjesebt6uxkcFsjbhENVrengRvKpUc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "d396599774bdbafeb86c122dc2c422c7084ea390", + "rev": "271488f067d8452dd0494b650e2e263ac4104e06", "type": "github" }, "original": { @@ -839,15 +801,15 @@ "zig": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5", + "systems": "systems_5" }, "locked": { - "lastModified": 1770598090, - "narHash": "sha256-k+82IDgTd9o5sxHIqGlvfwseKln3Ejx1edGtDltuPXo=", + "lastModified": 1771352843, + "narHash": "sha256-AZ3TT5BWcdl/0eNCmUmJm8153YkBBpiSfuTyvxzCyjY=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "142495696982c88edddc8e17e4da90d8164acadf", + "rev": "46010092e447ffc31d7e35d55b4fb466000f3f17", "type": "github" }, "original": { @@ -859,7 +821,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "zls", "nixpkgs" @@ -881,10 +843,10 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "gitignore": "gitignore_2", "langref": "langref", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 1679d6231b52b25bdc4506d2765c07b133ef1a78..a9317dbb4bc952f69ece364e28d9b22184513ae5 100644 --- a/flake.nix +++ b/flake.nix @@ -172,17 +172,17 @@ }; # generate checks for "nix flake check --all-systems --no-build" - checks.aarch64-darwin = builtins.listToAttrs ( - builtins.map ( - name: - let - d = darwinConfigurations.${name}.system; - in - { - name = "darwinConfiguration-" + d.name; - value = d; - } - ) (builtins.attrNames darwinConfigurations) - ); + # checks.aarch64-darwin = builtins.listToAttrs ( + # builtins.map ( + # name: + # let + # d = darwinConfigurations.${name}.system; + # in + # { + # name = "darwinConfiguration-" + d.name; + # value = d; + # } + # ) (builtins.attrNames darwinConfigurations) + # ); }; } -- 2.54.0 From ac59d1acc090a988f42efe3f60cecc6a154dc506 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 20 Feb 2026 17:02:20 -0800 Subject: [PATCH 12/14] chore(natalie): remove deprecated xorg package alias --- modules/nixos/ld.nix | 48 +++++++++++++++++----------------- users/natalie/desktop/home.nix | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/nixos/ld.nix b/modules/nixos/ld.nix index cfbf4e05fed55f65b714cd31efa6fe21a2bcd3fb..3e2ac8af4295962ed08ccf1580bd3f0e37c20cec 100644 --- a/modules/nixos/ld.nix +++ b/modules/nixos/ld.nix @@ -9,25 +9,25 @@ libxcrypt # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L72-L79 - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes + libXcomposite + libXtst + libXrandr + libXext + libX11 + libXfixes libGL libva # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L124-L136 fontconfig freetype - xorg.libXt - xorg.libXmu + libXt + libXmu libogg libvorbis SDL SDL2_image - glew110 + glew_1_10 libdrm libidn tbb @@ -68,20 +68,20 @@ stdenv.cc.cc systemd vulkan-loader - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + libxkbfile + libxshmfence zlib libxslt @@ -90,6 +90,6 @@ gtk2 gtk2-x11 libsecret - xorg.libXinerama + libXinerama ]; } diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index 85b09dff5eb6236e9cec14f09e711a0d5a70cd02..a0acfa33fe569f0b7e15a3a2ed30bf4a7dadc878 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -38,7 +38,7 @@ #window manager stuff wofi - xorg.xauth + xauth #linux tools legcord pavucontrol -- 2.54.0 From ec0626ddc6706b2c33d7e7e1da7d1530ec0eb201 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 20 Feb 2026 17:02:49 -0800 Subject: [PATCH 13/14] feat: add earlyoom to prevent locking up DE due to lack of memory --- modules/nixos/services.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index 20314be33a994a99e64cfe4c4e0f5866b8d576ef..e88aa09662be4162c73b93fc07141ce8920c086a 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -76,5 +76,19 @@ X11Forwarding = true; }; }; + earlyoom = { + enable = true; + freeSwapThreshold = 2; + freeMemThreshold = 2; + + extraArgs = [ + "-g" + "--avoid" + "^(Xwayland|.cosmic*|ghostty|.vicinae*|.xdg*)$" + "--prefer" + "^(electron)$" + ]; + + }; }; } -- 2.54.0 From 6669c604a73c635a4e2b65ae98065745003fc9cc Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 20 Feb 2026 17:03:14 -0800 Subject: [PATCH 14/14] feat(natalie): add zoom package --- users/natalie/home/default.nix | 2 +- users/natalie/packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/users/natalie/home/default.nix b/users/natalie/home/default.nix index c5dd5d8abd082a55398053eb706f198564c9f070..edf88865bb96fe788205d6663f8c186e0df37e6a 100644 --- a/users/natalie/home/default.nix +++ b/users/natalie/home/default.nix @@ -5,7 +5,7 @@ # ./hyprland ./vicinae.nix # ./swaync.nix - ./gtk.nix + # ./gtk.nix # ./waybar ./scripts ]; diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index a7083bae5b85c923822edf5ef228b366399d5957..45778607a8eda78b7864b6562447648d6b1f7c03 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -36,6 +36,7 @@ with pkgs; anki-bin tailscale openconnect + zoom-us #nix tools direnv -- 2.54.0