Compare commits

..

No commits in common. "ac1df9256b2f348b1445bc73c3db12d143d73f76" and "0e285b0878e18a9c51f821b903e7227fc58e076c" have entirely different histories.

17 changed files with 307 additions and 331 deletions

View File

@ -47,7 +47,7 @@
- [ ] sddm theme
- [ ] add new themes, and polish old ones (lain, rei, and psychopass)
- [ ] ghostty configuration add
- [x] change type of loading configuration using all .nix files in directory instead of manually specifing them
- [ ] change type of loading configuration using all .nix files in directory instead of manually specifing them
- [ ] update my home page and create new web
- [ ] fix kde theme in stylix

View File

@ -42,11 +42,11 @@
]
},
"locked": {
"lastModified": 1745357003,
"narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=",
"lastModified": 1744289235,
"narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "a19cf76ee1a15c1c12083fa372747ce46387289f",
"rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
"type": "github"
},
"original": {
@ -84,11 +84,11 @@
]
},
"locked": {
"lastModified": 1746268454,
"narHash": "sha256-cUrVjYzFn1zzR6m2hc02CdjlSPIADtAVo+7BE7qq0ZA=",
"lastModified": 1744578060,
"narHash": "sha256-ApX5u3aXtmthemPSnZls/oxvqpNR7C9t4Ut57MTvces=",
"owner": "AdnanHodzic",
"repo": "auto-cpufreq",
"rev": "3ffbee11df46921c9a60f118d3450a7e460f7b13",
"rev": "b6493edc7033beac216b8836af4994e56c6682f4",
"type": "github"
},
"original": {
@ -102,11 +102,11 @@
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1745523430,
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
"lastModified": 1732200724,
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github"
},
"original": {
@ -172,11 +172,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1746681993,
"narHash": "sha256-w3mYEUnbBjMC01c6ZixEa6LIqyiTCU9eF3vv9YTesWs=",
"lastModified": 1744974023,
"narHash": "sha256-7P4gZOxx5hmHNW++vtsWILxuPO1RB+8kyKDDQ7Ij10Q=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "1f0519b8b0d044ac3699b52e60586cbebbb7b6cb",
"rev": "d53de206d64dd4581b5d5bbc7dcb2e8c5a1d836a",
"type": "gitlab"
},
"original": {
@ -189,11 +189,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1744642301,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
"lastModified": 1743774811,
"narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
"rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
"type": "github"
},
"original": {
@ -252,11 +252,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@ -436,11 +436,11 @@
]
},
"locked": {
"lastModified": 1746703400,
"narHash": "sha256-mSqWQsJYMJBI3+X3opqaUqeNsGQxVdaNL5iUF7a6p50=",
"lastModified": 1745128386,
"narHash": "sha256-xnNxL9lZC5Ez8AxTgHZZu8pYSNM34+5GD5jGSs8Vq4M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "50894120e8ac792a5d3046d23e4e4c4ef32cf09c",
"rev": "f98314bb064cf8f8446c44afbadaaad2505875a7",
"type": "github"
},
"original": {
@ -478,11 +478,11 @@
]
},
"locked": {
"lastModified": 1746369725,
"narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
"lastModified": 1743869639,
"narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
"rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
"type": "github"
},
"original": {
@ -528,11 +528,11 @@
]
},
"locked": {
"lastModified": 1745948457,
"narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=",
"lastModified": 1742215578,
"narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "ac903e80b33ba6a88df83d02232483d99f327573",
"rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
"type": "github"
},
"original": {
@ -557,11 +557,11 @@
]
},
"locked": {
"lastModified": 1745015490,
"narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
"lastModified": 1743953322,
"narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "60754910946b4e2dc1377b967b7156cb989c5873",
"rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
"type": "github"
},
"original": {
@ -588,11 +588,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1746655655,
"narHash": "sha256-hPMsUK1r3Cxx8KoCZVaYJH5ThDT5VRUDMMFmyVei1Eo=",
"lastModified": 1745115741,
"narHash": "sha256-LuTzOibcl/qy2VTuDQMXXEpI2+CQZnykQAXItmo8ciM=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "22b12e3013adf66b462b174688f82bd53ba8e721",
"rev": "867bc860895ef4de7030c6a615aa10e5bfa1e133",
"type": "github"
},
"original": {
@ -681,11 +681,11 @@
]
},
"locked": {
"lastModified": 1745951494,
"narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=",
"lastModified": 1739048983,
"narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e",
"rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
"type": "github"
},
"original": {
@ -710,11 +710,11 @@
]
},
"locked": {
"lastModified": 1746637914,
"narHash": "sha256-YRYeG+Zp7dQKYBtyOv15vXzLfguinmUm6LNzq5cCEkc=",
"lastModified": 1744468525,
"narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "e863ebcee936dd57f360cca4fec0220da19c5b2d",
"rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
"type": "github"
},
"original": {
@ -731,11 +731,11 @@
]
},
"locked": {
"lastModified": 1745885816,
"narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=",
"lastModified": 1744513377,
"narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=",
"owner": "Jas-SinghFSU",
"repo": "HyprPanel",
"rev": "0c82ce9704c8063be8d8f60443071c91943eb68c",
"rev": "42943b3def85d8787d703778951944c8e791202b",
"type": "github"
},
"original": {
@ -756,11 +756,11 @@
]
},
"locked": {
"lastModified": 1746635225,
"narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=",
"lastModified": 1743950287,
"narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "674ea57373f08b7609ce93baff131117a0dfe70d",
"rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
"type": "github"
},
"original": {
@ -816,11 +816,11 @@
},
"mnw": {
"locked": {
"lastModified": 1746338991,
"narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
"lastModified": 1742255973,
"narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
"rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d",
"type": "github"
},
"original": {
@ -887,11 +887,11 @@
]
},
"locked": {
"lastModified": 1746437902,
"narHash": "sha256-cAYSTvh+nKl/DQDS0+MlepFRQxsAGt7bRSwvoRyNJuw=",
"lastModified": 1744621833,
"narHash": "sha256-II6a32kRc+KbLhU/jS8EbuXYt1PNCvsRvuBw2becgQM=",
"owner": "Mic92",
"repo": "nix-ld",
"rev": "3262ac5b572f0f45a97212afda927208f3a463f1",
"rev": "9a3812797e25def1d4aed62b517606b7b93989dc",
"type": "github"
},
"original": {
@ -903,11 +903,11 @@
"nix-mineral": {
"flake": false,
"locked": {
"lastModified": 1746652674,
"narHash": "sha256-xtj//XV7AAQQXE8z/blNPGFeo+NCTB324azk+cDdCpQ=",
"lastModified": 1744818705,
"narHash": "sha256-lm3/OiH1dYELELJqs47CSPXYbHe0GmwQOYtxBwnl92c=",
"owner": "cynicsketch",
"repo": "nix-mineral",
"rev": "196ab5bf2369cffba466a9c2ee0a2c53bf52426a",
"rev": "2d66655c52edb0465eef951ac6eb40e797ae69c3",
"type": "github"
},
"original": {
@ -954,11 +954,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1746582033,
"narHash": "sha256-6ceLz0KhobCrfXHbmV038/NDD61jS5qEEvI1EZDOUog=",
"lastModified": 1745545091,
"narHash": "sha256-300Y7RoU/wefVDmit6b89HvhBk6h8l1t9VVDo0diEK4=",
"owner": "kaylorben",
"repo": "nixcord",
"rev": "6f6181a8e5019c338dc5f6d22ac7e18b2700e898",
"rev": "f5dd48df2e39d2b2cf9b5bad20997e88704f6a5e",
"type": "github"
},
"original": {
@ -969,17 +969,17 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1746558947,
"narHash": "sha256-2+NKk8SkhLUCBGiXdeA8phJy6ZPmIKO1em2I2Bg+Duc=",
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c5cc311133c2e87cbf776df8b5297022c3c42e08",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "c5cc311133c2e87cbf776df8b5297022c3c42e08",
"type": "github"
}
},
@ -1033,11 +1033,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1743296961,
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"lastModified": 1740877520,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
"type": "github"
},
"original": {
@ -1048,11 +1048,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1746557022,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
"lastModified": 1744440957,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
@ -1064,11 +1064,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1746152631,
"narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=",
"lastModified": 1743076231,
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3",
"rev": "6c5963357f3c1c840201eda129a99d455074db04",
"type": "github"
},
"original": {
@ -1142,11 +1142,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1746056780,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
"lastModified": 1743884191,
"narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
"rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
"type": "github"
},
"original": {
@ -1165,11 +1165,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1746554311,
"narHash": "sha256-gZTKsH5440Yu4R5lPpjkeyyMl8mX+T4iiNKlZL3izBk=",
"lastModified": 1743613645,
"narHash": "sha256-QnwkxbdE5raf5enqZQAY+QZ+awisTD2YCReO0iL4CGg=",
"owner": "notashelf",
"repo": "nvf",
"rev": "99f1200c8db9295e556255e49175a6d2a5c02fbd",
"rev": "dafe978ffa5277519de010cdfca8225c52c9d2aa",
"type": "github"
},
"original": {
@ -1211,11 +1211,11 @@
]
},
"locked": {
"lastModified": 1746537231,
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
@ -1295,11 +1295,11 @@
"nvf": "nvf"
},
"locked": {
"lastModified": 1746559576,
"narHash": "sha256-fQkzfRu8AZIcy6YLDAuPeI/keHHbXslCCtzwpsucGl8=",
"lastModified": 1743618481,
"narHash": "sha256-mnaJPjMmwcBnPXP8AkLt7AETnm7VLXHEajnGrIUJt88=",
"ref": "refs/heads/main",
"rev": "2a87a19abb3cae823649426b41cef2d4fcb5febb",
"revCount": 11,
"rev": "cc32d846b797b7a637125422d5754bf804d570ab",
"revCount": 9,
"type": "git",
"url": "https://git.foglar.tech/foglar/neovim-config"
},
@ -1315,11 +1315,11 @@
]
},
"locked": {
"lastModified": 1746485181,
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
"lastModified": 1744669848,
"narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
"rev": "61154300d945f0b147b30d24ddcafa159148026a",
"type": "github"
},
"original": {
@ -1336,11 +1336,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1746551108,
"narHash": "sha256-sTghs3HNf/hwPXJb5Ii8G53PhQNE1ayWgY9IOYSHAOY=",
"lastModified": 1745073200,
"narHash": "sha256-9BdXrdvR4ewdRMbvTRKABrJfuhcH1xxin2OR89MhMNY=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "133e882f1266f1bb580bea64b9082d423fa005ba",
"rev": "c9093f2d516c5b62461844c06bf362db8e230ff9",
"type": "github"
},
"original": {
@ -1373,11 +1373,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1746575057,
"narHash": "sha256-kBlPMNZXPzDG4HUmdqYpvjvVYkoDdDrVvO14cKgHaiU=",
"lastModified": 1744910471,
"narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
"owner": "danth",
"repo": "stylix",
"rev": "685deb9bae2e4c463e953ff39bd54fd448feaf05",
"rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
"type": "github"
},
"original": {
@ -1512,11 +1512,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1744974599,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
"lastModified": 1742851696,
"narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
"rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
"type": "github"
},
"original": {
@ -1528,11 +1528,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1745111349,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
"lastModified": 1743296873,
"narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
"rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
"type": "github"
},
"original": {
@ -1628,11 +1628,11 @@
]
},
"locked": {
"lastModified": 1745871725,
"narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=",
"lastModified": 1744644585,
"narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e",
"rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
"type": "github"
},
"original": {
@ -1649,11 +1649,11 @@
]
},
"locked": {
"lastModified": 1746685734,
"narHash": "sha256-bA6UKUmA/byQjO5MuyOT62Z4rg36DW4kt7QIqEQTDB0=",
"lastModified": 1745111733,
"narHash": "sha256-FVsS0LcSYwt4qiw1inlI8F9dc7PZaRaWAr4vqvvnekg=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "4327bc9352789c7e28bda04696a38a08f10dd716",
"rev": "67df3e64a216db8ac3c8bc669143af090bf4e6ad",
"type": "github"
},
"original": {

View File

@ -12,17 +12,17 @@
shell = "zsh"; # bash, zsh
terminal = "kitty"; # kitty, alacritty, gnome-terminal
browser = "librewolf"; # firefox, librewolf, qutebrowser, zen
browser = "zen"; # firefox, librewolf, qutebrowser, zen
editor = "neovim"; # neovim, vscode
# List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
theme = "catppuccin-mocha"; # catppuccin-mocha, lain-blue, one-dark, purple-dawn
theme = "catppuccin-mocha"; # catppuccin-mocha, tokyo-night-dark, one-dark, purple-dawn
background =
if userSettings.theme == "catppuccin-mocha"
then "aurora_borealis.png"
else if "evangelion-blood" == userSettings.theme
then "evangelion.jpg"
else if "lain-blue" == userSettings.theme
else if "tokyo-night-dark" == userSettings.theme
then "lain.png"
else if "purple-dawn" == userSettings.theme
then "purpledawn.png"
@ -120,7 +120,7 @@
};
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/c5cc311133c2e87cbf776df8b5297022c3c42e08";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
home-manager = {

View File

@ -18,12 +18,13 @@
# Home manager
home-manager = {
extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;};
backupFileExtension = "backup";
backupFileExtension = "bk";
users = {
${userSettings.username} = import ./home.nix;
};
sharedModules = [
inputs.sops-nix.homeManagerModules.sops
inputs.plasma-manager.homeManagerModules.plasma-manager
];
};
@ -102,6 +103,8 @@
++ (
with pkgs; [
gcc
corefonts
uutils-coreutils-noprefix
]
);

