summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-11-26 16:04:31 -0500
committerFreya Murphy <freya@freyacat.org>2025-11-26 16:07:41 -0500
commit5beba03bf317cc496c0f590a79930cc6419dc8ad (patch)
treeb198ba455062a461d40ba35f1a855f2fcce23e82
parentupdate commits (diff)
downloaddotfiles-nix-5beba03bf317cc496c0f590a79930cc6419dc8ad.tar.gz
dotfiles-nix-5beba03bf317cc496c0f590a79930cc6419dc8ad.tar.bz2
dotfiles-nix-5beba03bf317cc496c0f590a79930cc6419dc8ad.zip
update commitsHEADmain
-rw-r--r--flake.lock227
-rw-r--r--flake.nix12
-rw-r--r--home/apps/astal.nix3
-rw-r--r--home/default.nix3
-rw-r--r--home/desktops/default.nix3
-rw-r--r--home/desktops/hyprland/default.nix5
-rw-r--r--home/desktops/hyprland/plugins.nix5
-rw-r--r--hosts/shinji/firefox-nightly.nix3
-rw-r--r--options.nix2
-rw-r--r--pkgs/astal/builder.nix4
-rw-r--r--pkgs/astal/default.nix4
-rw-r--r--system/default.nix3
-rw-r--r--system/desktops/hyprland.nix7
-rw-r--r--system/desktops/ly.nix3
-rw-r--r--system/fingerprint.nix3
15 files changed, 174 insertions, 113 deletions
diff --git a/flake.lock b/flake.lock
index 6e3c741..8f048c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,11 +48,11 @@
]
},
"locked": {
- "lastModified": 1758302489,
- "narHash": "sha256-NvE/uabYsuR7TbmRkSlOe6DB7UnOpD2/kHGyir2J/6A=",
+ "lastModified": 1762356719,
+ "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "11406cc23afeaaef1ee3ccffb9614e67e2458e29",
+ "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
"type": "github"
},
"original": {
@@ -68,11 +68,11 @@
]
},
"locked": {
- "lastModified": 1762527355,
- "narHash": "sha256-d5zsOdWeHZFP5Pc/QkgsX3UKkVDmcwY8nSJJJszMwVM=",
+ "lastModified": 1764173295,
+ "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=",
"owner": "aylur",
"repo": "astal",
- "rev": "5baeb660214bcafc9ae0b733a1bc84f5fa6078f4",
+ "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef",
"type": "github"
},
"original": {
@@ -90,11 +90,11 @@
]
},
"locked": {
- "lastModified": 1763601632,
- "narHash": "sha256-9jYDLH+PBLd4muv05VlDHjRMCh+81jD2dFyFpsecFFk=",
+ "lastModified": 1764181459,
+ "narHash": "sha256-fnvNZMpyV9vQQ4WBK2epL6LxFHcUbOYHo0Wawpflvpk=",
"owner": "nix-community",
"repo": "flake-firefox-nightly",
- "rev": "798f6a93021809c1fd1c7a23384fa3d8c36020bf",
+ "rev": "ad71ae42f1d4c0f10fa07d386e5bf4d9d6de2f13",
"type": "github"
},
"original": {
@@ -215,11 +215,11 @@
]
},
"locked": {
- "lastModified": 1763416652,
- "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
+ "lastModified": 1764182832,
+ "narHash": "sha256-ahMNAEknEnSW+WLZsgTnw2e12YcltJDi6J2MsWtPvs0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
+ "rev": "8220473f952571691b05037dbd18659d1f5f83a1",
"type": "github"
},
"original": {
@@ -236,16 +236,16 @@
]
},
"locked": {
- "lastModified": 1757924038,
- "narHash": "sha256-HjbofK4rSLkkUvOZHdoAY6kn7Ok2bXo14eOKr8hKRHE=",
+ "lastModified": 1761971414,
+ "narHash": "sha256-UeMEUlQsil5DEtF/VQ//41vXJF9ff2xjoYVjhR6dqu4=",
"owner": "outfoxxed",
"repo": "hy3",
- "rev": "e317a4cf89486f33c0e09364fbb6949e9f4f5624",
+ "rev": "16dae4d8f853b0d3e8434ee9941f9fc0155b8952",
"type": "github"
},
"original": {
"owner": "outfoxxed",
- "ref": "hl0.51.0",
+ "ref": "hl0.52.0",
"repo": "hy3",
"type": "github"
}
@@ -295,11 +295,11 @@
]
},
"locked": {
- "lastModified": 1758572180,
- "narHash": "sha256-Is8Rcp99Ynl3JFcU3k2lsmyf8WGacWKZtnVb0mVIZ6M=",
+ "lastModified": 1762462052,
+ "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
"owner": "hyprwm",
"repo": "hyprgraphics",
- "rev": "32e6b8386f7dc70a4cc01607a826a281f3c52364",
+ "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
"type": "github"
},
"original": {
@@ -313,11 +313,11 @@
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
+ "hyprland-guiutils": "hyprland-guiutils",
"hyprland-protocols": "hyprland-protocols",
- "hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
- "hyprwayland-scanner": "hyprwayland-scanner",
+ "hyprwayland-scanner": "hyprwayland-scanner_2",
"nixpkgs": [
"nixpkgs"
],
@@ -326,20 +326,62 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1758574443,
- "narHash": "sha256-eLU5Zo1L3IFr8LgOsvTcoYW04/K+Sb8OvpwbaTSTGF4=",
+ "lastModified": 1762731096,
+ "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "71a1216abcc7031776630a6d88f105605c4dc1c9",
+ "rev": "967c3c7404d4fa00234e29c70df3e263386d2597",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "ref": "v0.51.1",
+ "ref": "v0.52.1",
"repo": "Hyprland",
"type": "github"
}
},
+ "hyprland-guiutils": {
+ "inputs": {
+ "aquamarine": [
+ "hyprland",
+ "aquamarine"
+ ],
+ "hyprgraphics": [
+ "hyprland",
+ "hyprgraphics"
+ ],
+ "hyprlang": [
+ "hyprland",
+ "hyprlang"
+ ],
+ "hyprtoolkit": "hyprtoolkit",
+ "hyprutils": [
+ "hyprland",
+ "hyprutils"
+ ],
+ "nixpkgs": [
+ "hyprland",
+ "nixpkgs"
+ ],
+ "systems": [
+ "hyprland",
+ "systems"
+ ]
+ },
+ "locked": {
+ "lastModified": 1762465111,
+ "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=",
+ "owner": "hyprwm",
+ "repo": "hyprland-guiutils",
+ "rev": "a415eba866a953f3096d661318f771aa0082eb98",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hyprwm",
+ "repo": "hyprland-guiutils",
+ "type": "github"
+ }
+ },
"hyprland-plugins": {
"inputs": {
"hyprland": [
@@ -357,16 +399,16 @@
]
},
"locked": {
- "lastModified": 1757774228,
- "narHash": "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=",
+ "lastModified": 1762115485,
+ "narHash": "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
- "rev": "5ff379f4e525183cc6766ea95764b52ec97d8966",
+ "rev": "bbb8d2cb0eb667f2911103eadb3d1e8176f4462c",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "ref": "v0.51.0",
+ "ref": "v0.52.0",
"repo": "hyprland-plugins",
"type": "github"
}
@@ -383,11 +425,11 @@
]
},
"locked": {
- "lastModified": 1749046714,
- "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+ "lastModified": 1759610243,
+ "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
- "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+ "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
"type": "github"
},
"original": {
@@ -396,80 +438,85 @@
"type": "github"
}
},
- "hyprland-qt-support": {
+ "hyprlang": {
"inputs": {
- "hyprlang": [
+ "hyprutils": [
"hyprland",
- "hyprland-qtutils",
- "hyprlang"
+ "hyprutils"
],
"nixpkgs": [
"hyprland",
- "hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
- "hyprland-qtutils",
"systems"
]
},
"locked": {
- "lastModified": 1749154592,
- "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
+ "lastModified": 1758927902,
+ "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
"owner": "hyprwm",
- "repo": "hyprland-qt-support",
- "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
+ "repo": "hyprlang",
+ "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "repo": "hyprland-qt-support",
+ "repo": "hyprlang",
"type": "github"
}
},
- "hyprland-qtutils": {
+ "hyprtoolkit": {
"inputs": {
- "hyprland-qt-support": "hyprland-qt-support",
+ "aquamarine": [
+ "hyprland",
+ "hyprland-guiutils",
+ "aquamarine"
+ ],
+ "hyprgraphics": [
+ "hyprland",
+ "hyprland-guiutils",
+ "hyprgraphics"
+ ],
"hyprlang": [
"hyprland",
+ "hyprland-guiutils",
"hyprlang"
],
"hyprutils": [
"hyprland",
- "hyprland-qtutils",
- "hyprlang",
+ "hyprland-guiutils",
"hyprutils"
],
+ "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [
"hyprland",
+ "hyprland-guiutils",
"nixpkgs"
],
"systems": [
"hyprland",
+ "hyprland-guiutils",
"systems"
]
},
"locked": {
- "lastModified": 1757694755,
- "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=",
+ "lastModified": 1762463729,
+ "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
"owner": "hyprwm",
- "repo": "hyprland-qtutils",
- "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c",
+ "repo": "hyprtoolkit",
+ "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "repo": "hyprland-qtutils",
+ "repo": "hyprtoolkit",
"type": "github"
}
},
- "hyprlang": {
+ "hyprutils": {
"inputs": {
- "hyprutils": [
- "hyprland",
- "hyprutils"
- ],
"nixpkgs": [
"hyprland",
"nixpkgs"
@@ -480,45 +527,49 @@
]
},
"locked": {
- "lastModified": 1756810301,
- "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
+ "lastModified": 1762387740,
+ "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
"owner": "hyprwm",
- "repo": "hyprlang",
- "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
+ "repo": "hyprutils",
+ "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "repo": "hyprlang",
+ "repo": "hyprutils",
"type": "github"
}
},
- "hyprutils": {
+ "hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
+ "hyprland-guiutils",
+ "hyprtoolkit",
"nixpkgs"
],
"systems": [
"hyprland",
+ "hyprland-guiutils",
+ "hyprtoolkit",
"systems"
]
},
"locked": {
- "lastModified": 1756117388,
- "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=",
+ "lastModified": 1755184602,
+ "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
"owner": "hyprwm",
- "repo": "hyprutils",
- "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0",
+ "repo": "hyprwayland-scanner",
+ "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "repo": "hyprutils",
+ "repo": "hyprwayland-scanner",
"type": "github"
}
},
- "hyprwayland-scanner": {
+ "hyprwayland-scanner_2": {
"inputs": {
"nixpkgs": [
"hyprland",
@@ -570,11 +621,11 @@
]
},
"locked": {
- "lastModified": 1763587902,
- "narHash": "sha256-kYhcVG34C5MThK6JQp2UeGTooFgi3XEElGk2TNFcTWg=",
+ "lastModified": 1764072830,
+ "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=",
"owner": "nix-community",
"repo": "nixos-wsl",
- "rev": "cce7a45e8fb3398f669bfd54aaa15047e70c81a8",
+ "rev": "c7832dd786175e20f2697179e0e03efadffe4201",
"type": "github"
},
"original": {
@@ -585,17 +636,17 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1763421233,
- "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
+ "lastModified": 1764015464,
+ "narHash": "sha256-kyO9O2jDsL2X1uriS5bCpjaEbUh+wqhVXZbC3Z4Q1OM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
+ "rev": "2493002b10ccef0880f72d7720538f91fb4f7434",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
"repo": "nixpkgs",
+ "rev": "2493002b10ccef0880f72d7720538f91fb4f7434",
"type": "github"
}
},
@@ -636,11 +687,11 @@
]
},
"locked": {
- "lastModified": 1758108966,
- "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+ "lastModified": 1762441963,
+ "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+ "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
"type": "github"
},
"original": {
@@ -782,11 +833,11 @@
]
},
"locked": {
- "lastModified": 1763607916,
- "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=",
+ "lastModified": 1764021963,
+ "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b",
+ "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
"type": "github"
},
"original": {
@@ -922,11 +973,11 @@
]
},
"locked": {
- "lastModified": 1755354946,
- "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+ "lastModified": 1761431178,
+ "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+ "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github"
},
"original": {
@@ -945,11 +996,11 @@
]
},
"locked": {
- "lastModified": 1763521945,
- "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=",
+ "lastModified": 1764166920,
+ "narHash": "sha256-AEpt8JdKA4RVobRjaR7S2QP3bmUz8dhuWasB7mr9Ylo=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
- "rev": "24d7381b9231c23daceec5d372cc28e877f7785d",
+ "rev": "6f5d615393a5e923ea2883ef28e274031d1b1e1e",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 232bf2f..31857e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,18 +3,18 @@
inputs = {
# nixpkgs
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/2493002b10ccef0880f72d7720538f91fb4f7434";
# home manager
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# hyprland
- hyprland.url = "github:hyprwm/Hyprland/v0.51.1";
+ hyprland.url = "github:hyprwm/Hyprland/v0.52.1";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
# hyprland plugins
- hyprland-plugins.url = "github:hyprwm/hyprland-plugins/v0.51.0";
+ hyprland-plugins.url = "github:hyprwm/hyprland-plugins/v0.52.0";
hyprland-plugins.inputs.hyprland.follows = "hyprland";
# hyprland hy3
- hy3.url = "github:outfoxxed/hy3/hl0.51.0";
+ hy3.url = "github:outfoxxed/hy3/hl0.52.0";
hy3.inputs.hyprland.follows = "hyprland";
# sops
sops-nix.url = "github:Mic92/sops-nix";
@@ -64,7 +64,7 @@
mkSystem = file: system:
nixpkgs.lib.nixosSystem {
inherit system;
- specialArgs = {inherit inputs;};
+ specialArgs = {inherit inputs system;};
modules = [
./system
./options.nix
@@ -76,7 +76,7 @@
in
home-manager.lib.homeManagerConfiguration {
inherit (hostModule) pkgs;
- extraSpecialArgs = {inherit inputs;};
+ extraSpecialArgs = {inherit inputs system;};
modules = [
./home
./options.nix
diff --git a/home/apps/astal.nix b/home/apps/astal.nix
index 0427e61..c7be724 100644
--- a/home/apps/astal.nix
+++ b/home/apps/astal.nix
@@ -3,9 +3,10 @@
config,
pkgs,
inputs,
+ system,
...
}: let
- astal = inputs.self.packages.${pkgs.system};
+ astal = inputs.self.packages.${system};
inherit (lib) mkIf;
cfg = config.apps.astal;
in {
diff --git a/home/default.nix b/home/default.nix
index f49cadd..e5c5114 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,6 +3,7 @@
config,
pkgs,
inputs,
+ system,
...
}: let
inherit (lib) optionals;
@@ -37,7 +38,7 @@ in {
yt-dlp
])
++ [
- inputs.talc.packages.${pkgs.system}.talc
+ inputs.talc.packages.${system}.talc
]
++ (with pkgs;
optionals config.desktops.enable [
diff --git a/home/desktops/default.nix b/home/desktops/default.nix
index 65b7538..4d02984 100644
--- a/home/desktops/default.nix
+++ b/home/desktops/default.nix
@@ -3,6 +3,7 @@
config,
pkgs,
inputs,
+ system,
...
}: let
inherit (lib) mkEnableOption mkIf optionals;
@@ -48,7 +49,7 @@ in {
wl-clip-persist
wl-mirror
])
- ++ (with inputs.apple-fonts.packages.${pkgs.system}; [
+ ++ (with inputs.apple-fonts.packages.${system}; [
# apple fonts
sf-pro
sf-mono
diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix
index 53a1d2a..c584913 100644
--- a/home/desktops/hyprland/default.nix
+++ b/home/desktops/hyprland/default.nix
@@ -3,6 +3,7 @@
config,
pkgs,
lib,
+ system,
...
}: let
inherit (lib) mkIf mkDefault;
@@ -19,12 +20,12 @@ in {
config = mkIf cfg.enable {
home.packages = [
- inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default
+ inputs.rose-pine-hyprcursor.packages.${system}.default
];
wayland.windowManager.hyprland = {
enable = true;
- package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+ package = inputs.hyprland.packages.${system}.hyprland;
xwayland.enable = true;
systemd.enable = true;
diff --git a/home/desktops/hyprland/plugins.nix b/home/desktops/hyprland/plugins.nix
index 6d43693..f4b76f2 100644
--- a/home/desktops/hyprland/plugins.nix
+++ b/home/desktops/hyprland/plugins.nix
@@ -2,12 +2,13 @@
inputs,
config,
pkgs,
+ system,
...
}: {
wayland.windowManager.hyprland = {
plugins = [
- #inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
- inputs.hy3.packages.${pkgs.system}.hy3
+ #inputs.hyprland-plugins.packages.${system}.hyprexpo
+ inputs.hy3.packages.${system}.hy3
];
settings.plugin = {
diff --git a/hosts/shinji/firefox-nightly.nix b/hosts/shinji/firefox-nightly.nix
index 38b330e..497350e 100644
--- a/hosts/shinji/firefox-nightly.nix
+++ b/hosts/shinji/firefox-nightly.nix
@@ -1,9 +1,10 @@
{
pkgs,
inputs,
+ system,
...
}: let
- firefox = inputs.firefox-nightly.packages.${pkgs.system}.firefox-nightly-bin;
+ firefox = inputs.firefox-nightly.packages.${system}.firefox-nightly-bin;
my-firefox = pkgs.writeShellApplication rec {
name = "firefox-nightly";
text = ''
diff --git a/options.nix b/options.nix
index 2dcdc54..e423433 100644
--- a/options.nix
+++ b/options.nix
@@ -207,7 +207,7 @@ in {
stateVersion = mkOption {
type = types.str;
description = "NixOS State Version";
- default = "25.11";
+ default = "26.05";
};
#
diff --git a/pkgs/astal/builder.nix b/pkgs/astal/builder.nix
index c4030f7..c48eaf5 100644
--- a/pkgs/astal/builder.nix
+++ b/pkgs/astal/builder.nix
@@ -46,8 +46,8 @@ in
extraPackages
++ [
lua
- astal.packages.${pkgs.system}.io
- astal.packages.${pkgs.system}.astal3
+ astal.packages.${pkgs.stdenv.hostPlatform.system}.io
+ astal.packages.${pkgs.stdenv.hostPlatform.system}.astal3
];
installPhase = ''
diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix
index 21bd87a..6317f3b 100644
--- a/pkgs/astal/default.nix
+++ b/pkgs/astal/default.nix
@@ -1,14 +1,14 @@
{
pkgs,
+ stdenv,
inputs,
- system,
options,
...
}: let
runCommand = pkgs.runCommand;
dart-sass = pkgs.dart-sass;
- apkgs = inputs.astal.packages.${system};
+ apkgs = inputs.astal.packages.${stdenv.hostPlatform.system};
scss = "${dart-sass}/bin/sass";
theme = import ./theme.nix {inherit options;};
diff --git a/system/default.nix b/system/default.nix
index b913bd5..6ef7b9c 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -3,6 +3,7 @@
config,
pkgs,
inputs,
+ system,
...
}: {
imports = [
@@ -44,7 +45,7 @@
};
# main user home
- home-manager.extraSpecialArgs = {inherit inputs;};
+ home-manager.extraSpecialArgs = {inherit inputs system;};
home-manager.users.${config.user} = {
imports = [
../home
diff --git a/system/desktops/hyprland.nix b/system/desktops/hyprland.nix
index eb0778e..42a45be 100644
--- a/system/desktops/hyprland.nix
+++ b/system/desktops/hyprland.nix
@@ -3,6 +3,7 @@
config,
pkgs,
lib,
+ system,
...
}: let
inherit (lib) mkIf mkDefault;
@@ -13,7 +14,7 @@ in {
xdg.portal = {
extraPortals = [
- inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
+ inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland
];
config.hyprland = {
default = ["hyprland" "gtk"];
@@ -24,8 +25,8 @@ in {
programs.hyprland = {
enable = true;
- package = inputs.hyprland.packages.${pkgs.system}.hyprland;
- portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+ package = inputs.hyprland.packages.${system}.hyprland;
+ portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
};
};
}
diff --git a/system/desktops/ly.nix b/system/desktops/ly.nix
index ac53495..3ff2c1d 100644
--- a/system/desktops/ly.nix
+++ b/system/desktops/ly.nix
@@ -3,6 +3,7 @@
config,
pkgs,
inputs,
+ system,
...
}: let
inherit (lib) mkIf;
@@ -12,7 +13,7 @@ in {
# display manager
services.displayManager.ly = {
enable = true;
- package = inputs.self.packages.${pkgs.system}.ly;
+ package = inputs.self.packages.${system}.ly;
settings = let
base = "0x00${config.theme.colors.base}";
diff --git a/system/fingerprint.nix b/system/fingerprint.nix
index cbf8f24..1fe0560 100644
--- a/system/fingerprint.nix
+++ b/system/fingerprint.nix
@@ -3,6 +3,7 @@
pkgs,
config,
inputs,
+ system,
...
}: let
inherit (lib) mkIf;
@@ -11,7 +12,7 @@ in {
services.fprintd = {
enable = true;
tod.enable = true;
- tod.driver = inputs.self.packages.${pkgs.system}.libfprint-2-tod1-vfs0090;
+ tod.driver = inputs.self.packages.${system}.libfprint-2-tod1-vfs0090;
};
};
}