From 8e4da9d06dc6441fb5b9eca01694d719dd663b99 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 8 Jun 2025 15:03:20 +0100 Subject: [PATCH 1/8] added virtualisation with qemu and virt-manager also moved virt-manager from home-manager to modules/virtualisation.nix because it doesnt work without qemu so may as well added user blue to group libvirtd --- flake.nix | 1 + home-manager/packages.nix | 1 - hosts/gabbielaptop/configuration.nix | 1 + modules/aagl.nix | 2 +- modules/packages.nix | 1 - modules/virtualisation.nix | 6 ++++++ 6 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 modules/virtualisation.nix diff --git a/flake.nix b/flake.nix index ba998fb..a2e62a7 100644 --- a/flake.nix +++ b/flake.nix @@ -119,6 +119,7 @@ ./modules/waydroid.nix ./modules/packages.nix ./modules/aagl.nix + ./modules/virtualisation.nix inputs.aagl.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote inputs.musnix.nixosModules.musnix diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 5ebe093..0f62b3f 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -15,7 +15,6 @@ telegram-desktop # Telegram messenger client pavucontrol # Useful audio control GUI stable.prismlauncher # Minecraft launcher - virt-manager # QEMU manager bat # cat but with syntax highlighting bc # terminal calculator wget # download files diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index 3d8dd24..fd75b23 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -132,6 +132,7 @@ "wheel" "dialout" "audio" + "libvirtd" ]; shell = pkgs.fish; }; diff --git a/modules/aagl.nix b/modules/aagl.nix index 2f332c1..16990b3 100644 --- a/modules/aagl.nix +++ b/modules/aagl.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { programs.honkers-railway-launcher.enable = true; } diff --git a/modules/packages.nix b/modules/packages.nix index 80f794f..e9e1a0c 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -15,6 +15,5 @@ pciutils dmidecode nixd - qemu ]; } diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix new file mode 100644 index 0000000..4bbef72 --- /dev/null +++ b/modules/virtualisation.nix @@ -0,0 +1,6 @@ +{...}:{ + virtualisation.libvirtd = { + enable = true; + }; + programs.virt-manager.enable = true; +} From df2eaeb8d01dd69c61771c863806969be50ad831 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 8 Jun 2025 15:31:15 +0100 Subject: [PATCH 2/8] added some more vim plugins mainly hardtime.nvim and neo-tree cant get neo-tree to open on startup by default but it works if you run `nvim .` instead of `nvim` as it hijacks the default file browser --- home-manager/nvf.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix index d86a97a..98d2f60 100644 --- a/home-manager/nvf.nix +++ b/home-manager/nvf.nix @@ -9,8 +9,11 @@ name = "base16"; }; - statusline.lualine.enable = true; - telescope.enable = true; + statusline.lualine.enable = true; # statusline + telescope.enable = true; # fuzzy finder + filetree.neo-tree.enable = true; # filetree + binds.cheatsheet.enable = true; # telescope-searchable cheatsheet + binds.hardtime-nvim.enable = true; # stops you using arrow keys for navigation and recommends vim motions viAlias = true; vimAlias = true; From fb68ef006b5f8ea29ab43b12ff90ef0cf3e5d4a3 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sat, 21 Jun 2025 01:40:19 +0100 Subject: [PATCH 3/8] added some stuff to make adhod compilation easier can now run random apps from gh better yay --- hosts/gabbielaptop/configuration.nix | 2 ++ modules/packages.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index fd75b23..9dd9499 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -34,6 +34,8 @@ networking.hostName = "gabbielaptop"; # Define your hostname. + programs.dconf.enable = true; # required for some apps that are just github code i compile myself instead of using a package + hardware.graphics = { enable = true; enable32Bit = true; diff --git a/modules/packages.nix b/modules/packages.nix index e9e1a0c..fcccb1f 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -15,5 +15,6 @@ pciutils dmidecode nixd + adwaita-icon-theme ]; } From c29ca4b14085f475435fa2b2b73ac89e2f750ead Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sat, 21 Jun 2025 01:49:41 +0100 Subject: [PATCH 4/8] enabled touchpad + keyboard for gaming again... --- home-manager/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 3065b71..6fd1a13 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -30,7 +30,7 @@ follow_mouse = 1; mouse_refocus = false; touchpad = { - disable_while_typing = true; + disable_while_typing = false; }; }; gestures = { From 3174ad7da64a030905628de982a0e5a89e617b13 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 22 Jun 2025 01:51:29 +0100 Subject: [PATCH 5/8] added firefox pip window rules unfortunately this forces any fullscreen app out of fullscreen every time a new video starts but ig i will burn that bridge when it annoys me too much --- home-manager/hyprland.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 6fd1a13..021d390 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -20,6 +20,16 @@ "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" "name:main, monitor:eDP-2, default:true, persistent:true" ]; + windowrulev2 = [ + "keepaspectratio,class:^(floorp)$,title:^(Picture-in-Picture)$" + "noborder,class:^(floorp)$,title:^(Picture-in-Picture)$" + #"fakefullscreen,class:^(floorp)$,title:^(Floorp)$" + #"fakefullscreen,class:^(floorp)$,title:^(Picture-in-Picture)$" + "pin,class:^(floorp)$,title:^(Floorp)$" + "pin,class:^(floorp)$,title:^(Picture-in-Picture)$" + "float,class:^(floorp)$,title:^(Floorp)$" + "float,class:^(floorp)$,title:^(Picture-in-Picture)$" + ]; # Define SUPER key as mod key "$mod" = "SUPER"; From 527a535e2dd88f602b90130970f922eafdfa4c15 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 22 Jun 2025 18:44:40 +0100 Subject: [PATCH 6/8] updated flake this broke everything lmao, going to revert because using this makes floorp crash about thirty seconds after opening and makes all my fonts fucky wucky, not sure why, probably stylix --- flake.lock | 149 ++++++++++++++++---------------------- home-manager/hyprland.nix | 8 +- modules/waydroid.nix | 2 +- 3 files changed, 66 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 36841a2..682e5c5 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1747867343, - "narHash": "sha256-FmEdhjLXtv92TQcFQHTetgVXkM4vBmD4nls8mvG9lMg=", + "lastModified": 1750597689, + "narHash": "sha256-3ComII0BkmdohISrshICQiAB6TU+VHHIRnWK0ckA0/s=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "2d87503f028c14f523f63ccb4a87d4b8d55c02d2", + "rev": "ec2ec4ec3f908ed9b125ea4afd52627bed60f183", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", + "lastModified": 1748970125, + "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "owner": "ipetkov", "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", + "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1748832438, - "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1748830238, - "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", + "lastModified": 1750604619, + "narHash": "sha256-wNMm3ioA7q83UBDBQDew47bbjyvhOIcUcpjRFq3kHBY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", + "rev": "39b7903eaba5579046f7069b9d85d3ef4f2f972c", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747056319, - "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", + "lastModified": 1750168384, + "narHash": "sha256-PBfJ7dGsR02im/RYN8wXII8yNPFhKxiPdq+JDfbvD2k=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", + "rev": "38c2addd2e0cedcb03708de6e6c21fb1be86d410", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "mnw": { "locked": { - "lastModified": 1748278309, - "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -489,22 +489,17 @@ }, "nil": { "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], "nixpkgs": [ "nvf", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", + "lastModified": 1750047244, + "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", "owner": "oxalica", "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", + "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", "type": "github" }, "original": { @@ -547,11 +542,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -562,11 +557,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1748867139, - "narHash": "sha256-5tgvCRN9GT9DoVfKEYco+OTRmkPStOgu2uZV8+DLNN8=", + "lastModified": 1750612886, + "narHash": "sha256-Fp0rQqWKJ4q2CKC+KZVhuo8k1iqB5iqszNPjbhje690=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a09d57a6634396ca52fe3a951ba8e824d2fe2b2d", + "rev": "19cf79228f908ab40290ada45112326fc33a013a", "type": "github" }, "original": { @@ -578,11 +573,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748708770, - "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { @@ -594,11 +589,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -610,11 +605,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -631,11 +626,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748864791, - "narHash": "sha256-YRRRbOEc8aXpzSvN3qdIkqtVQ9xjx9rgichtaSQ0qwY=", + "lastModified": 1750610807, + "narHash": "sha256-0mLn0eDrHnt0lzjunCK/j52H7e6to3jjMrrFcHcJXco=", "owner": "nix-community", "repo": "NUR", - "rev": "4ee0c2599266fb26e6ac3cb71836e96f25df446e", + "rev": "b1e8e361e5781252cfb1eade97312ae28f8e4e05", "type": "github" }, "original": { @@ -682,11 +677,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748651104, - "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", + "lastModified": 1750441488, + "narHash": "sha256-JuFBp2xM4JD/XGb69dTSDOdGbUD0fVHlgY9X9GHGTFE=", "owner": "notashelf", "repo": "nvf", - "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", + "rev": "18c17b7b8dbf6e0f10e3eb5f1fa5341a9175a3b1", "type": "github" }, "original": { @@ -708,11 +703,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -746,33 +741,11 @@ ] }, "locked": { - "lastModified": 1747017456, - "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", + "lastModified": 1749955444, + "narHash": "sha256-CllTHvHX8KAdAZ+Lxzd23AmZTxO1Pfy+zC43/5tYkAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5b07506ae89b025b14de91f697eba23b48654c52", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", + "rev": "539ba15741f0e6691a2448743dbc601d8910edce", "type": "github" }, "original": { @@ -847,11 +820,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748803004, - "narHash": "sha256-dLGywKYxge3rzD6AqtVP0UmMHONdQNCWXj6i0lfm/UM=", + "lastModified": 1750562714, + "narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", "owner": "nix-community", "repo": "stylix", - "rev": "5f841056ca60bea7312aeade957da084cd95b26e", + "rev": "100b968012804d6526c5f48a32c30680916bc474", "type": "github" }, "original": { diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 021d390..5f0055c 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -12,12 +12,12 @@ # Monitor config for home desk layout monitor = [ "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, -960x-1080, auto" # left external monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # right external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, -960x-1080, auto" # left external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, 960x-1080, auto" # right external monitor ]; workspace = [ - "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" - "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" + "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" + "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" "name:main, monitor:eDP-2, default:true, persistent:true" ]; windowrulev2 = [ diff --git a/modules/waydroid.nix b/modules/waydroid.nix index 00ff0d9..4100925 100644 --- a/modules/waydroid.nix +++ b/modules/waydroid.nix @@ -1,3 +1,3 @@ { - virtualisation.waydroid.enable = true; + virtualisation.waydroid.enable = false; } From 3aa7d184a84e164f26ef7ba0bdf4053a1f0224fc Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 22 Jun 2025 18:45:53 +0100 Subject: [PATCH 7/8] Revert "updated flake" This reverts commit 527a535e2dd88f602b90130970f922eafdfa4c15. --- flake.lock | 149 ++++++++++++++++++++++---------------- home-manager/hyprland.nix | 8 +- modules/waydroid.nix | 2 +- 3 files changed, 93 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 682e5c5..36841a2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1750597689, - "narHash": "sha256-3ComII0BkmdohISrshICQiAB6TU+VHHIRnWK0ckA0/s=", + "lastModified": 1747867343, + "narHash": "sha256-FmEdhjLXtv92TQcFQHTetgVXkM4vBmD4nls8mvG9lMg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "ec2ec4ec3f908ed9b125ea4afd52627bed60f183", + "rev": "2d87503f028c14f523f63ccb4a87d4b8d55c02d2", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1748970125, - "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1750604619, - "narHash": "sha256-wNMm3ioA7q83UBDBQDew47bbjyvhOIcUcpjRFq3kHBY=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "39b7903eaba5579046f7069b9d85d3ef4f2f972c", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750168384, - "narHash": "sha256-PBfJ7dGsR02im/RYN8wXII8yNPFhKxiPdq+JDfbvD2k=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "38c2addd2e0cedcb03708de6e6c21fb1be86d410", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1748278309, + "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", "type": "github" }, "original": { @@ -489,17 +489,22 @@ }, "nil": { "inputs": { + "flake-utils": [ + "nvf", + "flake-utils" + ], "nixpkgs": [ "nvf", "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750047244, - "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", - "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", "type": "github" }, "original": { @@ -542,11 +547,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -557,11 +562,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1750612886, - "narHash": "sha256-Fp0rQqWKJ4q2CKC+KZVhuo8k1iqB5iqszNPjbhje690=", + "lastModified": 1748867139, + "narHash": "sha256-5tgvCRN9GT9DoVfKEYco+OTRmkPStOgu2uZV8+DLNN8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf79228f908ab40290ada45112326fc33a013a", + "rev": "a09d57a6634396ca52fe3a951ba8e824d2fe2b2d", "type": "github" }, "original": { @@ -573,11 +578,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { @@ -589,11 +594,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -605,11 +610,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -626,11 +631,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750610807, - "narHash": "sha256-0mLn0eDrHnt0lzjunCK/j52H7e6to3jjMrrFcHcJXco=", + "lastModified": 1748864791, + "narHash": "sha256-YRRRbOEc8aXpzSvN3qdIkqtVQ9xjx9rgichtaSQ0qwY=", "owner": "nix-community", "repo": "NUR", - "rev": "b1e8e361e5781252cfb1eade97312ae28f8e4e05", + "rev": "4ee0c2599266fb26e6ac3cb71836e96f25df446e", "type": "github" }, "original": { @@ -677,11 +682,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1750441488, - "narHash": "sha256-JuFBp2xM4JD/XGb69dTSDOdGbUD0fVHlgY9X9GHGTFE=", + "lastModified": 1748651104, + "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", "owner": "notashelf", "repo": "nvf", - "rev": "18c17b7b8dbf6e0f10e3eb5f1fa5341a9175a3b1", + "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", "type": "github" }, "original": { @@ -703,11 +708,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -741,11 +746,33 @@ ] }, "locked": { - "lastModified": 1749955444, - "narHash": "sha256-CllTHvHX8KAdAZ+Lxzd23AmZTxO1Pfy+zC43/5tYkAE=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "539ba15741f0e6691a2448743dbc601d8910edce", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nvf", + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741055476, + "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "aefb7017d710f150970299685e8d8b549d653649", "type": "github" }, "original": { @@ -820,11 +847,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750562714, - "narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", + "lastModified": 1748803004, + "narHash": "sha256-dLGywKYxge3rzD6AqtVP0UmMHONdQNCWXj6i0lfm/UM=", "owner": "nix-community", "repo": "stylix", - "rev": "100b968012804d6526c5f48a32c30680916bc474", + "rev": "5f841056ca60bea7312aeade957da084cd95b26e", "type": "github" }, "original": { diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 5f0055c..021d390 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -12,12 +12,12 @@ # Monitor config for home desk layout monitor = [ "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, -960x-1080, auto" # left external monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, 960x-1080, auto" # right external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, -960x-1080, auto" # left external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # right external monitor ]; workspace = [ - "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" - "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" + "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" + "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" "name:main, monitor:eDP-2, default:true, persistent:true" ]; windowrulev2 = [ diff --git a/modules/waydroid.nix b/modules/waydroid.nix index 4100925..00ff0d9 100644 --- a/modules/waydroid.nix +++ b/modules/waydroid.nix @@ -1,3 +1,3 @@ { - virtualisation.waydroid.enable = false; + virtualisation.waydroid.enable = true; } From 3fb788426ea83f5a15d58f7e55ac2af9ef141725 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 22 Jun 2025 18:51:13 +0100 Subject: [PATCH 8/8] un-reverted hyprland config changes basically i unpacked and swapped my monitors by accident so here i am swapping them back but i reverted it because of a breaking change that was unrelated lmao --- home-manager/hyprland.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 021d390..5f0055c 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -12,12 +12,12 @@ # Monitor config for home desk layout monitor = [ "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, -960x-1080, auto" # left external monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # right external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, -960x-1080, auto" # left external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, 960x-1080, auto" # right external monitor ]; workspace = [ - "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" - "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" + "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" + "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" "name:main, monitor:eDP-2, default:true, persistent:true" ]; windowrulev2 = [