diff --git a/flake.lock b/flake.lock index eaed223..18422f7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1734671517, - "narHash": "sha256-rTKZlNZP13zIy8eyHiTbCN15rON0FG9S8zxRE7jH+Ak=", + "lastModified": 1736162631, + "narHash": "sha256-i4pwzFbmnBRJyWADux6eOXv30l2SGu4MifeEMWKDqOk=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "6d49cb495c3b0364fb6c4b50ab4c04a864aa6c43", + "rev": "f430d4bf8afa9397c937d575cb7a9176a76aeace", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1734906446, - "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", + "lastModified": 1736102453, + "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", + "rev": "4846091641f3be0ad7542086d52769bb7932bde6", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735765328, - "narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=", + "lastModified": 1737085478, + "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd", + "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1737075266, + "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "type": "github" }, "original": { @@ -266,11 +266,11 @@ ] }, "locked": { - "lastModified": 1734906236, - "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "type": "github" }, "original": { @@ -286,11 +286,11 @@ ] }, "locked": { - "lastModified": 1735782927, - "narHash": "sha256-78/J6ACmSgHwKUzDPCT9XZdh7rS2gtesUphxXh4y8I0=", + "lastModified": 1736771168, + "narHash": "sha256-8TaiwQorn5etYxUtyUYPJBkWuzfoULHSwGDEf+cOhh4=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "bdfa960b97ac98ad9d05c908ee20e053e2942928", + "rev": "d324904d70e8c9710bcf772227f364262baf3820", "type": "github" }, "original": { @@ -315,11 +315,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1735818837, - "narHash": "sha256-J/wC5GJG6VHQJTHtZlTu2jTwN2kXouWoLOSyWO+w9q0=", + "lastModified": 1737038559, + "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=", "ref": "refs/heads/main", - "rev": "42fd366046d67c52449001b6a6e9b64427aee712", - "revCount": 5615, + "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", + "revCount": 5674, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1735295819, - "narHash": "sha256-iHDDF1kj+wX7fHGTgKaM6rli6+O8mVFNmpypo+SgnNs=", + "lastModified": 1736372092, + "narHash": "sha256-+uxeBRTrDZsH6HtVtlMuJLLPJw3usPpG2/pm/L30c3E=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "a41bcdccac7d3fe220b3a8519633f0a812da3439", + "rev": "b4c0fa3ebc6ccd1589dcd17904652223088efede", "type": "github" }, "original": { @@ -372,11 +372,11 @@ ] }, "locked": { - "lastModified": 1735734474, - "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", + "lastModified": 1735774328, + "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", + "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", "type": "github" }, "original": { @@ -401,11 +401,11 @@ ] }, "locked": { - "lastModified": 1734906472, - "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "lastModified": 1736114838, + "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "type": "github" }, "original": { @@ -430,11 +430,11 @@ ] }, "locked": { - "lastModified": 1734906259, - "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0404833ea18d543df44df935ebf1b497310eb046", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -455,11 +455,11 @@ ] }, "locked": { - "lastModified": 1735316583, - "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1734793513, - "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -508,28 +508,6 @@ "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": { "inputs": { "flake-utils": [ @@ -563,11 +541,11 @@ ] }, "locked": { - "lastModified": 1735443188, - "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", + "lastModified": 1736652904, + "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", + "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", "type": "github" }, "original": { @@ -578,11 +556,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -620,22 +598,6 @@ "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": { "locked": { "lastModified": 1733229606, @@ -654,11 +616,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -670,37 +632,21 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", - "owner": "nixos", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "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": { "lastModified": 1729265718, "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", @@ -827,6 +773,7 @@ "plugin-nvim-tree-lua": "plugin-nvim-tree-lua", "plugin-nvim-treesitter-context": "plugin-nvim-treesitter-context", "plugin-nvim-ts-autotag": "plugin-nvim-ts-autotag", + "plugin-nvim-ufo": "plugin-nvim-ufo", "plugin-nvim-web-devicons": "plugin-nvim-web-devicons", "plugin-obsidian-nvim": "plugin-obsidian-nvim", "plugin-omnisharp-extended": "plugin-omnisharp-extended", @@ -838,6 +785,7 @@ "plugin-plenary-nvim": "plugin-plenary-nvim", "plugin-precognition-nvim": "plugin-precognition-nvim", "plugin-project-nvim": "plugin-project-nvim", + "plugin-promise-async": "plugin-promise-async", "plugin-registers": "plugin-registers", "plugin-render-markdown-nvim": "plugin-render-markdown-nvim", "plugin-rose-pine": "plugin-rose-pine", @@ -862,15 +810,14 @@ "plugin-vim-repeat": "plugin-vim-repeat", "plugin-vim-startify": "plugin-vim-startify", "plugin-which-key": "plugin-which-key", - "rnix-lsp": "rnix-lsp", "systems": "systems_5" }, "locked": { - "lastModified": 1736219415, - "narHash": "sha256-guUJWyyKVYZwyP86CR6i5gchQLxIBG5j7JjX/9rA7dU=", + "lastModified": 1736946667, + "narHash": "sha256-7z13M0L4DK9srgXnTXFFnfQsYioL2BrkfQieRI7A7wo=", "owner": "notashelf", "repo": "nvf", - "rev": "aa7b55fa49a55f12e72807466e905a204c32384a", + "rev": "45a6d9b890e97fe8183874aafb1f17b1335f8bdf", "type": "github" }, "original": { @@ -881,7 +828,7 @@ }, "pipewire-screenaudio": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1720719825, @@ -2259,6 +2206,22 @@ "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": { "flake": false, "locked": { @@ -2435,6 +2398,22 @@ "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": { "flake": false, "locked": { @@ -2826,15 +2805,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -2843,26 +2821,6 @@ "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": { "inputs": { "Hyprspace": "Hyprspace", @@ -3011,21 +2969,6 @@ "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": { "inputs": { "hyprland-protocols": [ @@ -3070,15 +3013,15 @@ "yazi": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1735742732, - "narHash": "sha256-966g6oVcBwsHUNWpk9jDfifqOWdV+iMHXTSZEQrhhRk=", + "lastModified": 1737047842, + "narHash": "sha256-gVdbw3reThRxfwmx4MQ1gsq5waHthpg4e64crT2YXqg=", "owner": "sxyazi", "repo": "yazi", - "rev": "40fea8521ecc4b6b17532462002a084c43632016", + "rev": "6c94227d40b150cf5446ee5577bffc805d107e29", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d6e65f5..79f918a 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,8 @@ }; in { + nixpkgs.pkgs = pkgs; + nixosConfigurations = { dn-pre7780 = nixpkgs.lib.nixosSystem { modules = [ @@ -82,7 +84,6 @@ nix-version username git-config - pkgs ; }; }; diff --git a/home/user/desktops.nix b/home/user/desktops.nix index a223a2e..59bc0c8 100644 --- a/home/user/desktops.nix +++ b/home/user/desktops.nix @@ -6,13 +6,14 @@ }: let browser = "firefox"; + noOffloadBrowser = "${browser} -P noOffload -no-remote"; iconPrefix = ".local/share/icons/hicolor/scalable/apps"; newWindow = "${browser} --new-window"; - mkIconPkg = import ../../utils/make-icon.nix { }; - notionIcon = mkIconPkg { - name = "notion"; - url = ""; - sha256 = ""; + mkIconPkg = pkgs.callPackage ../../utils/make-icon.nix { }; + googleMeetIcon = mkIconPkg { + name = "googleMeet"; + url = "https://fonts.gstatic.com/s/i/productlogos/meet_2020q4/v1/web-512dp/logo_meet_2020q4_color_1x_web_512dp.png"; + sha256 = "sha256-LL33KhQTv4VVdPRBm7nzsHtPoQ2ArHwjwVxq2p8VdM4="; }; in { @@ -50,6 +51,7 @@ in }; home.packages = [ + googleMeetIcon ]; xdg.desktopEntries = { @@ -65,5 +67,17 @@ in "Utility" ]; }; + + googleMeet = { + name = "Google Meet"; + genericName = "Community"; + exec = "${noOffloadBrowser} https://meet.google.com"; + comment = "Google Meet"; + icon = "googleMeet"; + terminal = false; + categories = [ + "Network" + ]; + }; }; } diff --git a/home/user/gtk.nix b/home/user/gtk.nix index b01d097..9cdfb37 100644 --- a/home/user/gtk.nix +++ b/home/user/gtk.nix @@ -2,11 +2,13 @@ pkgs, xcursor-size, ... -}: let +}: +let cursorName = "catppuccin-macchiato-lavender-cursors"; themeName = "catppuccin-macchiato-lavender-compact"; cursorSize = pkgs.lib.strings.toInt xcursor-size; -in { +in +{ gtk = { enable = true; @@ -19,7 +21,7 @@ in { theme = { name = themeName; package = pkgs.catppuccin-gtk.override { - accents = ["lavender"]; + accents = [ "lavender" ]; size = "compact"; variant = "macchiato"; }; @@ -55,13 +57,15 @@ in { qt = { enable = true; - style.name = "kvantum-dark"; + style.name = "qt5ct-style"; style.package = pkgs.catppuccin-kvantum; platformTheme.name = "qtct"; }; 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.svg".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.svg"; + "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.svg".source = + "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Macchiato-Lavender/Cattpuccin-Macchiato-Blue.svg"; }; } diff --git a/home/user/hypr/bind.nix b/home/user/hypr/bind.nix index 2785ed6..fa5fa3d 100644 --- a/home/user/hypr/bind.nix +++ b/home/user/hypr/bind.nix @@ -2,6 +2,7 @@ let prefix = if nvidia-offload-enabled then "offload " else ""; browser = "${prefix}firefox"; + noOffloadBrowser = "firefox -P noOffload"; terminal = "${prefix}ghostty"; filemanager = "nemo"; scripts = "~/.config/scripts"; @@ -15,6 +16,7 @@ let in [ ''${mainMod}, F, exec, ${browser}'' + ''CTRL ${mainMod}, F, exec, ${noOffloadBrowser} -no-remote'' ''${mainMod}, RETURN, exec, ${terminal}'' ''CTRL ALT, T, exec, ${terminal}'' ''${mainMod}, Q, killactive, '' diff --git a/home/user/hypr/exec.nix b/home/user/hypr/exec.nix index 3691284..eaf1c3a 100644 --- a/home/user/hypr/exec.nix +++ b/home/user/hypr/exec.nix @@ -20,6 +20,7 @@ let ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 & ${swayncScript}/bin/swaync-start & + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & dbus-update-activation-environment --systemd --all & systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & hyprpaper & diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix index 9b72247..b44b9bc 100644 --- a/home/user/hyprland.nix +++ b/home/user/hyprland.nix @@ -71,6 +71,9 @@ in settings = { + debug = { + disable_logs = false; + }; bind = import ./hypr/bind.nix { inherit mainMod nvidia-offload-enabled; }; bindm = import ./hypr/bindm.nix { inherit mainMod; }; monitor = import ./hypr/monitor.nix; diff --git a/home/user/programs.nix b/home/user/programs.nix index 857617e..7b6c59a 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -1,6 +1,22 @@ { pkgs, ... }: let 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 { programs = { @@ -38,22 +54,16 @@ in userChrome = userChrome; - settings = { - # 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; - }; + settings = profileSettings; + }; + profiles.noOffload = { + id = 1; + name = "noOffload"; + isDefault = false; + + userChrome = userChrome; + settings = profileSettings; }; }; }; diff --git a/system/dev/dn-lap/boot.nix b/system/dev/dn-lap/boot.nix index 096bf42..3e91d8c 100644 --- a/system/dev/dn-lap/boot.nix +++ b/system/dev/dn-lap/boot.nix @@ -1,6 +1,7 @@ -{ ... }: +{ pkgs, ... }: { + boot.kernelPackages = pkgs.linuxPackages_latest; boot.loader.systemd-boot.enable = true; # Enable F keys in some wireless keyboard (Ex. neo65) diff --git a/system/dev/dn-pre7780/boot.nix b/system/dev/dn-pre7780/boot.nix index 33a21ac..451b8f3 100644 --- a/system/dev/dn-pre7780/boot.nix +++ b/system/dev/dn-pre7780/boot.nix @@ -1,6 +1,7 @@ -{ ... }: +{ pkgs, ... }: { + boot.kernelPackages = pkgs.linuxPackages_latest; fileSystems."/mnt/storage" = { device = "router.dn:/mnt/storage"; diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix index 7fa778b..69d5c32 100644 --- a/system/modules/hyprland.nix +++ b/system/modules/hyprland.nix @@ -40,6 +40,10 @@ wlogout wl-clipboard waybar + + # Util + grim + slurp ]; nix = { diff --git a/system/modules/nvidia.nix b/system/modules/nvidia.nix index 32cd7e6..80b16f3 100644 --- a/system/modules/nvidia.nix +++ b/system/modules/nvidia.nix @@ -56,7 +56,7 @@ lib.checkListOfEnum "Nvidia Prime Mode" validModes [ nvidia-mode ] { nvidia.nvidiaSettings = true; nvidia.dynamicBoost.enable = true; - nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; nvidia.prime = ( diff --git a/system/modules/plymouth.nix b/system/modules/plymouth.nix index 5bb1867..410bed7 100644 --- a/system/modules/plymouth.nix +++ b/system/modules/plymouth.nix @@ -1,10 +1,11 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ boot = { plymouth = { enable = true; - theme = "catppuccin-frappe"; + theme = "hexagon_dots"; themePackages = with pkgs; [ - (adi1090x-plymouth-themes.override { selected_themes = [ "motion" ]; }) + (adi1090x-plymouth-themes.override { selected_themes = [ "hexagon_dots" ]; }) (catppuccin-plymouth.override { variant = "frappe"; }) ]; }; diff --git a/system/modules/sound.nix b/system/modules/sound.nix index f10c80f..b25a0ce 100644 --- a/system/modules/sound.nix +++ b/system/modules/sound.nix @@ -2,7 +2,7 @@ { security.rtkit.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; diff --git a/utils/make-icon.nix b/utils/make-icon.nix index 210f9be..cfceee1 100644 --- a/utils/make-icon.nix +++ b/utils/make-icon.nix @@ -1,5 +1,8 @@ { pkgs ? import { }, + imagemagick, + file, + stdenvNoCC, ... }: let @@ -9,7 +12,7 @@ let url, sha256, }: - pkgs.stdenvNoCC.mkDerivation rec { + stdenvNoCC.mkDerivation rec { inherit name; pname = name; @@ -19,11 +22,31 @@ let dontUnpack = true; - buildInputs = [ ]; - installPhase = '' - mkdir -p $out/share/icons - cp -r $src $out/share/icons + nativeBuildInputs = [ + imagemagick + file + ]; + + 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 makeIconPkg