feat: update to latest linux kernel

This commit is contained in:
DACHXY 2025-01-17 15:21:32 +08:00
parent 5a383e7aad
commit 020ec5e967
15 changed files with 204 additions and 196 deletions

257
flake.lock generated
View file

@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1734671517, "lastModified": 1736162631,
"narHash": "sha256-rTKZlNZP13zIy8eyHiTbCN15rON0FG9S8zxRE7jH+Ak=", "narHash": "sha256-i4pwzFbmnBRJyWADux6eOXv30l2SGu4MifeEMWKDqOk=",
"owner": "KZDKM", "owner": "KZDKM",
"repo": "Hyprspace", "repo": "Hyprspace",
"rev": "6d49cb495c3b0364fb6c4b50ab4c04a864aa6c43", "rev": "f430d4bf8afa9397c937d575cb7a9176a76aeace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906446, "lastModified": 1736102453,
"narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", "rev": "4846091641f3be0ad7542086d52769bb7932bde6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1735765328, "lastModified": 1737085478,
"narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=", "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd", "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774425, "lastModified": 1737075266,
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +266,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906236, "lastModified": 1736115290,
"narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", "rev": "52202272d89da32a9f866c0d10305a5e3d954c50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +286,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735782927, "lastModified": 1736771168,
"narHash": "sha256-78/J6ACmSgHwKUzDPCT9XZdh7rS2gtesUphxXh4y8I0=", "narHash": "sha256-8TaiwQorn5etYxUtyUYPJBkWuzfoULHSwGDEf+cOhh4=",
"owner": "horriblename", "owner": "horriblename",
"repo": "hyprgrass", "repo": "hyprgrass",
"rev": "bdfa960b97ac98ad9d05c908ee20e053e2942928", "rev": "d324904d70e8c9710bcf772227f364262baf3820",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -315,11 +315,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1735818837, "lastModified": 1737038559,
"narHash": "sha256-J/wC5GJG6VHQJTHtZlTu2jTwN2kXouWoLOSyWO+w9q0=", "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "42fd366046d67c52449001b6a6e9b64427aee712", "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
"revCount": 5615, "revCount": 5674,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -347,11 +347,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735295819, "lastModified": 1736372092,
"narHash": "sha256-iHDDF1kj+wX7fHGTgKaM6rli6+O8mVFNmpypo+SgnNs=", "narHash": "sha256-+uxeBRTrDZsH6HtVtlMuJLLPJw3usPpG2/pm/L30c3E=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "a41bcdccac7d3fe220b3a8519633f0a812da3439", "rev": "b4c0fa3ebc6ccd1589dcd17904652223088efede",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,11 +372,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735734474, "lastModified": 1735774328,
"narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906472, "lastModified": 1736114838,
"narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", "rev": "6997fe382dcf396704227d2b98ffdd5066da6959",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,11 +430,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906259, "lastModified": 1735393019,
"narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "0404833ea18d543df44df935ebf1b497310eb046", "rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735316583, "lastModified": 1736164519,
"narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,11 +480,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734793513, "lastModified": 1735493474,
"narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,28 +508,6 @@
"type": "github" "type": "github"
} }
}, },
"naersk": {
"inputs": {
"nixpkgs": [
"nvf",
"rnix-lsp",
"nixpkgs"
]
},
"locked": {
"lastModified": 1655042882,
"narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
"owner": "nix-community",
"repo": "naersk",
"rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -563,11 +541,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735443188, "lastModified": 1736652904,
"narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +556,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735291276, "lastModified": 1736012469,
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -620,22 +598,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1733229606, "lastModified": 1733229606,
@ -654,11 +616,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1736883708,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,37 +632,21 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1656753965, "lastModified": 1736883708,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1736523798,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "130595eba61081acde9001f43de3248d8888ac4a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1729265718, "lastModified": 1729265718,
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
@ -827,6 +773,7 @@
"plugin-nvim-tree-lua": "plugin-nvim-tree-lua", "plugin-nvim-tree-lua": "plugin-nvim-tree-lua",
"plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context", "plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context",
"plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag", "plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag",
"plugin-nvim-ufo": "plugin-nvim-ufo",
"plugin-nvim-web-devicons": "plugin-nvim-web-devicons", "plugin-nvim-web-devicons": "plugin-nvim-web-devicons",
"plugin-obsidian-nvim": "plugin-obsidian-nvim", "plugin-obsidian-nvim": "plugin-obsidian-nvim",
"plugin-omnisharp-extended": "plugin-omnisharp-extended", "plugin-omnisharp-extended": "plugin-omnisharp-extended",
@ -838,6 +785,7 @@
"plugin-plenary-nvim": "plugin-plenary-nvim", "plugin-plenary-nvim": "plugin-plenary-nvim",
"plugin-precognition-nvim": "plugin-precognition-nvim", "plugin-precognition-nvim": "plugin-precognition-nvim",
"plugin-project-nvim": "plugin-project-nvim", "plugin-project-nvim": "plugin-project-nvim",
"plugin-promise-async": "plugin-promise-async",
"plugin-registers": "plugin-registers", "plugin-registers": "plugin-registers",
"plugin-render-markdown-nvim": "plugin-render-markdown-nvim", "plugin-render-markdown-nvim": "plugin-render-markdown-nvim",
"plugin-rose-pine": "plugin-rose-pine", "plugin-rose-pine": "plugin-rose-pine",
@ -862,15 +810,14 @@
"plugin-vim-repeat": "plugin-vim-repeat", "plugin-vim-repeat": "plugin-vim-repeat",
"plugin-vim-startify": "plugin-vim-startify", "plugin-vim-startify": "plugin-vim-startify",
"plugin-which-key": "plugin-which-key", "plugin-which-key": "plugin-which-key",
"rnix-lsp": "rnix-lsp",
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1736219415, "lastModified": 1736946667,
"narHash": "sha256-guUJWyyKVYZwyP86CR6i5gchQLxIBG5j7JjX/9rA7dU=", "narHash": "sha256-7z13M0L4DK9srgXnTXFFnfQsYioL2BrkfQieRI7A7wo=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "aa7b55fa49a55f12e72807466e905a204c32384a", "rev": "45a6d9b890e97fe8183874aafb1f17b1335f8bdf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -881,7 +828,7 @@
}, },
"pipewire-screenaudio": { "pipewire-screenaudio": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1720719825, "lastModified": 1720719825,
@ -2259,6 +2206,22 @@
"type": "github" "type": "github"
} }
}, },
"plugin-nvim-ufo": {
"flake": false,
"locked": {
"lastModified": 1735147722,
"narHash": "sha256-etyfm4KpwjYN+kkotOMl0LgbQniILmqMqab4acMtTlw=",
"owner": "kevinhwang91",
"repo": "nvim-ufo",
"rev": "32cb247b893a384f1888b9cd737264159ecf183c",
"type": "github"
},
"original": {
"owner": "kevinhwang91",
"repo": "nvim-ufo",
"type": "github"
}
},
"plugin-nvim-web-devicons": { "plugin-nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2435,6 +2398,22 @@
"type": "github" "type": "github"
} }
}, },
"plugin-promise-async": {
"flake": false,
"locked": {
"lastModified": 1722813441,
"narHash": "sha256-9eM66brPjiFlY64vmBetRYrKnpDyN7+/URMm4GsGimA=",
"owner": "kevinhwang91",
"repo": "promise-async",
"rev": "119e8961014c9bfaf1487bf3c2a393d254f337e2",
"type": "github"
},
"original": {
"owner": "kevinhwang91",
"repo": "promise-async",
"type": "github"
}
},
"plugin-registers": { "plugin-registers": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2826,15 +2805,14 @@
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1734797603, "lastModified": 1735882644,
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2843,26 +2821,6 @@
"type": "github" "type": "github"
} }
}, },
"rnix-lsp": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_3",
"utils": "utils"
},
"locked": {
"lastModified": 1669555118,
"narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=",
"owner": "nix-community",
"repo": "rnix-lsp",
"rev": "95d40673fe43642e2e1144341e86d0036abd95d9",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "rnix-lsp",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"Hyprspace": "Hyprspace", "Hyprspace": "Hyprspace",
@ -3011,21 +2969,6 @@
"type": "github" "type": "github"
} }
}, },
"utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
@ -3070,15 +3013,15 @@
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1735742732, "lastModified": 1737047842,
"narHash": "sha256-966g6oVcBwsHUNWpk9jDfifqOWdV+iMHXTSZEQrhhRk=", "narHash": "sha256-gVdbw3reThRxfwmx4MQ1gsq5waHthpg4e64crT2YXqg=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "40fea8521ecc4b6b17532462002a084c43632016", "rev": "6c94227d40b150cf5446ee5577bffc805d107e29",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -68,6 +68,8 @@
}; };
in in
{ {
nixpkgs.pkgs = pkgs;
nixosConfigurations = { nixosConfigurations = {
dn-pre7780 = nixpkgs.lib.nixosSystem { dn-pre7780 = nixpkgs.lib.nixosSystem {
modules = [ modules = [
@ -82,7 +84,6 @@
nix-version nix-version
username username
git-config git-config
pkgs
; ;
}; };
}; };

View file

@ -6,13 +6,14 @@
}: }:
let let
browser = "firefox"; browser = "firefox";
noOffloadBrowser = "${browser} -P noOffload -no-remote";
iconPrefix = ".local/share/icons/hicolor/scalable/apps"; iconPrefix = ".local/share/icons/hicolor/scalable/apps";
newWindow = "${browser} --new-window"; newWindow = "${browser} --new-window";
mkIconPkg = import ../../utils/make-icon.nix { }; mkIconPkg = pkgs.callPackage ../../utils/make-icon.nix { };
notionIcon = mkIconPkg { googleMeetIcon = mkIconPkg {
name = "notion"; name = "googleMeet";
url = ""; url = "https://fonts.gstatic.com/s/i/productlogos/meet_2020q4/v1/web-512dp/logo_meet_2020q4_color_1x_web_512dp.png";
sha256 = ""; sha256 = "sha256-LL33KhQTv4VVdPRBm7nzsHtPoQ2ArHwjwVxq2p8VdM4=";
}; };
in in
{ {
@ -50,6 +51,7 @@ in
}; };
home.packages = [ home.packages = [
googleMeetIcon
]; ];
xdg.desktopEntries = { xdg.desktopEntries = {
@ -65,5 +67,17 @@ in
"Utility" "Utility"
]; ];
}; };
googleMeet = {
name = "Google Meet";
genericName = "Community";
exec = "${noOffloadBrowser} https://meet.google.com";
comment = "Google Meet";
icon = "googleMeet";
terminal = false;
categories = [
"Network"
];
};
}; };
} }