View File

@ -48,7 +48,7 @@
ide = {
python.enable = true;
go.enable = true;
csharp.enable = false;
csharp.enable = true;
cpp.enable = false;
web.enable = true;
};
@ -82,6 +82,8 @@
enableBashIntegration = true;
nix-direnv.enable = true;
};
home-manager.enable = true;
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

View File

@ -75,7 +75,7 @@
bat.enable = true;
btop.enable = true;
fzf.enable = true;
yazi.enable = false;
yazi.enable = true;
direnv = {
enable = true;
enableZshIntegration = true;

View File

@ -31,8 +31,6 @@
wl-clipboard
cliphist
bc
pavucontrol
nautilus
#swww
@ -231,5 +229,7 @@
#(writeShellScriptBin "windowpin")
])
++ (with pkgs-stable; [
pavucontrol
nautilus
]);
}

View File

@ -565,12 +565,10 @@ in {
if [[ ! -f "$FILE" ]]; then
touch "$FILE"
run_eww
killall waybar
else
${EWW} --config "$CFG" close \
background profile system clock uptime music apps logout sleep reboot poweroff folders bluetooth
rm "$FILE"
waybar &
fi
'')

View File

@ -25,8 +25,6 @@
config = lib.mkIf config.desktop.hyprland.enable {
desktop.hyprland = {
waybar.enable = lib.mkDefault true;
hyprpanel.enable = lib.mkDefault false;
rofi = {
enable = lib.mkDefault true;
clipboard.enable = lib.mkDefault true;
@ -54,14 +52,14 @@
services.network-manager-applet.enable = true;
services.playerctld.enable = true;
#services.dunst.enable = true;
services.swaync = {
enable = true;
settings = {
fit-to-screen = false;
control-center-height = 500;
control-center-width = 250;
};
};
#services.swaync = {
# enable = true;
# settings = {
# fit-to-screen = false;
# control-center-height = 500;
# control-center-width = 250;
# };
#};
# Home session variables
home.sessionVariables = {

View File

@ -50,7 +50,7 @@
echo "$battery_percentage% $battery_icon"
'')
(writeShellScriptBin "maxbat" ''
(writeShellScriptBin "battery-hyprlock-legacy" ''
show_avg=0
show_charging=0
show_plugged=0

View File

@ -1,22 +1,15 @@
{
inputs,
pkgs,
lib,
config,
...
}: {
imports = [inputs.hyprpanel.homeManagerModules.hyprpanel];
options = {
desktop.hyprland.hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
};
config = lib.mkIf config.desktop.hyprland.hyprpanel.enable {
programs.hyprpanel = {
enable = false;
#systemd.enable = true;
enable = true;
systemd.enable = true;
#overwrite.enable = true;
hyprland.enable = false;
hyprland.enable = true;
settings = {
};
};
@ -24,5 +17,4 @@
home.packages = with pkgs; [
hyprpanel
];
};
}

View File

@ -21,12 +21,14 @@
mainBar = {
layer = "bottom";
position = "top";
height = 20;
margin-top = 2;
height = 31;
exclusive = true;
passthrough = false;
gtk-layer-shell = true;
reload_style_on_change = true;
output = [
"eDP-1"
];
modules-left = ["custom/padd" "custom/l_end" "cpu" "memory" "custom/r_end" "custom/l_end" "idle_inhibitor" "clock" "custom/r_end" "" "custom/padd"];
modules-center = ["custom/padd" "" "custom/l_end" "hyprland/workspaces" "hyprland/window" "custom/r_end" "custom/padd"];
modules-right = ["custom/padd" "custom/l_end" "backlight" "network" "bluetooth" "pulseaudio" "pulseaudio#microphone" "custom/r_end" "custom/l_end" "tray" "battery" "custom/r_end" "custom/l_end" "custom/notification" "custom/cliphist" "custom/power" "custom/r_end" "custom/padd"];
@ -87,10 +89,13 @@
"bluetooth" = {
format = "";
#rotate": ${r_deg},
format-disabled = "";
format-connected = " {num_connections}";
format-connected-battery = "{icon} {num_connections}";
# "format-connected-battery" = "{icon} {device_alias}-{device_battery_percentage}%";
format-icons = ["󰥇" "󰤾" "󰤿" "󰥀" "󰥁" "󰥂" "󰥃" "󰥄" "󰥅" "󰥆" "󰥈"];
#"format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device If this config option is not defined or none of the devices in the list are connected, it will fall back to showing the last connected device.
tooltip-format = "{controller_alias}\n{num_connections} connected";
tooltip-format-connected = "{controller_alias}\n{num_connections} connected\n\n{device_enumerate}";
tooltip-format-enumerate-connected = "{device_alias}";
@ -135,22 +140,31 @@
};
"battery" = {
interval = 1;
states = {
okay = 60;
good = 95;
warning = 30;
critical = 15;
supercritical = 9;
critical = 20;
};
format = "{icon}{capacity}%";
format = "{icon} {capacity}%";
rotate = 0;
format-charging = "{icon}󱐋{capacity}%";
format-plugged = "{capacity}%";
format-alt = "{icon}";
format-icons = ["󰂃" "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
format-charging = " {capacity}%";
format-plugged = " {capacity}%";
format-alt = "{time} {icon}";
format-icons = [
"󰂎"
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
};
"backlight" = {
device = "intel_backlight";
rotate = 0;
@ -296,59 +310,106 @@
style = ''
${
if (userSettings.theme=="catppuccin-mocha") then "
@define-color main-text rgba(170, 170, 200, 0.9);
@define-color part-bg rgba(0, 0, 40, 0.5);
@define-color ws-fg rgba(200, 200, 200, 1);
@define-color ws-active-fg rgba(100, 255, 200, 1);
@define-color ws-active-bg rgba(100, 100, 100, 0.2);
@define-color ws-hover-fg rgba(255, 255, 255, 1);
@define-color ws-hover-bg rgba(150, 150, 150, 0.3);"
else if userSettings.theme=="lain-blue"
then "
@define-color main-text rgba(20, 150, 225, 0.9);
@define-color part-bg rgba(0, 40, 120, 0.5);
@define-color ws-fg rgba(200, 200, 200, 1);
@define-color ws-active-fg rgba(235, 235, 235, 1);
@define-color ws-active-bg rgba(100, 100, 100, 0.2);
@define-color ws-hover-fg rgba(255, 255, 255, 1);
@define-color ws-hover-bg rgba(150, 150, 150, 0.3);"
else if userSettings.theme=="evangelion-blood"
then "
@define-color main-text rgba(250, 85, 85, 0.9);
@define-color part-bg rgba(40, 0, 0, 0.5);
@define-color ws-fg rgba(200, 200, 200, 1);
@define-color ws-active-fg rgba(235, 235, 235, 1);
@define-color ws-active-bg rgba(200, 150, 150, 0.3);
@define-color ws-hover-fg rgba(255, 255, 255, 1);
@define-color ws-hover-bg rgba(250, 150, 150, 0.4);"
else if userSettings.theme=="purple-dawn"
then "
@define-color main-text rgba(200, 100, 200, 0.9);
@define-color part-bg rgba(30, 0, 40, 0.5);
@define-color ws-fg rgba(200, 100, 200, 1);
@define-color ws-active-fg rgba(255, 150, 200, 1);
@define-color ws-active-bg rgba(150, 100, 150, 0.4);
@define-color ws-hover-fg rgba(255, 175, 225, 1);
@define-color ws-hover-bg rgba(180, 120, 180, 0.5);"
else "
@define-color main-text rgba(200, 200, 200, 1);
@define-color part-bg rgba(0, 0, 0, 1);
@define-color ws-fg rgba(200, 200, 200, 1);
@define-color ws-active-fg rgba(235, 235, 235, 1);
@define-color ws-active-bg rgba(100, 100, 100, 0.4);
@define-color ws-hover-fg rgba(255, 255, 255, 1);
@define-color ws-hover-bg rgba(150, 150, 150, 0.5);"
if (userSettings.theme == "catppuccin-mocha")
then "@define-color bar-bg rgba(0, 0, 0, 0);
@define-color main-bg #11111b;
@define-color main-fg #cdd6f4;
@define-color wb-act-bg #a6adc8;
@define-color wb-act-fg #313244;
@define-color wb-hvr-bg #f5c2e7;
@define-color wb-hvr-fg #313;"
else if userSettings.theme == "evangelion-blood"
then "@define-color bar-bg rgba(0, 0, 0, 0);"
else ""
}
* {
border: none;
border-radius: 0px;
font-family: "JetBrainsMono Nerd Font";
font-size: 12px;
min-height: 0;
font-weight: bold;
font-size: 10px;
min-height: 10px;
}
window#waybar {
background: @bar-bg;
}
tooltip {
background: @main-bg;
color: @main-fg;
border-radius: 7px;
border-width: 0px;
}
#workspaces button {
box-shadow: none;
text-shadow: none;
padding: 0px;
border-radius: 9px;
margin-top: 3px;
margin-bottom: 3px;
margin-left: 0px;
padding-left: 3px;
padding-right: 3px;
margin-right: 0px;
color: @main-fg;
animation: ws_normal 20s ease-in-out 1;
}
#workspaces button.active {
background: @wb-act-bg;
color: @wb-act-fg;
margin-left: 3px;
padding-left: 12px;
padding-right: 12px;
margin-right: 3px;
animation: ws_active 20s ease-in-out 1;
transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
}
#workspaces button:hover {
background: @wb-hvr-bg;
color: @wb-hvr-fg;
animation: ws_hover 20s ease-in-out 1;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#taskbar button {
box-shadow: none;
text-shadow: none;
padding: 0px;
border-radius: 9px;
margin-top: 3px;
margin-bottom: 3px;
margin-left: 0px;
padding-left: 3px;
padding-right: 3px;
margin-right: 0px;
color: @wb-color;
animation: tb_normal 20s ease-in-out 1;
}
#taskbar button.active {
background: @wb-act-bg;
color: @wb-act-color;
margin-left: 3px;
padding-left: 12px;
padding-right: 12px;
margin-right: 3px;
animation: tb_active 20s ease-in-out 1;
transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
}
#taskbar button:hover {
background: @wb-hvr-bg;
color: @wb-hvr-color;
animation: tb_hover 20s ease-in-out 1;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
#tray menu * {
min-height: 16px;
}
#tray menu separator {
min-height: 10px;
}
#backlight,
#battery,
#bluetooth,
@ -372,69 +433,33 @@
#tray,
#custom-updates,
#custom-wallchange,
#workspaces,
#custom-wbar,
#window,
#workspaces,
#custom-l_end,
#custom-r_end,
#custom-sl_end,
#custom-sr_end,
#custom-rl_end,
#custom-rr_end {
color: @main-text;
background: @part-bg;
color: @main-fg;
background: @main-bg;
opacity: 1;
margin: 4px 0px 4px 0px;
padding-left: 4px;
padding-right: 4px;
margin: 0;
border: 0;
}
window#waybar {
background: transparent;
}
#workspaces button {
box-shadow: none;
text-shadow: none;
#workspaces,
#taskbar {
padding: 0px;
border-radius: 9px;
margin-top: 3px;
margin-bottom: 3px;
margin-left: 0px;
padding-left: 3px;
padding-right: 3px;
margin-right: 0px;
color: @ws-fg;
}
#workspaces button.active {
background: @ws-active-bg;
color: @ws-active-fg;
margin-left: 3px;
padding-left: 12px;
padding-right: 12px;
margin-right: 3px;
}
#workspaces button:hover {
background: @ws-hover-bg;
color: @ws-hover-fg;
}
tooltip {
color: @main-text;
background: @part-bg;
border-radius: 7px;
border-width: 0px;
}
#custom-r_end {
border-radius: 0px 20px 20px 0px;
border-radius: 0px 21px 21px 0px;
margin-right: 9px;
padding-right: 3px;
}
#custom-l_end {
border-radius: 20px 0px 0px 20px;
border-radius: 21px 0px 0px 21px;
margin-left: 9px;
padding-left: 3px;
}
@ -444,61 +469,21 @@
margin-right: 9px;
padding-right: 3px;
}
#custom-sl_end {
border-radius: 0px;
margin-left: 9px;
padding-left: 3px;
}
#custom-rr_end {
border-radius: 0px 10px 10px 0px;
border-radius: 0px 7px 7px 0px;
margin-right: 9px;
padding-right: 3px;
}
#custom-rl_end {
border-radius: 10px 0px 0px 10px;
border-radius: 7px 0px 0px 7px;
margin-left: 9px;
padding-left: 3px;
}
#battery {
color: rgba(0, 150, 0, 0.9);
padding-left: 0;
}
#battery.okay {
color: rgba(150, 150, 0, 0.9);
}
#battery.warning {
color: rgba(250, 100, 0, 0.9);
}
#battery.critical {
color: rgba(250, 0, 0, 0.9);
}
@keyframes supercritical {
from {
background: rgba(100, 0, 0, 1);
}
to {
background: rgba(250, 220, 0, 1);
}
}
#battery.supercritical:not(.charging) {
color: #000;
background: rgba(100, 0, 0, 1);
animation: supercritical 0.2s infinite alternate;
}
#battery.charging {
color: rgba(0, 150, 0, 0.9);
}
'';
};
};

