diff --git a/.gitignore b/.gitignore index 674502c..1749a01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .sops.yaml +old/ diff --git a/flake.lock b/flake.lock index 5dd631f..30ddae2 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1752383772, - "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=", + "lastModified": 1757547408, + "narHash": "sha256-w5NHaakGx6JwaSITGKhfITHc9hhzlhzu7ob6M4YJrZU=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "875c694d7f0ec2020d7511264907a1f0e3262931", + "rev": "08e109e74a8b8d2d965cdd79eb175d2d68dc0214", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1753216019, - "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "be166e11d86ba4186db93e10c54a141058bdce49", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -126,71 +126,19 @@ "type": "github" } }, - "blueprint": { - "inputs": { - "nixpkgs": [ - "eleakxir", - "bun2nix", - "nixpkgs" - ], - "systems": [ - "eleakxir", - "bun2nix", - "systems" - ] - }, - "locked": { - "lastModified": 1744632722, - "narHash": "sha256-0chvqUV1Kzf8BMQ7MsH3CeicJEb2HeCpwliS77FGyfc=", - "owner": "numtide", - "repo": "blueprint", - "rev": "49bbd5d072b577072f4a1d07d4b0621ecce768af", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, - "bun2nix": { - "inputs": { - "blueprint": "blueprint", - "nixpkgs": [ - "eleakxir", - "nixpkgs" - ], - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1750682174, - "narHash": "sha256-rUpcATQ0LiY8IYRndqTlPUhF4YGJH3lM2aMOs5vBDGM=", - "owner": "baileyluTCD", - "repo": "bun2nix", - "rev": "85d692d68a5345d868d3bb1158b953d2996d70f7", - "type": "github" - }, - "original": { - "owner": "baileyluTCD", - "repo": "bun2nix", - "type": "github" - } - }, "eleakxir": { "inputs": { - "bun2nix": "bun2nix", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1753821712, - "narHash": "sha256-oT0rZnlGw8KxLtHdYHVPbeUf2+NiRRE+TAV6KR54Me0=", + "lastModified": 1756842568, + "narHash": "sha256-sNtjvv7UEPRUAjhUg7WFlH4Q+KYVivEtk5L7nHGz6jQ=", "owner": "anotherhadi", "repo": "eleakxir-temp", - "rev": "ca8e08325122714b547f953df61db78c1cfb9147", + "rev": "91bb6364af9d0aa74c476e6ebf1ad36007a5f8f1", "type": "github" }, "original": { @@ -202,11 +150,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -287,11 +235,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -308,11 +256,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -323,7 +271,25 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -401,11 +367,11 @@ ] }, "locked": { - "lastModified": 1755914636, - "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", + "lastModified": 1757650187, + "narHash": "sha256-OrythrqccPKtuVt0mj26rr83Qo3Ljb4ZmwLdPGjzjMU=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", + "rev": "9eab59f3e71ea3a725e4817d8dcf0da0824ad19d", "type": "github" }, "original": { @@ -501,11 +467,11 @@ ] }, "locked": { - "lastModified": 1754305013, - "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", + "lastModified": 1757542864, + "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", + "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", "type": "github" }, "original": { @@ -526,15 +492,15 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1755945900, - "narHash": "sha256-poNagCmT0zlCzaZYkGXQ3TNQAeoz2/n35yrpdm6bdfU=", + "lastModified": 1757620350, + "narHash": "sha256-MWiCqZS1OBvC3VLe/8Tb9bm42T7IPt4cku15vQBCsjM=", "ref": "refs/heads/main", - "rev": "d9cf1cb78ef3dfd82f03965aab70792bbe25c9e2", - "revCount": 6390, + "rev": "797bfe905e78ab04b03cd114e7330ff2e2ac76f9", + "revCount": 6423, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -625,11 +591,11 @@ ] }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1757508108, + "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", "type": "github" }, "original": { @@ -654,11 +620,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -674,11 +640,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755569534, - "narHash": "sha256-ukXfV1cAsxoar0IVEO2/s3qnVEZpZf0wvqE3PIESobw=", + "lastModified": 1757563845, + "narHash": "sha256-pz69vejsrB+7N+jyKxZcckTjJtzw9BCAIRzHNbFUIp0=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "6385f2e15df908e0c13bed800f4b091300e5b981", + "rev": "0a961ce8a959c521f41546af7f355e04adee5503", "type": "github" }, "original": { @@ -692,7 +658,7 @@ "hyprland": [ "hyprland" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1754887838, @@ -720,11 +686,11 @@ ] }, "locked": { - "lastModified": 1754481650, - "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -745,11 +711,11 @@ ] }, "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -760,11 +726,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -800,11 +766,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1755912028, - "narHash": "sha256-lWLnhlFXiLzFqDQutSSJ5Du40g7sREPB5avz1EkC5yk=", + "lastModified": 1757639838, + "narHash": "sha256-TgCwkiL6zYSxtUB0tEewHKjlBzOeklZMEbpVFL3swfI=", "owner": "kaylorben", "repo": "nixcord", - "rev": "c33bf0d790e931547786359db541849c2fba2d95", + "rev": "e7d4120a3e7c5126587f23380c21e252d1a26d1e", "type": "github" }, "original": { @@ -815,11 +781,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -831,11 +797,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { @@ -862,11 +828,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { @@ -877,6 +843,22 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -894,11 +876,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -958,11 +940,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -974,11 +956,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1755049066, - "narHash": "sha256-ANrc15FSoOAdNbfKHxqEJjZLftIwIsenJGRb/04K41s=", + "lastModified": 1756696532, + "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e45f8f193029378d0aaee5431ba098dc80054e9a", + "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", "type": "github" }, "original": { @@ -1006,11 +988,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { @@ -1032,11 +1014,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -1051,14 +1033,14 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "nixpkgs": "nixpkgs_7", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1755463179, - "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", + "lastModified": 1757397598, + "narHash": "sha256-v/FANUOWyeWlWCD61HDLSNO9nHnQALAtvLf2VtE1+WU=", "owner": "notashelf", "repo": "nvf", - "rev": "03833118267ad32226b014b360692bdce9d6e082", + "rev": "c7944a48a3c61cb3ca08ac2dc8b8de124d15dcb8", "type": "github" }, "original": { @@ -1089,11 +1071,11 @@ ] }, "locked": { - "lastModified": 1754416808, - "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -1119,6 +1101,7 @@ "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", + "vicinae": "vicinae", "zen-browser": "zen-browser" } }, @@ -1127,11 +1110,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1744205741, - "narHash": "sha256-VGhK5TxSkkmpuVNfrDTqSyRaW8wCA+ZnSijOReawDrg=", + "lastModified": 1757503843, + "narHash": "sha256-1PlbMltB06fMQVIaiHILA/mtTz1JOhV3dS/HbOXsfRw=", "owner": "anotherhadi", "repo": "search-nixos-api", - "rev": "d7c8afcf3726bfc0d4f94bcc0a766f2beb74d572", + "rev": "e93bd98a13496673f4f2cd248f590c48b05ff8a7", "type": "github" }, "original": { @@ -1167,7 +1150,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=", + "narHash": "sha256-GeODpgLiozMn0lTug420BD6stpt1ik/kycFSquwXs6o=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -1215,7 +1198,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=", + "narHash": "sha256-jvXAmlHzrbYYMvc4Vk4bLW+RYe3XuQJ2qSXcasa72EU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -1229,11 +1212,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1757503115, + "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", "type": "github" }, "original": { @@ -1247,14 +1230,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_6" }, "locked": { - "lastModified": 1755613017, - "narHash": "sha256-QVT/L4QQr77IOq8z2L9atYIOZn78fwLfwDgbY/L+k50=", + "lastModified": 1757219159, + "narHash": "sha256-bpiaovTLPeScpnOdqfgq3oy4B/sD2Wnb5EdQZZM2tCY=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "df3f3ff6db7e1f553288592496f6293d32164d8a", + "rev": "404130798716449bbd02e5f1b54272be55218644", "type": "github" }, "original": { @@ -1274,7 +1257,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_10", "nur": "nur", - "systems": "systems_8", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1282,11 +1265,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755708361, - "narHash": "sha256-RmqBx2EamhIk0WVhQSNb8iehaVhilO7D0YAnMoFPqJQ=", + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "owner": "danth", "repo": "stylix", - "rev": "2355da455d7188228aaf20ac16ea9386e5aa6f0c", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "type": "github" }, "original": { @@ -1312,35 +1295,20 @@ }, "systems_2": { "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" } }, "systems_3": { - "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_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1355,7 +1323,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1370,6 +1338,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_6": { "locked": { "lastModified": 1681028828, @@ -1451,11 +1434,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -1467,11 +1450,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -1483,11 +1466,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -1496,25 +1479,22 @@ "type": "github" } }, - "treefmt-nix": { + "vicinae": { "inputs": { - "nixpkgs": [ - "eleakxir", - "bun2nix", - "nixpkgs" - ] + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "lastModified": 1757667341, + "narHash": "sha256-HwDVE6X6/Vq0FWJQzByUOa/4ub2IfcXbxGEQ1/Zk+bw=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "0da9c871e1b697d7551687afd4a2bec01d32d288", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "vicinaehq", + "repo": "vicinae", "type": "github" } }, @@ -1582,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1753633878, - "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { @@ -1598,14 +1578,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1755922982, - "narHash": "sha256-YMchUKtaIhICzwwiAP/j6G+KaqRA8xSnGV2dfdVXoHw=", + "lastModified": 1757654247, + "narHash": "sha256-Nz0EWw4N05bFZITsBOvQHk2rQ3n+IdPeqIg4R2jQuGM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "25f56c0f5b813312f38078418b2229ada41c4bcc", + "rev": "f2e90503e6b847b7b0bd2628d1d15fac1113fb9a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b518749..246d638 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ sops-nix.url = "github:Mic92/sops-nix"; nixarr.url = "github:rasmus-kirk/nixarr"; nvf.url = "github:notashelf/nvf"; + vicinae.url = "github:vicinaehq/vicinae"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/programs/zen/default.nix b/home/programs/zen/default.nix deleted file mode 100644 index cd88b95..0000000 --- a/home/programs/zen/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Zen is a minimalistic web browser. -{inputs, ...}: { - imports = [ - inputs.zen-browser.homeModules.beta - ]; - - programs.zen-browser = { - enable = true; - policies = { - DisableAppUpdate = true; - DisableTelemetry = true; - - AutofillAddressesEnabled = false; - AutoFillCreditCardEnabled = false; - DisablePocket = true; - DisableProfileImport = true; - DisableSetDesktopBackground = true; - DontCheckDefaultBrowser = true; - HomepageURL = "https://start.hadi.diy"; - StartPage = "homepage"; - NewTabPage = true; - OfferToSaveLogins = false; - # find more options here: https://mozilla.github.io/policy-templates/ - }; - }; -} diff --git a/home/system/clipman/default.nix b/home/system/clipman/default.nix deleted file mode 100644 index 6f57902..0000000 --- a/home/system/clipman/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -# Clipman allows you to save and retrieve clipboard history. -{pkgs, ...}: let - clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" '' - clipman clear --all - ''; - - clipboard = pkgs.writeShellScriptBin "clipboard" '' - clipman pick --tool=wofi - ''; -in { - wayland.windowManager.hyprland.settings.exec-once = ["${clipboard-clear}" "wl-paste -t text --watch clipman store"]; - home.packages = with pkgs; [clipman clipboard clipboard-clear]; - services.clipman.enable = true; -} diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 4db4e28..9dd3cb1 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -20,7 +20,7 @@ in { ./bindings.nix ./polkitagent.nix ./keyboard-backlight.nix # CHANGEME: This is for omen laptop only - ./hyprspace.nix + # ./hyprspace.nix # FIXME: Broken for now ]; home.packages = with pkgs; [ @@ -138,7 +138,7 @@ in { mfact = 0.5; }; - gestures = {workspace_swipe = true;}; + gesture = "3, horizontal, workspace"; misc = { vfr = true; diff --git a/home/system/vicinae/default.nix b/home/system/vicinae/default.nix new file mode 100644 index 0000000..3cc5997 --- /dev/null +++ b/home/system/vicinae/default.nix @@ -0,0 +1,10 @@ +{inputs, ...}: { + imports = [inputs.vicinae.homeManagerModules.default]; + + services.vicinae = { + enable = true; + autoStart = true; + }; + + wayland.windowManager.hyprland.settings.exec-once = ["systemctl enable --now --user vicinae.service"]; +} diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix deleted file mode 100644 index c302f0e..0000000 --- a/home/system/waybar/default.nix +++ /dev/null @@ -1,334 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - ./swaync.nix - ./swayosd.nix - ]; - - wayland.windowManager.hyprland.settings.exec-once = ["waybar" "${pkgs.networkmanagerapplet}/bin/nm-applet" "${pkgs.blueman}/bin/blueman-applet"]; - - programs.waybar = { - enable = true; - systemd.enable = true; - settings.mainBar = { - spacing = 5; - margin-bottom = -11; - - modules-left = ["hyprland/workspaces" "hyprland/window"]; - modules-center = ["cava"]; - modules-right = [ - "group/extras" - "pulseaudio" - "battery" - "clock" - "custom/notification" - ]; - - battery = { - states = {critical = 20;}; - format = "{icon}"; - format-icons = { - default = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; - charging = ["󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"]; - }; - format-full = "󱟢"; - on-click = "powermode-toggle"; - on-click-right = ''${pkgs.swayosd}/bin/swayosd-client --custom-message="Powermode is set to $(powerprofilesctl get)" --custom-icon="emblem-default"''; - }; - - "custom/vpn" = { - interval = 3; - format = "{}"; - exec = '' - if ip add show | ${pkgs.ripgrep}/bin/rg -qF "proton"; then - echo '{"text":"󰖂 VPN On","class":"vpn-on"}' - else - echo '{"text":"󰖂 VPN Off","class":"vpn-off"}' - fi - ''; - return-type = "json"; - max-length = "100"; - on-click = "protonvpn-app"; - }; - - cava = { - framerate = 240; - bars = 20; - bar_delimiter = 0; - stereo = true; - input_delay = 4; - sleep_timer = 2; - hide_on_silence = true; - lower_cutoff_freq = 100; - higher_cutoff_freq = 8000; - format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"]; - }; - - clock = { - timezone = "Europe/Paris"; - tooltip-format = "{calendar}"; - calendar = { - mode = "month"; - format = { - today = "{}"; - days = "{}"; - weekdays = "{}"; - months = "{}"; - }; - }; - interval = 60; - max-length = 25; - on-click = "brave --profile-directory=Default --app-id=ojibjkjikcpjonjjngfkegflhmffeemk"; # Proton Calendar - }; - - "custom/arrow-toggle" = { - format = " {icon} "; - format-icons = {default = "";}; - tooltip = false; - }; - - "custom/notification" = { - tooltip = false; - format = "{icon}"; - format-icons = { - notification = ""; - none = ""; - dnd-notification = ""; - dnd-none = ""; - inhibited-notification = ""; - inhibited-none = ""; - dnd-inhibited-notification = ""; - dnd-inhibited-none = ""; - }; - return-type = "json"; - exec-if = "which swaync-client"; - exec = "swaync-client -swb"; - on-click = "swaync-client -t"; - escape = true; - }; - - "group/extras" = { - orientation = "inherit"; - drawer = { - transition-duration = 300; - transitition-left-to-right = false; - }; - modules = ["custom/arrow-toggle" "tray" "custom/vpn"]; - }; - - "hyprland/window" = { - format = "{}"; - rewrite = {"^(.*?)[[:space:]]*[-—|].*?$" = "$1";}; - icon = true; - icon-size = 20; - max-length = 30; - }; - - "hyprland/workspaces" = { - format = "{icon}"; - format-active = " {icon} "; - all-outputs = true; - }; - - network = { - format = "{ifname}"; - format-wifi = "{icon} {essid}"; - format-ethernet = "󰈀 Ethernet"; - format-disconnected = " 󰤭 Disconnected "; - tooltip-format = "{ipaddr}  {bandwidthUpBits}  {bandwidthDownBits}"; - format-linked = "󰈁 {ifname} (No IP)"; - format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"]; - on-click = "kitty --class nmtui-float-term nmtui"; - }; - - pulseaudio = { - format = "{icon}"; - format-muted = "󰖁"; - format-icons = ["󰕿" "󰖀" "󰕾"]; - on-click = "sound-toggle"; - scroll-step = 1; - }; - - tray = {spacing = 10;}; - }; - - style = '' - * { - font-family: ${config.stylix.fonts.serif.name}, sans-serif; - } - - window#waybar { - background-color: transparent; - } - - #workspaces{ - background-color: transparent; - margin-top: 10px; - margin-bottom: 10px; - margin-right: 10px; - margin-left: 25px; - } - #workspaces button{ - background-color: #${config.lib.stylix.colors.base05}; - color: #${config.lib.stylix.colors.base00}; - box-shadow: rgba(0, 0, 0, 0.116) 2 2 5 2px; - border-radius: 15px; - margin-right: 10px; - padding-top: 4px; - padding-bottom: 2px; - padding-right: 10px; - font-weight: bolder; - } - - .modules-left #workspaces button { - border-bottom: 0px; - } - - #workspaces button.active{ - padding-right: 20px; - box-shadow: rgba(0, 0, 0, 0.288) 2 2 5 2px; - text-shadow: 0 0 5px rgba(0, 0, 0, 0.377); - padding-left: 20px; - background: #${config.lib.stylix.colors.base0D}; - color: #${config.lib.stylix.colors.base05}; - } - - .modules-left #workspaces button.focused, - .modules-left #workspaces button.active { - border-bottom: 0px; - } - - #window { - color: #${config.theme.textColorOnWallpaper}; - } - - #clock, - #battery, - #network, - #pulseaudio, - #tray, - #cava, - #custom-notification, - #custom-vpn, - #mpd { - padding: 0 10px; - border-radius: 15px; - background-color: #${config.lib.stylix.colors.base05}; - color: #${config.lib.stylix.colors.base00}; - box-shadow: rgba(0, 0, 0, 0.116) 2 2 5 2px; - margin-top: 10px; - margin-bottom: 10px; - margin-right: 10px; - } - - #cava{ - background: #${config.lib.stylix.colors.base0D}; - color: #${config.lib.stylix.colors.base05}; - text-shadow: 0 0 5px rgba(0, 0, 0, 0.377); - font-weight: 900; - padding-top: 0px; - margin-left: 10px; - } - - #pulseaudio, - #pulseaudio.muted{ - color: #${config.lib.stylix.colors.base0D}; - font-size: 20px; - font-weight: bolder; - padding-left: 14px; - padding-right: 15px; - border-radius: 15px; - } - - #custom-notification { - background: #${config.lib.stylix.colors.base0D}; - color: #${config.lib.stylix.colors.base05}; - font-size: 20px; - font-weight: bolder; - padding-left: 20px; - padding-right: 24px; - } - - #battery { - color: #86a381; - font-size: 17px; - padding-left: 15px; - padding-right: 15px; - border-radius: 15px; - } - - @keyframes blink { - to { - background-color: #f9e2af; - color:#96804e; - } - } - - #custom-vpn.vpn-on { - color: #2ecc71; - } - - #custom-vpn.vpn-off { - color: #e74c3c; - } - - #battery.critical:not(.charging) { - background-color: #f38ba8; - color:#bf5673; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; - } - - #network{ - color:#000; - } - - #network.disabled{ - background-color: #45475a; - } - - #network.disconnected{ - background: rgb(243,139,168); - color: #fff; - font-weight: bolder; - } - - #network.linked, #network.wifi{ - background-color: #a6e3a1 ; - } - - #network.ethernet{ - background-color:#f9e2af ; - } - - #tray { - background-color: #1c1816; - } - - #tray > .passive { - -gtk-icon-effect: dim; - } - - #custom-arrow-toggle { - font-size: 16px; - color: #516079; - opacity: 1; - transition: opacity 0.2s ease-in-out; - } - - #extras:hover #custom-arrow-toggle { - opacity: 0; - } - - #extras:hover { - background-color: transparent; - } - ''; - }; -} diff --git a/home/system/waybar/swaync.nix b/home/system/waybar/swaync.nix deleted file mode 100644 index 4cf7ecb..0000000 --- a/home/system/waybar/swaync.nix +++ /dev/null @@ -1,157 +0,0 @@ -{pkgs, ...}: { - services.swaync = { - enable = true; - settings = { - control-center-layer = "top"; - control-center-width = 400; - control-center-height = 400; - control-center-margin-top = 10; - control-center-margin-bottom = 250; - control-center-margin-right = 10; - - notification-window-width = 380; - notification-icon-size = 48; - notification-body-image-height = 80; - notification-body-image-width = 160; - notification-2fa-action = true; - notification-grouping = false; - - image-visibility = "when-available"; - transition-time = 100; - - widgets = ["title" "buttons-grid" "dnd" "inhibitors" "mpris" "notifications"]; - - widget-config = { - inhibitors = { - text = "Inhibitors"; - button-text = "Clear All"; - clear-all-button = true; - }; - title = { - text = "Notifications"; - clear-all-button = true; - button-text = "Clear All"; - }; - dnd = {text = "Do Not Disturb";}; - mpris = { - image-size = 64; - blur = true; - }; - buttons-grid = { - actions = [ - { - label = "󰐥"; - command = "systemctl poweroff"; - } - { - label = "󰜉"; - command = "systemctl reboot"; - } - { - label = "󰒲"; - command = "systemctl suspend"; - } - { - label = "󰌾"; - command = "lock"; - } - { - label = "󰍃"; - command = "${pkgs.hyprland}/bin/hyprctl dispatch exit"; - } - { - label = "󰕾"; - command = "${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle"; - } - { - label = "󰍬"; - command = "${pkgs.swayosd}/bin/swayosd-client --input-volume mute-toggle"; - } - { - label = "󰂯"; - command = "${pkgs.blueman}/bin/blueman-manager"; - } - { - label = "󰹑"; - command = "screenshot region"; - } - { - label = ""; - command = "${pkgs.kooha}/bin/kooha"; - } - { - label = ""; - command = "caffeine"; - } - { - label = "󰋱"; - command = "hyprfocus-toggle"; - } - ]; - }; - }; - }; - style = '' - .notification, - .notification.low, - .notification.normal, - .notification.critical, - .notification-default-action, - .notification-default-action:hover, - .notification-default-action:active, - .notification-row:focus, - .notification-group:focus, - .notification-group.collapsed .notification-row .notification, - .control-center .notification-row .notification-background, - .control-center .notification-row .notification-background:hover, - .control-center .notification-row .notification-background:active { - background: transparent; - border: none; - outline: none; - box-shadow: none; - margin: 0; - padding: 0; - } - - .control-center { - background: @base00; - border: 1px solid @base0D; - color: @base05; - padding: 5px; - border-radius: 15px; - } - - .widget-body, .widget-mpris, .widget-dnd, .widget-inhibitors { - margin: 4px 5px; - } - - .notification-content { - border-radius: 12px; - padding: 10px; - margin: 8px; - } - - .notification-title { - font-weight: bold; - color: @base05; - } - - .close-button { - margin: 6px; - padding: 3px; - border-radius: 100px; - background-color: transparent; - border: 1px solid transparent; - } - - .close-button:hover { - background-color: @base0C; - } - - .close-button:active { - background-color: @base0C; - color: @base00; - } - ''; - }; -} diff --git a/home/system/waybar/swayosd.nix b/home/system/waybar/swayosd.nix deleted file mode 100644 index 2575a0c..0000000 --- a/home/system/waybar/swayosd.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - config, - pkgs, - ... -}: let - accent = "#${config.lib.stylix.colors.base0D}"; - background = "#${config.lib.stylix.colors.base00}"; - foreground = "#${config.lib.stylix.colors.base05}"; - borderSize = config.theme.border-size; - nerdFont = config.stylix.fonts.sansSerif.name; - - theme = pkgs.writeTextFile { - name = "swayosd-css"; - text = '' - window#osd { - padding: 12px 18px; - border-radius: 999px; - border: solid ${toString borderSize}px ${accent}; - background: alpha(${background}, 0.99); - } - - #container { - margin: 0px; - } - - image { - font-family: "${nerdFont}"; - font-size: 14px; - color: ${foreground}; - } - - label { - color: ${foreground}; - } - - progressbar:disabled, - image:disabled { - opacity: 0.5; - } - - progressbar { - min-width: 150px; - min-height: 5px; - border-radius: 999px; - background: transparent; - border: none; - } - - trough { - min-height: inherit; - border-radius: inherit; - border: none; - background: alpha(${accent},0.3); - } - - progress { - min-height: inherit; - border-radius: inherit; - border: none; - background: ${accent}; - } - ''; - }; -in { - wayland.windowManager.hyprland.settings = { - exec-once = ["swayosd-server"]; - bind = [",XF86AudioMute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle"]; - bindl = [ - ",XF86MonBrightnessUp, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness raise 5%+" - ",XF86MonBrightnessDown, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness lower 5%-" - "$mod,F2,exec, ${pkgs.swayosd}/bin/swayosd-client --brightness 100" - "$mod,F3,exec, ${pkgs.swayosd}/bin/swayosd-client --brightness 0" - ",XF86AudioPlay, exec, ${pkgs.swayosd}/bin/swayosd-client --playerctl play-pause" - ",XF86AudioNext, exec, ${pkgs.swayosd}/bin/swayosd-client --playerctl next" - ",XF86AudioPrev, exec, ${pkgs.swayosd}/bin/swayosd-client --playerctl previous" - ]; - bindle = [ - ",XF86AudioRaiseVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume +2 --max-volume=255" - ",XF86AudioLowerVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume -2" - ]; - bindr = [ - "CAPS,Caps_Lock,exec,${pkgs.swayosd}/bin/swayosd-client --caps-lock" - ",Scroll_Lock,exec,${pkgs.swayosd}/bin/swayosd-client --scroll-lock" - ",Num_Lock,exec,${pkgs.swayosd}/bin/swayosd-client --num-lock" - ]; - }; - - services.swayosd = { - enable = true; - stylePath = theme; - }; -} diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix deleted file mode 100644 index f2d35f9..0000000 --- a/home/system/wofi/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -# Wofi is a launcher for Wayland, inspired by rofi. -{ - config, - pkgs, - lib, - ... -}: let - accent = "#${config.lib.stylix.colors.base0D}"; - background = "#${config.lib.stylix.colors.base00}"; - background-alt = "#${config.lib.stylix.colors.base01}"; - foreground = "#${config.lib.stylix.colors.base05}"; - font = config.stylix.fonts.serif.name; - rounding = config.theme.rounding; - font-size = config.stylix.fonts.sizes.popups; -in { - home.packages = with pkgs; [wofi-emoji]; - - programs.wofi = { - enable = true; - - settings = { - allow_markup = true; - width = 650; - show = "drun"; - prompt = "Apps"; - normal_window = true; - height = 325; - allow_images = true; - image_size = 24; - insensitive = true; - hide_scroll = true; - no_actions = true; - gtk_dark = true; - }; - - style = - lib.mkForce - # css - '' - * { - font-family: "${font}"; - font-weight: 600; - font-size: ${toString font-size}px; - } - - #window { - background-color: ${background}; - color: ${foreground}; - border-radius: ${toString rounding}px; - } - - #outer-box { - padding: 20px; - } - - #input { - background-color: ${background-alt}; - border: 0px solid ${accent}; - color: ${foreground}; - padding: 8px 12px; - } - - #scroll { - margin-top: 20px; - } - - #inner-box {} - - #img { - padding-right: 8px; - } - - #text { - color: ${foreground}; - } - - #text:selected { - color: ${foreground}; - } - - #entry { - padding: 6px; - } - - #entry:selected { - background-color: ${accent}; - color: ${foreground}; - } - - #unselected {} - - #selected {} - - #input, - #entry:selected { - border-radius: ${toString rounding}px; - } - ''; - }; -} diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 571f37f..1108ba5 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -17,7 +17,6 @@ ../../home/programs/spicetify ../../home/programs/thunar ../../home/programs/lazygit - ../../home/programs/zen ../../home/programs/discord ../../home/programs/tailscale @@ -27,15 +26,14 @@ # System (Desktop environment like stuff) ../../home/system/hyprland ../../home/system/hyprlock - # ../../home/system/hyprpanel - ../../home/system/waybar + ../../home/system/hyprpanel ../../home/system/hyprpaper ../../home/system/wofi ../../home/system/zathura ../../home/system/mime ../../home/system/udiskie + ../../home/system/vicinae # ../../home/system/hypridle - # ../../home/system/clipman ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets ]; diff --git a/nixos/utils.nix b/nixos/utils.nix index 723f228..5b4e26e 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -124,9 +124,4 @@ in { # don't ask for password for wheel group sudo.wheelNeedsPassword = false; }; - - services.logind.extraConfig = '' - # don’t shutdown when power button is short-pressed - HandlePowerKey=ignore - ''; }