Compare commits

..

No commits in common. "af078330e8cae510a6100de84231b252366f0995" and "8482623b5549ff87bcee8bc077f605b194596881" have entirely different histories.

3 changed files with 58 additions and 70 deletions

View file

@ -256,11 +256,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1727826117,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,11 +478,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730633670, "lastModified": 1730016908,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "rev": "e83414058edd339148dc142a8437edb9450574c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -515,11 +515,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730704640, "lastModified": 1730397191,
"narHash": "sha256-Xp6uQdt80HeW76ROtm03gpUYbKuH2exvH1nSTB9Roug=", "narHash": "sha256-SJGPAdCGCcVUQXvPpF2W82wFH6l4Ovqi/JYcOeRIbTY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "6f41db5aa7c094c2110636424a36479720a9bc8f", "rev": "991d7deba7a3bd3b673b567ad999cc050b129d38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +531,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730704733, "lastModified": 1730396493,
"narHash": "sha256-n3wuR4SrSh/5v0NkDMFIRayUC65xCs9ZsdA7917etWQ=", "narHash": "sha256-UnDJy3ydnLhZ+pIQ3Txas0C9tFhp0hnJHGqNy80NlvY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "7c518d7624b76c30cf8d82e7f929bdb75ab09d23", "rev": "e1ee68771c31734542d254693df000946aac67f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,11 +613,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730698801, "lastModified": 1730395835,
"narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=", "narHash": "sha256-ADGhFqM8hCabAEx2PADy+vi+iynO9aq221PxDZwrhww=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0", "rev": "8dbda1064b0678cf0679e4f4091e91f7497e69a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -674,11 +674,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730604744, "lastModified": 1729999765,
"narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,14 +717,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1730504152, "lastModified": 1727825735,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
@ -934,11 +934,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730693770, "lastModified": 1730348281,
"narHash": "sha256-jepwWtXntoBDQGJ/d7Myc9SFsYT6DwTqjAZJFGC2Akc=", "narHash": "sha256-c5lP7JFqWlrEScvPXKxg7Z2+f5wdlznYZPjEa5jmEkw=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "2d871e2a5fb8c9d8d04a3bdd8f206aec81df2d6d", "rev": "22d250d6a4dcc492a2d8836d3f2c901a09e7cb76",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,9 +4,7 @@
... ...
}: }:
{ {
imports = imports = with inputs; [
with inputs;
[
./configuration.nix ./configuration.nix
../../modules/linux/audio ../../modules/linux/audio
../../modules/linux/networking ../../modules/linux/networking
@ -16,6 +14,10 @@
../../modules/linux/desktop-portal ../../modules/linux/desktop-portal
../../modules/linux/stylix ../../modules/linux/stylix
../../overlays ../../overlays
apple-silicon.nixosModules.apple-silicon-support
lix-module.nixosModules.default
home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
@ -25,24 +27,14 @@
inherit system; inherit system;
}; };
home-manager.users.youwen = { home-manager.users.youwen = {
imports = imports = [
[
../../users/youwen/common ../../users/youwen/common
../../users/youwen/linux/laptop ../../users/youwen/linux/laptop
../../users/youwen/linux/packages/aarch-64 ../../users/youwen/linux/packages/aarch-64
../../users/youwen/common/fastfetch ../../users/youwen/common/fastfetch
./home-manager-extras ./home-manager-extras
] ];
++ (with inputs; [
nix-index-database.hmModules.nix-index
]);
}; };
} }
] ];
++ (with inputs; [
lix-module.nixosModules.default
home-manager.nixosModules.home-manager
apple-silicon.nixosModules.apple-silicon-support
]);
} }

View file

@ -237,13 +237,10 @@
layerrule = [ layerrule = [
"blur,rofi" "blur,rofi"
"ignorezero,rofi" "ignorezero,rofi"
"animation slide bottom 0.2 0.2 wind,rofi"
"blur,notifications" "blur,notifications"
"ignorezero,notifications" "ignorezero,notifications"
"blur,swaync-notification-window" "blur,swaync-notification-window"
"animation slide right 0.5 0.5,swaync-control-center" "animation,swaync-notification-window,popin"
"animation slide right 0.5 0.5,notifications"
"animation slide right 0.5 0.5,swaync-notification-window"
"ignorezero,swaync-notification-window" "ignorezero,swaync-notification-window"
"blur,swaync-control-center" "blur,swaync-control-center"
"ignorezero,swaync-control-center" "ignorezero,swaync-control-center"
@ -270,7 +267,6 @@
# "borderangle, 1, 30, liner, loop" # "borderangle, 1, 30, liner, loop"
"fade, 1, 10, default" "fade, 1, 10, default"
"workspaces, 1, 5, wind" "workspaces, 1, 5, wind"
# "layers, 1, 8, default, slide"
]; ];
}; };