diff --git a/flake.lock b/flake.lock index d74501c..6e36fe8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,26 +2,28 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs_3", - "systems": "systems_3" + "astal": "astal", + "nixpkgs": [ + "hyprpanel", + "nixpkgs" + ] }, "locked": { - "lastModified": 1727303518, - "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", - "owner": "Aylur", + "lastModified": 1735485506, + "narHash": "sha256-7CWr3Q83KnGiLUn0oaboafLMOXQ0X9/fjFRVY1xopbM=", + "owner": "aylur", "repo": "ags", - "rev": "cd543afec4d9ed708990e5ba52184716809bf248", + "rev": "251d39413543264361898b02035775aa3e46fe52", "type": "github" }, "original": { - "owner": "Aylur", + "owner": "aylur", "repo": "ags", "type": "github" } }, "apple-fonts": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "ny": "ny", "sf-arabic": "sf-arabic", @@ -30,11 +32,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1727490842, - "narHash": "sha256-SbEZEoBRHFf8dXyi72/zOsOYt+B5M2hHtVgkkmjt7tw=", + "lastModified": 1732029343, + "narHash": "sha256-sAOEhA/vfyAKggwyI3PNy2xeNzb/USZl4YNpeSzMRBI=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "e30d6bb334e726db586a50f8b8ea0ac4cb61361f", + "rev": "714767021b57d0d30de35eb90e4b748fbbb9c99f", "type": "github" }, "original": { @@ -63,11 +65,11 @@ ] }, "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", + "lastModified": 1734906446, + "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", + "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", "type": "github" }, "original": { @@ -76,16 +78,38 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735172721, + "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "owner": "aylur", + "repo": "astal", + "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -129,11 +153,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -163,6 +187,29 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1735202720, + "narHash": "sha256-7aEdACqT2B7nZNFjn2Y66Qucfl1AHHVFKxm4yvO0O10=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "fe816609e68ee1887ee89e43c9ca1aad75362477", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "flake-compat": { "flake": false, "locked": { @@ -196,11 +243,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -212,11 +259,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -233,11 +280,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -247,15 +294,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", "type": "github" }, "original": { @@ -266,14 +310,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_4" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -290,11 +334,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -306,11 +350,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -336,11 +380,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -396,16 +440,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -417,11 +461,11 @@ ] }, "locked": { - "lastModified": 1729864948, - "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -438,11 +482,11 @@ ] }, "locked": { - "lastModified": 1729716953, - "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -459,11 +503,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -488,11 +532,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -501,33 +545,62 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1729852008, - "narHash": "sha256-Rw5fexgBeZ96EPs557mDW3pyTzFm3tVGHWPgPlPSQk8=", - "ref": "refs/heads/main", - "rev": "f0e023bff2f2a25ffe5ed3166f55f7274d17c6bc", - "revCount": 5373, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "lastModified": 1735514352, + "narHash": "sha256-EivxqI3NluU/ltdpzly5oyhe+C0oC6dZby2lnf5kBgc=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "cb211d83f68542e9fbf7567d57bdf528286cbf7e", + "type": "github" }, "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" } }, "hyprland-protocols": { @@ -580,6 +653,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -596,11 +698,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", "type": "github" }, "original": { @@ -612,14 +714,14 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1729845618, - "narHash": "sha256-Mq9nTj6wLbTEy3wXlUIGLNLeNtrPHVev+yQmnH9slH4=", + "lastModified": 1735494539, + "narHash": "sha256-+zxaopt32u4aItJaXu/SnXe/7mFCaFFXKJgHwUT66SY=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "2d1e2304057eca200d5fa132ed09422f59fd94e7", + "rev": "2fbbdd7b412bbb016ad9535771bf28f1d284550f", "type": "github" }, "original": { @@ -631,15 +733,15 @@ "hyprpolkitagent": { "inputs": { "hyprutils": "hyprutils_2", - "nixpkgs": "nixpkgs_5", - "systems": "systems_4" + "nixpkgs": "nixpkgs_4", + "systems": "systems_2" }, "locked": { - "lastModified": 1729625638, - "narHash": "sha256-QIm0pNs7lXM20E/4yxDseWWD+tsc8eL9tvZuNAZjG40=", + "lastModified": 1734125519, + "narHash": "sha256-dK1Dozb/tI8Dyg9aBBUgNt7L/HTTxB807Kfoh/PWSCw=", "owner": "hyprwm", "repo": "hyprpolkitagent", - "rev": "b22dfc2e091c9055fc1b7b14ff51db1b45e34701", + "rev": "ae7c5be24c63b8a53d0d5f5344d821b5f48d3623", "type": "github" }, "original": { @@ -648,42 +750,20 @@ "type": "github" } }, - "hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1729427131, - "narHash": "sha256-Ablfg1XeD5tEU3yOHe5mcqqWbtdBaePUlwHUtel0Wpk=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "0a41e37c9112a752ac2a7b9afbbdac5d14c536c6", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "0a41e37c9112a752ac2a7b9afbbdac5d14c536c6", - "type": "github" - } - }, "hyprsunset": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_6", - "systems": "systems_6" + "nixpkgs": "nixpkgs_5", + "systems": "systems_3" }, "locked": { - "lastModified": 1728415425, - "narHash": "sha256-SVkcePzX9PAlWsPSGBaxiNFCouiQmGOezhMo0+zhDIQ=", + "lastModified": 1731163989, + "narHash": "sha256-+M6/ZLT2g6l2JCBBQSNMp8oqXPMMUckWTNhHSXzvlXE=", "owner": "hyprwm", "repo": "hyprsunset", - "rev": "f535c1894d71d7639d19b52f5b72e1ac840c2512", + "rev": "adaae9d2adac611151224b054f59db8cb0976779", "type": "github" }, "original": { @@ -704,11 +784,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1735316583, + "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", "type": "github" }, "original": { @@ -729,11 +809,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -779,11 +859,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "type": "github" }, "original": { @@ -831,16 +911,16 @@ ] }, "locked": { - "lastModified": 1729544999, - "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "owner": "NuschtOS", "repo": "ixx", - "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.5", + "ref": "v0.0.6", "repo": "ixx", "type": "github" } @@ -853,11 +933,11 @@ ] }, "locked": { - "lastModified": 1729757100, - "narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "04193f188e4144d7047f83ad1de81d6034d175cd", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -868,11 +948,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729742320, - "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -884,11 +964,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -900,11 +980,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -914,29 +994,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -948,15 +1012,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -964,37 +1028,21 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", - "owner": "nixos", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { - "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1728241625, "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", @@ -1010,13 +1058,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -1026,13 +1074,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -1042,6 +1090,22 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -1057,11 +1121,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729791159, - "narHash": "sha256-i5TKYCs9tJ2qaYTsjQh3WwExmj4O0EU+L1jq6ZBVMfM=", + "lastModified": 1735378670, + "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", "owner": "nix-community", "repo": "nixvim", - "rev": "4726334e4413ff55f1db3768c8d08722abbf09cf", + "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", "type": "github" }, "original": { @@ -1073,11 +1137,11 @@ "nixy-wallpapers": { "flake": false, "locked": { - "lastModified": 1729534389, - "narHash": "sha256-VlPfWXRtIfJKDaGqbjThqooa1cYV/+jzv2Tx+YN4JXY=", + "lastModified": 1733499879, + "narHash": "sha256-ZzA766i4o0D4DWkuVOn5J3oBqTclFcz3gigwD5Bp+FM=", "owner": "anotherhadi", "repo": "nixy-wallpapers", - "rev": "3e2ba1a817c45e8a54b26101983ed3a0c57a3ea6", + "rev": "713754b59d42225588b3818defe7ed05238c83af", "type": "github" }, "original": { @@ -1096,11 +1160,11 @@ ] }, "locked": { - "lastModified": 1729763753, - "narHash": "sha256-M8WAUgKFBU5TvFt92g/dHBtGJmBP33LHird+solHt0g=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "bedc2f2ada220815a98a896e10f5e61bfc329bfc", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -1132,11 +1196,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -1148,19 +1212,20 @@ "root": { "inputs": { "apple-fonts": "apple-fonts", + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "hyprland": "hyprland", "hyprpanel": "hyprpanel", "hyprpolkitagent": "hyprpolkitagent", - "hyprspace": "hyprspace", "hyprsunset": "hyprsunset", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "nixy-wallpapers": "nixy-wallpapers", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", - "stylix": "stylix" + "stylix": "stylix", + "zen-browser": "zen-browser" } }, "sf-arabic": { @@ -1215,15 +1280,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1729775275, - "narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=", + "lastModified": 1735468296, + "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d", + "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", "type": "github" }, "original": { @@ -1240,11 +1304,11 @@ ] }, "locked": { - "lastModified": 1729829883, - "narHash": "sha256-Hl7pgMVLHtEU4BfqhGQScllTB+jjWZEumFQB/5esdXA=", + "lastModified": 1735445831, + "narHash": "sha256-XfC/uQO77JXC4DSOYUjRI7f46xF7Pz2Ipo4z0fYAzdo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "fd9ae55223412b9dc5fedd3e9c3d1d18804577af", + "rev": "ffff5a333a9dea5f3fba352239c5f445b0788083", "type": "github" }, "original": { @@ -1263,18 +1327,18 @@ "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_8", - "systems": "systems_8", + "nixpkgs": "nixpkgs_7", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1729380793, - "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", + "lastModified": 1735524788, + "narHash": "sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54=", "owner": "danth", "repo": "stylix", - "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", + "rev": "a4ed4168fb83289374f24cb8a039c6983637a076", "type": "github" }, "original": { @@ -1285,16 +1349,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1329,51 +1393,6 @@ } }, "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1388,7 +1407,7 @@ "type": "github" } }, - "systems_8": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1406,16 +1425,17 @@ "tinted-foot": { "flake": false, "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", "owner": "tinted-theming", "repo": "tinted-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", "type": "github" } }, @@ -1439,11 +1459,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { @@ -1460,11 +1480,11 @@ ] }, "locked": { - "lastModified": 1729613947, - "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -1501,11 +1521,11 @@ ] }, "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { @@ -1513,6 +1533,24 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1735092772, + "narHash": "sha256-u9uEmMRE3RR8hwZto4USSDvee7X2FEYeWcSSLf4Jjrs=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "cea051b6f908304f4af6484b14a532c729f0cc34", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 171a109..aa5adb7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,4 @@ { - # https://github.com/anotherhadi/nixy description = '' Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles. @@ -24,26 +23,30 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprspace = { - # BUG: This is a temporary fix for the flake issue - url = "github:KZDKM/Hyprspace/0a41e37c9112a752ac2a7b9afbbdac5d14c536c6"; - inputs.hyprland.follows = "hyprland"; - }; + # hyprspace = { + # url = "github:KZDKM/Hyprspace"; + # inputs.hyprland.follows = "hyprland"; + # }; nixy-wallpapers = { url = "github:anotherhadi/nixy-wallpapers"; flake = false; }; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland.url = "github:/hyprwm/Hyprland"; hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent"; hyprsunset.url = "github:hyprwm/hyprsunset"; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; stylix.url = "github:danth/stylix"; apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; }; outputs = inputs@{ nixpkgs, ... }: { nixosConfigurations = { - nixy = # CHANGEME: This should match the 'hostname' in your variables.nix file + dark = # CHANGEME: This should match the 'hostname' in your variables.nix file nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -51,7 +54,7 @@ nixpkgs.overlays = [ inputs.hyprpanel.overlay ]; _module.args = { inherit inputs; }; } - inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x270 # CHANGEME: check https://github.com/NixOS/nixos-hardware inputs.home-manager.nixosModules.home-manager inputs.stylix.nixosModules.stylix ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix new file mode 100644 index 0000000..fb03918 --- /dev/null +++ b/home/programs/firefox/default.nix @@ -0,0 +1,102 @@ +{ pkgs, inputs, ... }: { + programs.firefox = { + enable = true; + profiles.dark = { + isDefault = true; + id = 0; + name = "dark"; + settings = { + "signon.rememberSignons" = false; + "widget.use-xdg-desktop-portal.file-picker" = 1; + "browser.aboutConfig.showWarning" = false; + "browser.compactmode.show" = true; + "browser.cache.disk.enable" = false; # Be kind to hard drive + # Privacy settings + "privacy.donottrackheader.enabled" = true; + "privacy.trackingprotection.enabled" = true; + "privacy.trackingprotection.socialtracking.enabled" = true; + "privacy.partition.network_state.ocsp_cache" = true; + # Disable all sorts of telemetry + "browser.newtabpage.activity-stream.feeds.telemetry" = false; + "browser.newtabpage.activity-stream.telemetry" = false; + "browser.ping-centre.telemetry" = false; + "toolkit.telemetry.archive.enabled" = false; + "toolkit.telemetry.bhrPing.enabled" = false; + "toolkit.telemetry.enabled" = false; + "toolkit.telemetry.firstShutdownPing.enabled" = false; + "toolkit.telemetry.hybridContent.enabled" = false; + "toolkit.telemetry.newProfilePing.enabled" = false; + "toolkit.telemetry.reportingpolicy.firstRun" = false; + "toolkit.telemetry.shutdownPingSender.enabled" = false; + "toolkit.telemetry.unified" = false; + "toolkit.telemetry.updatePing.enabled" = false; + # As well as Firefox 'experiments' + "experiments.activeExperiment" = false; + "experiments.enabled" = false; + "experiments.supported" = false; + "network.allow-experiments" = false; + # Disable Pocket Integration + "browser.newtabpage.activity-stream.section.highlights.includePocket" = + false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "extensions.pocket.enabled" = false; + "extensions.pocket.api" = ""; + "extensions.pocket.oAuthConsumerKey" = ""; + "extensions.pocket.showHome" = false; + "extensions.pocket.site" = ""; + }; + search = { + force = true; + default = "Searx"; + order = [ "Searx" "Google" ]; + engines = { + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { + name = "type"; + value = "packages"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + }]; + icon = + "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + "NixOS Wiki" = { + urls = [{ + template = "https://nixos.wiki/index.php?search={searchTerms}"; + }]; + iconUpdateURL = "https://nixos.wiki/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; # every day + definedAliases = [ "@nw" ]; + }; + "Searx" = { + urls = [{ + template = "https://searx.aicampground.com/?q={searchTerms}"; + }]; + iconUpdateURL = "https://nixos.wiki/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; # every day + definedAliases = [ "@searx" ]; + }; + "Bing".metaData.hidden = true; + "Google".metaData.alias = + "@g"; # builtin engines only support specifying one additional alias + }; + }; + + extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ + bitwarden + multi-account-containers + zotero-connector + unpaywall + ]; + }; + }; +} diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix index 8764a87..2e7ffcd 100644 --- a/home/programs/git/default.nix +++ b/home/programs/git/default.nix @@ -22,6 +22,7 @@ in { extraConfig = { init.defaultBranch = "main"; push.autoSetupRemote = true; + color.ui = "1"; }; aliases = { essa = "push --force"; diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix index e7de277..80dbc53 100644 --- a/home/programs/kitty/default.nix +++ b/home/programs/kitty/default.nix @@ -9,6 +9,7 @@ "ctrl+tab" = "send_text all \\x1b[27;5;9~"; "ctrl+shift+tab" = "send_text all \\x1b[27;6;9~"; "alt+tab" = "send_text all \\x1b[27;3;9~"; + "ctrl+shift+enter" = "new_window_with_cwd"; }; settings = { scrollback_lines = 10000; @@ -23,6 +24,7 @@ cursor_shape = "Underline"; cursor_underline_thickness = 3; window_padding_width = 10; + tab_bar_style = "powerline"; }; }; } diff --git a/home/programs/nemo/default.nix b/home/programs/nemo/default.nix new file mode 100644 index 0000000..49ba7af --- /dev/null +++ b/home/programs/nemo/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + nemo-with-extensions + nemo-fileroller + nemo-emblems + file-roller + ]; +} diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix index e4deb24..fddc536 100644 --- a/home/programs/nvim/keymaps.nix +++ b/home/programs/nvim/keymaps.nix @@ -62,6 +62,14 @@ keymaps = [ # General Mappings + { + key = "j"; + action = "gj"; + } + { + key = "k"; + action = "gk"; + } { key = "e"; action = "Oil --float"; diff --git a/home/programs/nvim/options.nix b/home/programs/nvim/options.nix index 8cb51c7..b93eb97 100644 --- a/home/programs/nvim/options.nix +++ b/home/programs/nvim/options.nix @@ -29,10 +29,24 @@ termguicolors = true; showmode = false; - wrap = false; + wrap = true; + linebreak = true; swapfile = false; undofile = true; conceallevel = 3; }; + programs.nixvim.extraConfigLuaPost = '' + vim.g.neovide_scale_factor = 1.0 + local change_scale_factor = function(delta) + vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta + end + vim.keymap.set("n", "", function() + change_scale_factor(1.25) + end) + vim.keymap.set("n", "", function() + change_scale_factor(1/1.25) + end) + ''; + } diff --git a/home/programs/nvim/plugins/lsp.nix b/home/programs/nvim/plugins/lsp.nix index 802435f..3ce905f 100644 --- a/home/programs/nvim/plugins/lsp.nix +++ b/home/programs/nvim/plugins/lsp.nix @@ -1,20 +1,31 @@ -{ +{ pkgs, ... }: { programs.nixvim.plugins = { lsp-format.enable = true; lsp = { enable = true; servers = { bashls.enable = true; - clangd.enable = true; - gopls.enable = true; + clangd.enable = false; + gopls.enable = false; nixd = { enable = true; extraOptions = { expr = "import {}"; }; }; tailwindcss.enable = true; html.enable = true; - svelte.enable = true; + svelte.enable = false; marksman.enable = true; + intelephense = { + enable = true; + package = pkgs.nodePackages.intelephense; + settings = { + init_options = { + globalStoragePath = "~/.local/share/intelephense"; + }; + }; + }; + dockerls.enable = true; + elmls.enable = true; }; keymaps.lspBuf = { "gd" = "definition"; @@ -32,15 +43,17 @@ statix.enable = true; }; formatting = { - gofmt.enable = true; - goimports.enable = true; + # gofmt.enable = true; + # goimports.enable = true; nixfmt.enable = true; markdownlint.enable = true; tidy.enable = true; shellharden.enable = true; shfmt.enable = true; - golines.enable = true; - gofumpt.enable = true; + # golines.enable = true; + # gofumpt.enable = true; + phpcsfixer.enable = true; + elm_format.enable = true; }; }; }; diff --git a/home/programs/nvim/plugins/markdown.nix b/home/programs/nvim/plugins/markdown.nix index b50b2da..c86fdeb 100644 --- a/home/programs/nvim/plugins/markdown.nix +++ b/home/programs/nvim/plugins/markdown.nix @@ -112,6 +112,10 @@ in { modes = "n"; }; }; + tables = { + formatOnMove = true; + trimWhitespace = true; + }; }; extraFiles = { "after/ftplugin/markdown.lua".text = '' diff --git a/home/programs/nvim/plugins/project.nix b/home/programs/nvim/plugins/project.nix new file mode 100644 index 0000000..5572ace --- /dev/null +++ b/home/programs/nvim/plugins/project.nix @@ -0,0 +1,6 @@ +{ + programs.nixvim.plugins.project-nvim = { + enable = true; + enableTelescope = true; + }; +} diff --git a/home/programs/nvim/plugins/ui.nix b/home/programs/nvim/plugins/ui.nix index 39cffcc..f8212d4 100644 --- a/home/programs/nvim/plugins/ui.nix +++ b/home/programs/nvim/plugins/ui.nix @@ -19,15 +19,15 @@ right = "|"; }; sectionSeparators = { - left = "█"; #  - right = "█"; #  + left = ""; #  + right = ""; #  }; sections = { lualine_a = [ "mode" ]; lualine_b = [ "branch" "diff" "diagnostics" ]; lualine_c = [ "filename" ]; lualine_x = [ "filetype" ]; - lualine_y = [ "progress" ]; + lualine_y = [ "progress" "selectioncount" ]; lualine_z = [ ''" " .. os.date("%R")'' ]; }; }; @@ -44,7 +44,7 @@ }; trouble.enable = true; indent-blankline.enable = true; - nvim-colorizer.enable = true; + colorizer.enable = true; tagbar = { enable = true; tagsPackage = pkgs.universal-ctags; diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix index 833926c..c951034 100644 --- a/home/programs/nvim/plugins/utils.nix +++ b/home/programs/nvim/plugins/utils.nix @@ -7,7 +7,7 @@ copilot-vim.enable = true; flash.enable = true; image = { - enable = true; + enable = false; integrations.markdown = { clearInInsertMode = true; onlyRenderImageAtCursor = true; @@ -43,7 +43,10 @@ }; }; }; - # treesitter-context.enable = true; + orgmode.enable = true; + treesitter-context.enable = true; + nvim-surround.enable = true; + vim-suda.enable = true; }; }; } diff --git a/home/programs/office/default.nix b/home/programs/office/default.nix new file mode 100644 index 0000000..4f26646 --- /dev/null +++ b/home/programs/office/default.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ libreoffice thunderbird marp-cli ]; +} diff --git a/home/programs/pass/default.nix b/home/programs/pass/default.nix new file mode 100644 index 0000000..013524d --- /dev/null +++ b/home/programs/pass/default.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ pass seahorse gnome-keyring pinentry-all ]; + + services.gnome-keyring.enable = true; + programs.gpg.enable = true; + services.gpg-agent = { + enable = true; + maxCacheTtl = 604800; + defaultCacheTtl = 604800; + enableSshSupport = true; + enableZshIntegration = true; + verbose = true; + enableScDaemon = false; + pinentryPackage = pkgs.pinentry-all; + }; +} diff --git a/home/programs/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix index e1ce816..010b85d 100644 --- a/home/programs/qutebrowser/default.nix +++ b/home/programs/qutebrowser/default.nix @@ -13,7 +13,7 @@ let "config": { "title" : "Welcome Home", "openLinksInNewTab": false, - "locale": "fr-FR", + "locale": "id-ID", "colors": { "primary": "${accent}", "background": "${background}", @@ -49,37 +49,36 @@ let } ''; - homepage = pkgs.buildNpmPackage { - pname = "homepage"; - version = "0.0.0"; + # homepage = pkgs.buildNpmPackage { + # pname = "homepage"; + # version = "0.0.0"; + # + # src = pkgs.fetchFromGitHub { + # owner = "anotherhadi"; + # repo = "homepage"; + # rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d"; + # hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0="; + # }; + # + # # npmDepsHash = lib.fakeHash; + # npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4="; + # + # buildPhase = '' + # npm install + # cp ${pkgs.writeText "src/routes/config.json" settings} src/routes/config.json + # npm run build + # mkdir $out + # mv build $out + # ''; + # + # meta = { + # description = "homepage"; + # homepage = "https://github.com/anotherhadi/homepage"; + # }; + # }; - src = pkgs.fetchFromGitHub { - owner = "anotherhadi"; - repo = "homepage"; - rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d"; - hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0="; - }; - - # npmDepsHash = lib.fakeHash; - npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4="; - - buildPhase = '' - npm install - cp ${ - pkgs.writeText "src/routes/config.json" settings - } src/routes/config.json - npm run build - mkdir $out - mv build $out - ''; - - meta = { - description = "homepage"; - homepage = "https://github.com/anotherhadi/homepage"; - }; - }; - -in { +in +{ imports = [ ./duckduckgo-colorscheme.nix ]; @@ -99,7 +98,7 @@ in { }; quickmarks = { - home = "${homepage}/build/index.html"; + # home = "${homepage}/build/index.html"; server = "https://home.anotherhadi.com"; jack = "https://home.anotherhadi.com"; mynixos = "https://mynixos.com"; @@ -119,14 +118,13 @@ in { }; settings = { - url = { - default_page = "${homepage}/build/index.html"; - start_pages = [ "${homepage}/build/index.html" ]; - }; + # url = { + # default_page = "${homepage}/build/index.html"; + # start_pages = [ "${homepage}/build/index.html" ]; + # }; colors = { - webpage.preferred_color_scheme = - "dark"; # Enable dark mode for websites that support it + webpage.preferred_color_scheme = "dark"; # Enable dark mode for websites that support it }; statusbar.show = "in-mode"; @@ -157,7 +155,9 @@ in { remove_finished = 0; }; - hints = { radius = 1; }; + hints = { + radius = 1; + }; scrolling = { bar = "never"; @@ -178,7 +178,7 @@ in { keyBindings = { normal = { - "gh" = "open ${homepage}/build/index.html"; + # "gh" = "open ${homepage}/build/index.html"; "gs" = "open https://home.anotherhadi.com"; " p" = "tab-move -"; diff --git a/home/programs/shell/default.nix b/home/programs/shell/default.nix index 84d046f..b3b0204 100644 --- a/home/programs/shell/default.nix +++ b/home/programs/shell/default.nix @@ -1,4 +1,11 @@ { - imports = - [ ./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./tmux.nix ./eza.nix ]; + imports = [ + ./fzf.nix + ./zsh.nix + ./starship.nix + ./zoxide.nix + ./tmux.nix + ./eza.nix + ./direnv.nix + ]; } diff --git a/home/programs/shell/direnv.nix b/home/programs/shell/direnv.nix new file mode 100644 index 0000000..8acebba --- /dev/null +++ b/home/programs/shell/direnv.nix @@ -0,0 +1,8 @@ +# Direnv for development +{ + programs.direnv = { + enable = true; + enableZshIntegration = true; + nix-direnv.enable = true; + }; +} diff --git a/home/programs/shell/starship.nix b/home/programs/shell/starship.nix index 088c1de..2640c88 100644 --- a/home/programs/shell/starship.nix +++ b/home/programs/shell/starship.nix @@ -8,6 +8,9 @@ in { enable = true; settings = { add_newline = true; + aws.disabled = true; + azure.disabled = true; + gcloud.disabled = true; format = lib.concatStrings [ "$directory" "$git_branch" diff --git a/home/programs/shell/tmux.nix b/home/programs/shell/tmux.nix index 7d7b993..a9a7815 100644 --- a/home/programs/shell/tmux.nix +++ b/home/programs/shell/tmux.nix @@ -29,7 +29,8 @@ in { enable = true; mouse = true; shell = "${pkgs.zsh}/bin/zsh"; - prefix = "C-s"; + prefix = "C-a"; + baseIndex = 1; terminal = "kitty"; keyMode = "vi"; @@ -45,13 +46,18 @@ in { bind-key -n C-Tab next-window bind-key -n C-S-Tab previous-window bind-key -n M-Tab new-window + bind C-l send-keys 'C-l' + + bind c new-window -c "#{pane_current_path}" + bind '"' split-window -c "#{pane_current_path}" + bind % split-window -h -c "#{pane_current_path}" ''; plugins = with pkgs; [ tmuxPlugins.vim-tmux-navigator tmuxPlugins.resurrect tmuxPlugins.sensible - tmuxPlugins.tokyo-night-tmux + # tmuxPlugins.tokyo-night-tmux ]; }; home.packages = [ Config ]; diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index dd53bed..e40d4ce 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -3,12 +3,24 @@ let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch in { - home.packages = with pkgs; [ bat ripgrep tldr sesh ]; + home.packages = with pkgs; [ ripgrep tldr sesh ]; home.sessionPath = [ "$HOME/go/bin" ]; + programs.bat = { + enable = true; + extraPackages = with pkgs.bat-extras; [ + batman + batdiff + batgrep + batwatch + prettybat + ]; + }; + programs.zsh = { enable = true; + autocd = true; enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; @@ -64,10 +76,16 @@ in { open = "${pkgs.xdg-utils}/bin/xdg-open"; icat = "${pkgs.kitty}/bin/kitty +kitten icat"; + cat = "bat"; + diff = "batdiff"; + man = "batman"; + grep = "batgrep"; + rofi = "wofi"; + wireguard-import = "nmcli connection import type wireguard file"; notes = - "nvim ~/nextcloud/Notes/index.md --cmd 'cd ~/nextcloud/Notes' -c ':Telescope find_files'"; + "nvim ~/nextcloud/Catatan/index.md --cmd 'cd ~/nextcloud/Catatan' -c ':Telescope find_files'"; note = "notes"; # git diff --git a/home/programs/thunar/default.nix b/home/programs/thunar/default.nix index f56db89..e165d31 100644 --- a/home/programs/thunar/default.nix +++ b/home/programs/thunar/default.nix @@ -9,38 +9,40 @@ thunar-volman ]; - home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = '' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ''; + # home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = '' + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # + # ''; } diff --git a/home/scripts/night-shift/default.nix b/home/scripts/night-shift/default.nix index 0122530..355e8dd 100644 --- a/home/scripts/night-shift/default.nix +++ b/home/scripts/night-shift/default.nix @@ -9,9 +9,10 @@ #- - `night-shift-status-icon` checks if Night-Shift is active. (icon) { inputs, pkgs, ... }: let + value = "4500"; night-shift-on = pkgs.writeShellScriptBin "night-shift-on" '' - ${pkgs.hyprshade}/bin/hyprshade on blue-light-filter + ${pkgs.hyprsunset}/bin/hyprsunset -t ${value} & title="󰖔 Night-Shift Activated" description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes." @@ -19,7 +20,7 @@ let ''; night-shift-off = pkgs.writeShellScriptBin "night-shift-off" '' - ${pkgs.hyprshade}/bin/hyprshade off + pkill hyprsunset title="󰖕 Night-Shift Deactivated" description="Night-Shift is now deactivated! Your screen will return to normal." @@ -27,7 +28,7 @@ let ''; night-shift = pkgs.writeShellScriptBin "night-shift" '' - if [[ $(${pkgs.hyprshade}/bin/hyprshade current) ]]; then + if pidof "hyprsunset"; then night-shift-off else night-shift-on @@ -35,7 +36,7 @@ let ''; night-shift-status = pkgs.writeShellScriptBin "night-shift-status" '' - if [[ $(${pkgs.hyprshade}/bin/hyprshade current) ]]; then + if pidof "hyprsunset"; then echo "1" else echo "0" @@ -44,7 +45,7 @@ let night-shift-status-icon = pkgs.writeShellScriptBin "night-shift-status-icon" '' - if [[ $(hyprshade current) ]]; then + if pidof "hyprsunset"; then echo "󰖔" else echo "󰖕" @@ -52,7 +53,7 @@ let ''; in { home.packages = [ - inputs.hyprsunset.packages."${pkgs.system}".hyprsunset + pkgs.hyprsunset night-shift-on night-shift-off night-shift diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix index e3a4855..0dbbc28 100644 --- a/home/system/gtk/default.nix +++ b/home/system/gtk/default.nix @@ -37,8 +37,8 @@ in { theme = lib.mkForce { name = "FlatColor"; }; iconTheme = { - package = pkgs.kora-icon-theme; - name = "Kora"; + package = pkgs.tela-icon-theme; + name = "Tela-dark"; }; font = { name = config.stylix.fonts.serif.name; }; diff --git a/home/system/hypridle/default.nix b/home/system/hypridle/default.nix index b354e15..ce1ef22 100644 --- a/home/system/hypridle/default.nix +++ b/home/system/hypridle/default.nix @@ -13,13 +13,29 @@ listener = [ { - timeout = 600; + timeout = 150; # 2.5min. + on-timeout = + "${pkgs.brightnessctl}/bin/brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-resume = + "${pkgs.brightnessctl}/bin/brightnessctl -r"; # monitor backlight restore. + } + + { + timeout = 300; on-timeout = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; } { - timeout = 660; - on-timeout = "systemctl suspend"; + timeout = 430; # 5.5min + on-timeout = + "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; # screen off when timeout has passed + on-resume = + "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired. + } + + { + timeout = 960; + on-timeout = "systemctl sleep"; } ]; }; diff --git a/home/system/hyprland/bindings.nix b/home/system/hyprland/bindings.nix index 339f51c..c2e4e27 100644 --- a/home/system/hyprland/bindings.nix +++ b/home/system/hyprland/bindings.nix @@ -3,14 +3,18 @@ bind = [ "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty "$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar - "$mod,B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser - "$mod,K, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden - "$mod,L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock + # "$mod,B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser + "$mod,U, exec, ${pkgs.firefox}/bin/firefox" # Firefox + # "$shiftMod,B, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden + "$shiftMod,Q, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock "$mod,X, exec, powermenu" # Powermenu "$mod,SPACE, exec, menu" # Launcher "$mod,C, exec, quickmenu" # Quickmenu - "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus - "$mod,TAB, overview:toggle" # Overview + # "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus + "$mod,TAB, workspace, previous" # Overview + # "$shiftMod,TAB, overview:toggle" # Overview + "$mod, bracketright, workspace, e+1" + "$mod, bracketleft, workspace, e-1" "$mod,Q, killactive," # Close window "$mod,T, togglefloating," # Toggle Floating @@ -24,12 +28,21 @@ "$shiftMod,left, layoutmsg, addmaster" # Add to master "$shiftMod,right, layoutmsg, removemaster" # Remove from master + "$mod,h, movefocus, l" # Move focus left + "$mod,l, movefocus, r" # Move focus Right + "$mod,k, movefocus, u" # Move focus Up + "$mod,j, movefocus, d" # Move focus Down + "$ctrlMod,k, focusmonitor, -1" # Focus previous monitor + "$ctrlMod,j, focusmonitor, 1" # Focus next monitor + "$ctrlMod,h, layoutmsg, addmaster" # Add to master + "$ctrlMod,l, layoutmsg, removemaster" # Remove from master + "$mod,PRINT, exec, screenshot window" # Screenshot window ",PRINT, exec, screenshot monitor" # Screenshot monitor "$shiftMod,PRINT, exec, screenshot region" # Screenshot region "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit - "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi + # "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi "$shiftMod,C, exec, clipboard" # Clipboard picker with wofi "$shiftMod,E, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" # Emoji picker with wofi "$mod,F2, exec, night-shift" # Toggle night shift @@ -61,5 +74,10 @@ ",XF86MonBrightnessDown, exec, brightness-down" # Brightness Down ]; + binds = { + workspace_back_and_forth = false; + allow_workspace_cycles = true; + }; + }; } diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 49bbbdc..3906d68 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -1,17 +1,21 @@ # So best window tiling manager { pkgs, config, inputs, ... }: let - border-size = config.var.theme.border-size; - gaps-in = config.var.theme.gaps-in; - gaps-out = config.var.theme.gaps-out; - active-opacity = config.var.theme.active-opacity; - inactive-opacity = config.var.theme.inactive-opacity; - rounding = config.var.theme.rounding; - blur = config.var.theme.blur; - keyboardLayout = config.var.keyboardLayout; + inherit (config.var.theme) + border-size gaps-in gaps-out active-opacity inactive-opacity rounding blur; + inherit (config.var) keyboardLayout; + # border-size = config.var.theme.border-size; + # gaps-in = config.var.theme.gaps-in; + # gaps-out = config.var.theme.gaps-out; + # active-opacity = config.var.theme.active-opacity; + # inactive-opacity = config.var.theme.inactive-opacity; + # rounding = config.var.theme.rounding; + # blur = config.var.theme.blur; + # keyboardLayout = config.var.keyboardLayout; in { - imports = [ ./animations.nix ./bindings.nix ./polkitagent.nix ]; + imports = + [ ./animations.nix ./bindings.nix ./polkitagent.nix ./windowrule.nix ]; home.packages = with pkgs; [ qt5.qtwayland @@ -39,31 +43,40 @@ in { wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - systemd.enable = true; + systemd = { + enable = true; + variables = [ "--all" ]; + }; package = inputs.hyprland.packages."${pkgs.system}".hyprland; - plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ]; + # plugins = [ inputs.hyprspace.packages."${pkgs.system}".Hyprspace ]; settings = { "$mod" = "SUPER"; "$shiftMod" = "SUPER_SHIFT"; + "$ctrlMod" = "SUPER_CTRL"; exec-once = [ - "${pkgs.bitwarden}/bin/bitwarden" + # "${pkgs.bitwarden}/bin/bitwarden" "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" ]; plugin = { overview = { autoDrag = false; }; }; monitor = [ - "eDP-2,highres,0x0,1" - "DP-7, disable" - "DP-8, disable" - "DP-9, disable" - "HDMI-A-1,3440x1440@99.98,auto,1" + "eDP-1,preffered,0x0,1" + "desc:LG Electronics 16EN33 305INKH5P181,preferred,0x-768,1" ",prefered,auto,1" ]; + # workspace = [ + # "1,monitor:eDP-1" + # "2,monitor:eDP-1" + # "3,monitor:eDP-1" + # "4,monitor:eDP-1" + # "5,monitor:eDP-1" + # ]; + env = [ "XDG_SESSION_TYPE,wayland" "XDG_CURRENT_DESKTOP,Hyprland" @@ -78,7 +91,7 @@ in { "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "ELECTRON_OZONE_PLATFORM_HINT,auto" "GTK_THEME,FlatColor:dark" - "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc" + "GTK2_RC_FILES,/home/dim/.local/share/themes/FlatColor/gtk-2.0/gtkrc" "__GL_GSYNC_ALLOWED,0" "__GL_VRR_ALLOWED,0" "DISABLE_QT5_COMPAT,0" @@ -90,12 +103,12 @@ in { "XDG_SESSION_TYPE,wayland" "SDL_VIDEODRIVER,wayland" "CLUTTER_BACKEND,wayland" - "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU + # "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU ]; cursor = { no_hardware_cursors = true; - default_monitor = "eDP-2"; + default_monitor = "eDP-1"; }; general = { @@ -108,13 +121,15 @@ in { }; decoration = { + blur = { enabled = if blur then "true" else "false"; }; + shadow = { + enabled = true; + range = 20; + render_power = 3; + }; active_opacity = active-opacity; inactive_opacity = inactive-opacity; rounding = rounding; - drop_shadow = true; - shadow_range = 20; - shadow_render_power = 3; - blur = { enabled = if blur then "true" else "false"; }; }; master = { @@ -142,9 +157,9 @@ in { input = { kb_layout = keyboardLayout; - kb_options = "caps:escape"; + # kb_options = "caps:escape"; follow_mouse = 1; - sensitivity = 0.5; + sensitivity = 0; repeat_delay = 300; repeat_rate = 50; numlock_by_default = true; @@ -154,7 +169,6 @@ in { clickfinger_behavior = true; }; }; - }; }; systemd.user.targets.hyprland-session.Unit.Wants = diff --git a/home/system/hyprland/windowrule.nix b/home/system/hyprland/windowrule.nix new file mode 100644 index 0000000..62e2fb8 --- /dev/null +++ b/home/system/hyprland/windowrule.nix @@ -0,0 +1,47 @@ +{ pkgs, ... }: { + wayland.windowManager.hyprland.settings = { + windowrulev2 = [ + "workspace 2, class:^(emacs)$" + "workspace 3, class:^(kitty)$" + "workspace 9, class:^(org.qutebrowser.qutebrowser)$" + "workspace 9, title:^(Chromium)$" + "fullscreen, class:^(wlogout)$" + "float, class:^(Zotero)$" + "float, class:^(firefox)$,title:^(Certificate for )*$" + "float, class:^(firefox)$,title:^(.*Firefox — Sharing Indicator.*)$" + "float, class:^(firefox)$,title:^(.*Presensi Mahasiswa.*)$" + "float, class:(firefox),title:^(Extension)(.*)$" + "float, class:^(pcmanfm)$,title:^(Confirm File Replacing)$" + "float, class:^(nemo)$,title:^(Confirm File Replacing)$" + "float, class:^(nm-connection-editor)$" + "float, class:^(.*blueman-manager.*)$" + "size 530 300, class:^(.*blueman-manager.*)$" + "move 100%-w-20 40, class:^(.*blueman-manager.*)$" + "noborder, class:^(.*dg-desktop-portal-.*)$" + "noblur, class:^(.*dg-desktop-portal-.*)$" + "noshadow, class:^(.*dg-desktop-portal-.*)$" + "float, class:^(*.dg-desktop-portal-.*)$" + "pin, class:^(*.dg-desktop-portal-.*)$" + "pin, class:^(gcr-prompter)$" + "float, title:^(Volume Control)$" + "pin, title:^(Volume Control)$" + "size 560 340, title:^(Volume Control)$" + "move 100%-w-30 30, title:^(Volume Control)$" + "float, class:^(spotube)$" + "size 660 700, class:^(spotube)$" + "move 100%-w-20 40, class:^(spotube)$" + "float, title:^(pve - Proxmox Console - Chromium)$" + "float, class:^(thunderbird)$,title:^(Reminders)$" + "float, class:^(thunderbird)$,title:^(Edit Event:)$" + "float, class:^(thunderbird)$,title:^(An error has occurred)$" + "float, class:^(thunar)$,title:^(File Operation Progress)$" + "float, class:^(org.kde.polkit-kde-authentication-agent-1)$" + "size 60% 55%, class:^(nwg-look)$" + "center, class:^(nwg-look)$" + "fullscreen, class:^(cool-retro-term.cool-retro-term)$" + "float, class:^(virt-manager)$,title:^(Virtual Machine Manager)$" + "size 440 220, class:^(virt-manager)$,title:^(Virtual Machine Manager)$" + "center, class:^(virt-manager)$,title:^(Virtual Machine Manager)$" + ]; + }; +} diff --git a/home/system/hyprlock/default.nix b/home/system/hyprlock/default.nix index 8513003..cbfd29f 100644 --- a/home/system/hyprlock/default.nix +++ b/home/system/hyprlock/default.nix @@ -2,7 +2,7 @@ { config, ... }: let foreground = "rgba(216, 222, 233, 0.70)"; - imageStr = toString config.stylix.image; + imageStr = "screenshow"; # toString config.stylix.image; font = config.stylix.fonts.serif.name; in { programs.hyprlock = { @@ -14,76 +14,76 @@ in { disable_loading_bar = false; }; - # BACKGROUND - background = { - monitor = ""; - path = imageStr; - blur_passes = 0; - contrast = 0.8916; - brightness = 0.7172; - vibrancy = 0.1696; - vibrancy_darkness = 0.0; - }; - - label = [ - { - # Day-Month-Date - monitor = ""; - text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"''; - color = foreground; - font_size = 28; - font_family = font + " Bold"; - position = "0, 490"; - halign = "center"; - valign = "center"; - } - # Time - { - monitor = ""; - text = ''cmd[update:1000] echo "$(date +"%I:%M")"''; - color = foreground; - font_size = 160; - font_family = "steelfish outline regular"; - position = "0, 370"; - halign = "center"; - valign = "center"; - } - # USER - { - monitor = ""; - text = " $USER"; - color = foreground; - outline_thickness = 2; - dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = true; - font_size = 18; - font_family = font + " Bold"; - position = "0, -180"; - halign = "center"; - valign = "center"; - } - ]; - - # INPUT FIELD - input-field = [{ - monitor = ""; - size = "300, 60"; - outline_thickness = 2; - dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = true; - outer_color = "rgba(255, 255, 255, 0)"; - inner_color = "rgba(255, 255, 255, 0.1)"; - font_color = foreground; - fade_on_empty = false; - font_family = font + " Bold"; - placeholder_text = "🔒 Enter Password"; - hide_input = false; - position = "0, -250"; - halign = "center"; - valign = "center"; - }]; + # # BACKGROUND + # background = { + # monitor = ""; + # path = imageStr; + # blur_passes = 0; + # contrast = 0.8916; + # brightness = 0.7172; + # vibrancy = 0.1696; + # vibrancy_darkness = 0.0; + # }; + # + # label = [ + # { + # # Day-Month-Date + # monitor = ""; + # text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"''; + # color = foreground; + # font_size = 28; + # font_family = font + " Bold"; + # position = "0, 490"; + # halign = "center"; + # valign = "center"; + # } + # # Time + # { + # monitor = ""; + # text = ''cmd[update:1000] echo "$(date +"%I:%M")"''; + # color = foreground; + # font_size = 160; + # font_family = "steelfish outline regular"; + # position = "0, 370"; + # halign = "center"; + # valign = "center"; + # } + # # USER + # { + # monitor = ""; + # text = " $USER"; + # color = foreground; + # outline_thickness = 2; + # dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 + # dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 + # dots_center = true; + # font_size = 18; + # font_family = font + " Bold"; + # position = "0, -180"; + # halign = "center"; + # valign = "center"; + # } + # ]; + # + # # INPUT FIELD + # input-field = [{ + # monitor = ""; + # size = "300, 60"; + # outline_thickness = 2; + # dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 + # dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 + # dots_center = true; + # outer_color = "rgba(255, 255, 255, 0)"; + # inner_color = "rgba(255, 255, 255, 0.1)"; + # font_color = foreground; + # fade_on_empty = false; + # font_family = font + " Bold"; + # placeholder_text = "🔒 Enter Password"; + # hide_input = false; + # position = "0, -250"; + # halign = "center"; + # valign = "center"; + # }]; }; }; } diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix index d4e6dca..2dcb1db 100644 --- a/home/system/hyprpanel/default.nix +++ b/home/system/hyprpanel/default.nix @@ -24,13 +24,14 @@ let location = config.var.location; username = config.var.username; + weatherapikey = config.var.weatherapikey; in { wayland.windowManager.hyprland.settings.exec-once = [ "${pkgs.hyprpanel}/bin/hyprpanel" ]; home.packages = with pkgs; [ hyprpanel libnotify ]; - home.file.".cache/ags/hyprpanel/options.json" = { + home.file.".config/hyprpanel/config.json" = { text = # json '' { @@ -101,17 +102,18 @@ in { "theme.bar.buttons.y_margins": "${ if floating && transparent then "0" else "8" }px", - "theme.bar.buttons.spacing": "0.3em", + "theme.bar.buttons.spacing": "0.2em", "theme.bar.buttons.radius": "${ if transparent then toString rounding else toString (rounding - 8) }px", "theme.bar.floating": ${if floating then "true" else "false"}, - "theme.bar.buttons.padding_x": "0.8rem", - "theme.bar.buttons.padding_y": "0.4rem", + "theme.bar.buttons.padding_x": "0.4rem", + "theme.bar.buttons.padding_y": "0.2rem", "theme.bar.buttons.workspaces.hover": "${accent-alt}", "theme.bar.buttons.workspaces.active": "${accent}", - "theme.bar.buttons.workspaces.available": "${background}", + "theme.bar.buttons.workspaces.available": "${accent-alt}", + "theme.bar.margin_top": "${ if position == "top" then toString (gaps-in * 2) else "0" @@ -125,14 +127,14 @@ in { "bar.launcher.icon": "", "theme.bar.transparent": ${if transparent then "true" else "false"}, "bar.workspaces.show_numbered": false, - "bar.workspaces.workspaces": 5, - "bar.workspaces.monitorSpecific": true, + "bar.workspaces.show_icons": false, + "bar.workspaces.workspaces": 9, "bar.workspaces.hideUnoccupied": false, "bar.windowtitle.label": true, "bar.volume.label": false, "bar.network.truncation_size": 12, "bar.bluetooth.label": false, - "bar.clock.format": "%a %b %d %I:%M %p", + "bar.clock.format": "%a %b %d %H:%M", "bar.notifications.show_total": true, "theme.notification.border_radius": "${toString rounding}px", "theme.osd.enable": true, @@ -142,14 +144,14 @@ in { "theme.osd.margins": "0px 0px 0px 10px", "theme.osd.muted_zero": true, "menus.clock.weather.location": "${location}", - "menus.clock.weather.key": "myapikey", + "menus.clock.weather.key": "${weatherapikey}", "menus.clock.weather.unit": "metric", "menus.dashboard.powermenu.avatar.image": "/home/${username}/.profile_picture.png", "menus.dashboard.powermenu.confirmation": false, "menus.dashboard.shortcuts.left.shortcut1.icon": "", - "menus.dashboard.shortcuts.left.shortcut1.command": "qutebrowser", - "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Qutebrowser", + "menus.dashboard.shortcuts.left.shortcut1.command": "firefox", + "menus.dashboard.shortcuts.left.shortcut1.tooltip": "firefox", "menus.dashboard.shortcuts.left.shortcut2.icon": "󰅶", "menus.dashboard.shortcuts.left.shortcut2.command": "caffeine", "menus.dashboard.shortcuts.left.shortcut2.tooltip": "Caffeine", @@ -167,17 +169,17 @@ in { "menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot", "menus.dashboard.directories.left.directory1.label": "󰉍 Downloads", - "menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"", + "menus.dashboard.directories.left.directory1.command": "bash -c \"nemo $HOME/Downloads/\"", "menus.dashboard.directories.left.directory2.label": "󰉏 Pictures", - "menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"", + "menus.dashboard.directories.left.directory2.command": "bash -c \"nemo $HOME/Pictures/\"", "menus.dashboard.directories.left.directory3.label": "󱧶 Documents", - "menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"", + "menus.dashboard.directories.left.directory3.command": "bash -c \"nemo $HOME/Documents/\"", "menus.dashboard.directories.right.directory1.label": "󱂵 Home", - "menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"", + "menus.dashboard.directories.right.directory1.command": "bash -c \"nemo $HOME/\"", "menus.dashboard.directories.right.directory2.label": "󰚝 Projects", - "menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"", + "menus.dashboard.directories.right.directory2.command": "bash -c \"nemo $HOME/dev/\"", "menus.dashboard.directories.right.directory3.label": " Config", - "menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"", + "menus.dashboard.directories.right.directory3.command": "bash -c \"nemo $HOME/.config/\"", "theme.bar.menus.monochrome": true, "wallpaper.enable": false, diff --git a/home/system/mime/default.nix b/home/system/mime/default.nix index 597f658..e026ca4 100644 --- a/home/system/mime/default.nix +++ b/home/system/mime/default.nix @@ -3,8 +3,8 @@ xdg.mimeApps = { enable = true; defaultApplications = { - "text/markdown" = "nvim.desktop"; - "text/plain" = "nvim.desktop"; + "text/markdown" = "neovide.desktop"; + "text/plain" = "neovide.desktop"; "text/x-shellscript" = "nvim.desktop"; "text/x-python" = "nvim.desktop"; "text/x-go" = "nvim.desktop"; @@ -23,11 +23,12 @@ "image/jpeg" = "imv.desktop"; "image/jpg" = "imv.desktop"; "image/webp" = "imv.desktop"; - "image/gif" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; - "application/pdf" = "zathura.desktop"; + "image/gif" = "imv.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "text/html" = "firefox.desktop"; + "text/csv" = "neovide.desktop"; + "application/pdf" = "org.pwmt.zathura.desktop"; }; }; } diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 51682ac..4313a44 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,7 +1,7 @@ { config, ... }: { imports = [ - ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU - ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU + # ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU + # ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU ../../nixos/audio.nix ../../nixos/auto-upgrade.nix @@ -15,6 +15,8 @@ ../../nixos/tuigreet.nix ../../nixos/users.nix ../../nixos/utils.nix + ../../nixos/virtualisation.nix + ../../nixos/tailscale.nix ../../nixos/xdg-portal.nix ../../nixos/variables-config.nix @@ -26,6 +28,11 @@ home-manager.users."${config.var.username}" = import ./home.nix; + # users.users."${config.var.username}".extraGroups = [ "scanner" "lp" ]; + # hardware.sane.enable = true; + + networking.hosts = { "192.168.122.52" = [ "websiteku.lokal" ]; }; + # Don't touch this system.stateVersion = "24.05"; } diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix index 93b95c2..551220b 100644 --- a/hosts/laptop/hardware-configuration.nix +++ b/hosts/laptop/hardware-configuration.nix @@ -1,26 +1,32 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; +{ config, lib, pkgs, modulesPath, ... }: - boot = { - initrd.availableKernelModules = - [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ]; - initrd.kernelModules = [ ]; - kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ ]; - }; +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/6c2487ec-20ff-4ce3-9396-281c2094aba1"; - fsType = "ext4"; - }; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/B4EA-C54F"; - fsType = "vfat"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/3b81e71c-24c3-46f7-9853-b721d5fe40f1"; + fsType = "ext4"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/e35041c3-5cbe-461c-a8cd-2e9cd9b319b5"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/DC41-C56D"; + fsType = "vfat"; + }; swapDevices = [ ]; @@ -29,10 +35,10 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index b461110..5a8d34b 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ pkgs, config, inputs, ... }: { imports = [ ./variables.nix @@ -6,16 +6,19 @@ # Programs ../../home/programs/kitty ../../home/programs/nvim - ../../home/programs/qutebrowser + # ../../home/programs/qutebrowser ../../home/programs/shell + ../../home/programs/pass ../../home/programs/fetch ../../home/programs/git ../../home/programs/spicetify ../../home/programs/nextcloud ../../home/programs/yazi - ../../home/programs/markdown + # ../../home/programs/markdown ../../home/programs/thunar ../../home/programs/lazygit + ../../home/programs/office + ../../home/programs/firefox # Scripts ../../home/scripts # All scripts @@ -35,7 +38,7 @@ ../../home/system/clipman ../../home/system/tofi - ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets + # ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets ]; home = { @@ -44,38 +47,83 @@ packages = with pkgs; [ # Apps - discord # Chat - bitwarden # Password manager - vlc # Video player - blanket # White-noise app + #discord # Chat + # bitwarden # Password manager + mpv # Video player + pcmanfm + xarchiver + #blanket # White-noise app # Dev go nodejs - python3 + (python3.withPackages (ps: + with ps; [ + pip + isort + pyyaml + (buildPythonPackage { + pname = "docker-sdp"; + version = "0.2.15"; + src = pkgs.fetchFromGitHub { + owner = "neuroforgede"; + repo = "docker-stack-deploy"; + rev = "fa8c23d"; + sha256 = "sha256-caff7K4++eQJE/7kbKJb8DgI6aWJdiHBbdV1+46aFMs="; + }; + doCheck = false; + buildInputs = [ pip ]; + }) + ])) jq figlet just + ddev + mkcert # Utils zip + xz unzip + p7zip + unrar optipng pfetch pandoc btop + bottom + iotop + iftop + lsof + sysstat + lm_sensors + ethtool + pciutils + usbutils + wireguard-tools + inetutils + gdu + enchant # Just cool peaclock cbonsai pipes cmatrix - cava + # cava # Backup - vscode - firefox + # zed-editor neovide + inkscape-with-extensions + # gimp-with-plugins + gimp + sqlitebrowser + sqlite + emacs29-pgtk + zotero_7 + chromium + # inputs.zen-browser.packages."${pkgs.system}" ]; # Import my profile picture, used by the hyprpanel dashboard diff --git a/hosts/laptop/profile_picture.png b/hosts/laptop/profile_picture.png index 71c63c9..526b690 100644 Binary files a/hosts/laptop/profile_picture.png and b/hosts/laptop/profile_picture.png differ diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix index fb5d3c7..961dd5f 100644 --- a/hosts/laptop/variables.nix +++ b/hosts/laptop/variables.nix @@ -2,21 +2,29 @@ imports = [ ../../nixos/variables-config.nix ]; config.var = { - hostname = "nixy"; - username = "hadi"; + hostname = "dark"; + username = "dim"; + uid = 1000; + hashedPassword = + "$y$j9T$OqKMt8etf8DgTrZhN9jzy/$biMoM3P.WPZMpk0DAK.QhaHjGOL23pEgxlSvfu9LEPD"; configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory - keyboardLayout = "fr"; + keyboardLayout = "us"; - location = "Paris"; - timeZone = "Europe/Paris"; + location = "Tangerang"; + timeZone = "Asia/Jakarta"; defaultLocale = "en_US.UTF-8"; - extraLocale = "fr_FR.UTF-8"; + extraLocale = "id_ID.UTF-8"; + weatherapikey = "b13ad03a98f04a8ea5620114240412"; git = { - username = "Hadi"; - email = "112569860+anotherhadi@users.noreply.github.com"; + username = "dim"; + email = "dbrw@dark"; + signing = { + key = "D8EDD65BCB54AC8719BE4EBD8D5D880EB08F1544"; + signByDefault = true; + }; }; autoUpgrade = false; diff --git a/nixos/fonts.nix b/nixos/fonts.nix index 9ada424..d56ddbc 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -15,7 +15,11 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-emoji - (nerdfonts.override { fonts = [ "FiraCode" "Meslo" ]; }) + victor-mono + # (nerdfonts.override { fonts = [ "FiraCode" "Meslo" "VictorMono" ]; }) + nerd-fonts.victor-mono + nerd-fonts.fira-code + nerd-fonts.meslo-lg openmoji-color twemoji-color-font inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd diff --git a/nixos/systemd-boot.nix b/nixos/systemd-boot.nix index b426150..7faed65 100644 --- a/nixos/systemd-boot.nix +++ b/nixos/systemd-boot.nix @@ -6,11 +6,12 @@ systemd-boot = { enable = true; consoleMode = "auto"; + configurationLimit = 6; }; }; tmp.cleanOnBoot = true; kernelPackages = - pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc. + pkgs.linuxPackages_zen; # _zen, _hardened, _rt, _rt_latest, etc. # Silent boot kernelParams = [ diff --git a/nixos/tailscale.nix b/nixos/tailscale.nix new file mode 100644 index 0000000..3cc9aac --- /dev/null +++ b/nixos/tailscale.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ tailscale tailscale-systray ]; + services.tailscale.enable = true; +} diff --git a/nixos/tuigreet.nix b/nixos/tuigreet.nix index a8747a4..c077dad 100644 --- a/nixos/tuigreet.nix +++ b/nixos/tuigreet.nix @@ -9,6 +9,7 @@ }; }; }; + security.pam.services.greetd.enableGnomeKeyring = true; environment.systemPackages = with pkgs; [ greetd.tuigreet ]; diff --git a/nixos/users.nix b/nixos/users.nix index a6e1813..a6d2800 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -1,13 +1,26 @@ { config, pkgs, ... }: -let username = config.var.username; +let + username = config.var.username; + hashedPassword = config.var.hashedPassword; + userId = config.var.uid; in { programs.zsh.enable = true; users = { defaultUserShell = pkgs.zsh; users.${username} = { + hashedPassword = "${hashedPassword}"; + uid = userId; isNormalUser = true; description = "${username} account"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ + "networkmanager" + "wheel" + "audio" + "video" + "input" + "docker" + "libvirtd" + ]; }; }; } diff --git a/nixos/utils.nix b/nixos/utils.nix index 40f6e12..3677c86 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -6,14 +6,6 @@ in { networking.hostName = hostname; - services = { - xserver = { - enable = true; - xkb.layout = keyboardLayout; - xkb.variant = ""; - }; - gnome.gnome-keyring.enable = true; - }; console.keyMap = keyboardLayout; environment.variables = { @@ -30,6 +22,7 @@ in { upower.enable = true; power-profiles-daemon.enable = true; udisks2.enable = true; + devmon.enable = true; }; # Faster rebuilding @@ -42,6 +35,18 @@ in { nixos.enable = false; }; + # Better caps2esc + services.interception-tools = { + enable = true; + udevmonConfig = '' + - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.caps2esc}/bin/caps2esc | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE" + DEVICE: + EVENTS: + EV_KEY: [KEY_CAPSLOCK, KEY_ESC] + ''; + plugins = [ pkgs.interception-tools-plugins.caps2esc ]; + }; + environment.systemPackages = with pkgs; [ fd bc @@ -50,6 +55,10 @@ in { xdg-utils wget curl + interception-tools + nix-tree + stevenblack-blocklist + wlay ]; services.logind.extraConfig = '' diff --git a/nixos/virtualisation.nix b/nixos/virtualisation.nix new file mode 100644 index 0000000..0978573 --- /dev/null +++ b/nixos/virtualisation.nix @@ -0,0 +1,6 @@ +{ pkgs, config, inputs, ... }: { + virtualisation.docker.enable = true; + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + environment.systemPackages = with pkgs; [ virtiofsd ]; +} diff --git a/themes/stylix/nixy.nix b/themes/stylix/nixy.nix index 512eadc..b7c4ac0 100644 --- a/themes/stylix/nixy.nix +++ b/themes/stylix/nixy.nix @@ -1,6 +1,7 @@ { pkgs, inputs, ... }: { stylix = { enable = true; + # targets.hyprlock.enable = false; # Edited catppuccin base16Scheme = { @@ -30,14 +31,16 @@ }; cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; + package = pkgs.phinger-cursors; + name = "phinger-cursors-light"; + # package = pkgs.banana-cursor; + # name = "Banana"; size = 24; }; fonts = { monospace = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; sansSerif = { @@ -53,15 +56,15 @@ name = "Noto Color Emoji"; }; sizes = { - applications = 13; - desktop = 13; - popups = 13; - terminal = 13; + applications = 11; + desktop = 12; + popups = 12; + terminal = 11; }; }; polarity = "dark"; - image = inputs.nixy-wallpapers + "/wallpapers/black-oil.png"; + image = inputs.nixy-wallpapers + "/wallpapers/dark.png"; }; } diff --git a/themes/var/nixy.nix b/themes/var/nixy.nix index 5524135..12428a4 100644 --- a/themes/var/nixy.nix +++ b/themes/var/nixy.nix @@ -1,11 +1,11 @@ { - rounding = 15; - gaps-in = 10; - gaps-out = 10 * 2; + rounding = 5; + gaps-in = 5; + gaps-out = 5 * 2; active-opacity = 1; inactive-opacity = 0.89; blur = true; - border-size = 3; + border-size = 2; animation-speed = "medium"; # "fast" | "medium" | "slow" fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"