View File

@ -9,7 +9,9 @@
lib.mkEnableOption "Enable Vencord";
};
imports = [inputs.nixcord.homeModules.nixcord];
imports = [
inputs.nixcord.homeManagerModules.nixcord
];
config = lib.mkIf config.program.vencord.enable {
services.arrpc.enable = true;

View File

@ -38,7 +38,7 @@
waybar = {
enable = false;
enable = true;
enableCenterBackColors = false;
enableLeftBackColors = false;
enableRightBackColors = false;

View File

@ -21,7 +21,7 @@
settings = {
"$schema" = "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json";
"logo" =
if userSettings.theme == "evangelion-blood" || userSettings.theme == "lain-blue"
if userSettings.theme == "evangelion-blood" || userSettings.theme == "tokyo-night-dark"
then {
"source" = "/home/shinya/.config/fastfetch/logo.png";
"width" =
@ -33,10 +33,7 @@
then 18
else 19;
"padding" = {
"top" =
if userSettings.theme == "evangelion-blood" || userSettings.theme == "lain-blue"
then 1
else 0;
"top" = if userSettings.theme == "evangelion-blood" then 1 else 0;
};
}
else {

View File

@ -14,7 +14,6 @@
noto-fonts-emoji
nerd-fonts.jetbrains-mono
monaspace
corefonts
];
};
}

View File

@ -54,7 +54,7 @@
base0E = "f0d0d0";
base0F = "f0e0e0";
}
else if userSettings.theme == "lain-blue"
else if userSettings.theme == "tokyo-night-dark"
then {
base00 = "011d33";
base01 = "1a4a6e";
@ -138,13 +138,13 @@
logo =
if userSettings.theme == "evangelion-blood"
then ../../../config/nerv.png
else if (userSettings.theme == "lain-blue")
else if (userSettings.theme == "tokyo-night-dark")
then ../../../config/copeland.png
else if (userSettings.theme == "purple-dawn")
then ../../../config/ram.png
else ../../../config/mars.png;
logoAnimated =
if "evangelion-blood" == userSettings.theme || "lain-blue" == userSettings.theme || "purple-dawn" == userSettings.theme
if "evangelion-blood" == userSettings.theme || "tokyo-night-dark" == userSettings.theme || "purple-dawn" == userSettings.theme
then false
else true;
};