View file

@ -2,11 +2,13 @@
pkgs, pkgs,
xcursor-size, xcursor-size,
... ...
}: let }:
let
cursorName = "catppuccin-macchiato-lavender-cursors"; cursorName = "catppuccin-macchiato-lavender-cursors";
themeName = "catppuccin-macchiato-lavender-compact"; themeName = "catppuccin-macchiato-lavender-compact";
cursorSize = pkgs.lib.strings.toInt xcursor-size; cursorSize = pkgs.lib.strings.toInt xcursor-size;
in { in
{
gtk = { gtk = {
enable = true; enable = true;
@ -19,7 +21,7 @@ in {
theme = { theme = {
name = themeName; name = themeName;
package = pkgs.catppuccin-gtk.override { package = pkgs.catppuccin-gtk.override {
accents = ["lavender"]; accents = [ "lavender" ];
size = "compact"; size = "compact";
variant = "macchiato"; variant = "macchiato";
}; };
@ -55,13 +57,15 @@ in {
qt = { qt = {
enable = true; enable = true;
style.name = "kvantum-dark"; style.name = "qt5ct-style";
style.package = pkgs.catppuccin-kvantum; style.package = pkgs.catppuccin-kvantum;
platformTheme.name = "qtct"; platformTheme.name = "qtct";
}; };
xdg.configFile = { xdg.configFile = {
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.kvconfig"; "Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig".source =
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.svg".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.svg"; "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.kvconfig";
"Kvantum/Catppuccin-Macchiato-Lavender/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.svg".source =
"${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.svg";
}; };
} }

View file

@ -2,6 +2,7 @@
let let
prefix = if nvidia-offload-enabled then "offload " else ""; prefix = if nvidia-offload-enabled then "offload " else "";
browser = "${prefix}firefox"; browser = "${prefix}firefox";
noOffloadBrowser = "firefox -P noOffload";
terminal = "${prefix}ghostty"; terminal = "${prefix}ghostty";
filemanager = "nemo"; filemanager = "nemo";
scripts = "~/.config/scripts"; scripts = "~/.config/scripts";
@ -15,6 +16,7 @@ let
in in
[ [
''${mainMod}, F, exec, ${browser}'' ''${mainMod}, F, exec, ${browser}''
''CTRL ${mainMod}, F, exec, ${noOffloadBrowser} -no-remote''
''${mainMod}, RETURN, exec, ${terminal}'' ''${mainMod}, RETURN, exec, ${terminal}''
''CTRL ALT, T, exec, ${terminal}'' ''CTRL ALT, T, exec, ${terminal}''
''${mainMod}, Q, killactive, '' ''${mainMod}, Q, killactive, ''

View file

@ -20,6 +20,7 @@ let
${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 & ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
${swayncScript}/bin/swaync-start & ${swayncScript}/bin/swaync-start &
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
dbus-update-activation-environment --systemd --all & dbus-update-activation-environment --systemd --all &
systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
hyprpaper & hyprpaper &

View file

@ -71,6 +71,9 @@ in
settings = settings =
{ {
debug = {
disable_logs = false;
};
bind = import ./hypr/bind.nix { inherit mainMod nvidia-offload-enabled; }; bind = import ./hypr/bind.nix { inherit mainMod nvidia-offload-enabled; };
bindm = import ./hypr/bindm.nix { inherit mainMod; }; bindm = import ./hypr/bindm.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix; monitor = import ./hypr/monitor.nix;

View file

@ -1,6 +1,22 @@
{ pkgs, ... }: { pkgs, ... }:
let let
userChrome = builtins.readFile ../config/firefox/autohide_toolbox.css; userChrome = builtins.readFile ../config/firefox/autohide_toolbox.css;
profileSettings = {
# about:config
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
"font.language.group" = "zh-TW";
"font.name.sans-serif.ja" = "Noto Sans CJK JP";
"font.name.sans-serif.zh-TW" = "Noto Sans CJK TC";
"font.name.serif.ja" = "Noto Serif CJK JP";
"font.name.serif.zh-TW" = "Noto Serif CJK TC";
"font.name.monospace.ja" = "Noto Sans Mono CJK JP";
"font.name.monospace.x-western" = "CaskaydiaCove Nerd Font Mono";
"font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
# Disable Ctrl+Q
"browser.quitShortcut.disabled" = true;
};
in in
{ {
programs = { programs = {
@ -38,22 +54,16 @@ in
userChrome = userChrome; userChrome = userChrome;
settings = { settings = profileSettings;
# about:config };
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
"font.language.group" = "zh-TW";
"font.name.sans-serif.ja" = "Noto Sans CJK JP";
"font.name.sans-serif.zh-TW" = "Noto Sans CJK TC";
"font.name.serif.ja" = "Noto Serif CJK JP";
"font.name.serif.zh-TW" = "Noto Serif CJK TC";
"font.name.monospace.ja" = "Noto Sans Mono CJK JP";
"font.name.monospace.x-western" = "CaskaydiaCove Nerd Font Mono";
"font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
# Disable Ctrl+Q
"browser.quitShortcut.disabled" = true;
};
profiles.noOffload = {
id = 1;
name = "noOffload";
isDefault = false;
userChrome = userChrome;
settings = profileSettings;
}; };
}; };
}; };

View file

@ -1,6 +1,7 @@
{ ... }: { pkgs, ... }:
{ {
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# Enable F keys in some wireless keyboard (Ex. neo65) # Enable F keys in some wireless keyboard (Ex. neo65)

View file

@ -1,6 +1,7 @@
{ ... }: { pkgs, ... }:
{ {
boot.kernelPackages = pkgs.linuxPackages_latest;
fileSystems."/mnt/storage" = { fileSystems."/mnt/storage" = {
device = "router.dn:/mnt/storage"; device = "router.dn:/mnt/storage";

View file

@ -40,6 +40,10 @@
wlogout wlogout
wl-clipboard wl-clipboard
waybar waybar
# Util
grim
slurp
]; ];
nix = { nix = {

View file

@ -56,7 +56,7 @@ lib.checkListOfEnum "Nvidia Prime Mode" validModes [ nvidia-mode ] {
nvidia.nvidiaSettings = true; nvidia.nvidiaSettings = true;
nvidia.dynamicBoost.enable = true; nvidia.dynamicBoost.enable = true;
nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
nvidia.prime = nvidia.prime =
( (

View file

@ -1,10 +1,11 @@
{ pkgs, ... }: { { pkgs, ... }:
{
boot = { boot = {
plymouth = { plymouth = {
enable = true; enable = true;
theme = "catppuccin-frappe"; theme = "hexagon_dots";
themePackages = with pkgs; [ themePackages = with pkgs; [
(adi1090x-plymouth-themes.override { selected_themes = [ "motion" ]; }) (adi1090x-plymouth-themes.override { selected_themes = [ "hexagon_dots" ]; })
(catppuccin-plymouth.override { variant = "frappe"; }) (catppuccin-plymouth.override { variant = "frappe"; })
]; ];
}; };

View file

@ -2,7 +2,7 @@
{ {
security.rtkit.enable = true; security.rtkit.enable = true;
hardware.pulseaudio.enable = false; services.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

View file

@ -1,5 +1,8 @@
{ {
pkgs ? import <nixpkgs> { }, pkgs ? import <nixpkgs> { },
imagemagick,
file,
stdenvNoCC,
... ...
}: }:
let let
@ -9,7 +12,7 @@ let
url, url,
sha256, sha256,
}: }:
pkgs.stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
inherit name; inherit name;
pname = name; pname = name;
@ -19,11 +22,31 @@ let
dontUnpack = true; dontUnpack = true;
buildInputs = [ ]; nativeBuildInputs = [
installPhase = '' imagemagick
mkdir -p $out/share/icons file
cp -r $src $out/share/icons ];
buildPhase = ''
mkdir -p $out/share/icons/hicolor/256x256/apps
mkdir -p $out/share/icons/hicolor/scalable/apps
fileType=$(file -b --mime-type $src)
if [ "$fileType" = "image/png" ]; then
echo "Processing PNG image..."
magick $src -resize 256x256 $out/share/icons/hicolor/256x256/apps/${name}.png
elif [ "$fileType" = "image/svg+xml" ]; then
echo "Processing SVG image..."
cp $src $out/share/icons/hicolor/scalable/apps/${name}.svg
else
echo "Unsupported image type: $fileType"
exit 1
fi
''; '';
pathsToLink = [
"/share/icons"
];
}; };
in in
makeIconPkg makeIconPkg