From 21bff544f320a0b19ebc09acd057cb3bb60e366b Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Fri, 27 Mar 2026 23:54:05 +0100 Subject: [PATCH] First build; Too many bugs... --- .gitignore | 5 +- flake.lock | 806 ++++++++++++++++++---- flake.nix | 10 +- home/default.nix | 31 +- home/desktop/default.nix | 3 +- home/desktop/gtk.nix | 8 +- home/desktop/hyprland/default.nix | 52 +- home/desktop/hyprland/portal.nix | 1 - home/desktop/rofi/default.nix | 2 +- home/desktop/waybar/configs/style.css | 176 ++++- home/desktop/waybar/configs/style.min.css | 1 + home/desktop/waybar/configs/style.src.css | 173 ----- home/desktop/waybar/default.nix | 11 +- home/desktop/waybar/dual.nix | 2 +- home/git.nix | 16 +- home/neovim/conform.nix | 5 +- home/neovim/default.nix | 4 +- home/neovim/lsp.nix | 2 +- home/nixcord.nix | 7 +- home/packages.nix | 2 +- home/python.nix | 15 +- home/shell.nix | 18 +- home/spicetify.nix | 13 +- hosts/cyper-desktop/configuration.nix | 2 + nixos/audio.nix | 5 +- nixos/default.nix | 3 +- nixos/webcam.nix | 2 +- 27 files changed, 983 insertions(+), 392 deletions(-) create mode 100644 home/desktop/waybar/configs/style.min.css delete mode 100644 home/desktop/waybar/configs/style.src.css diff --git a/.gitignore b/.gitignore index 1cd791b..63c92c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -result/ + + + +result/* diff --git a/flake.lock b/flake.lock index 5538a67..c0546c8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,50 +1,82 @@ { "nodes": { - "brew-src": { - "flake": false, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, "locked": { - "lastModified": 1749511373, - "narHash": "sha256-7u1TdHQaUCzzgf/n8T3bQosuYXyNBEPU/3WQQqozE5o=", - "owner": "Homebrew", - "repo": "brew", - "rev": "7b4ef99fed96966269ee35994407fa4c06097a4d", + "lastModified": 1774211390, + "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", "type": "github" }, "original": { - "owner": "Homebrew", - "ref": "4.5.6", - "repo": "brew", + "owner": "hyprwm", + "repo": "aquamarine", "type": "github" } }, - "darwin": { + "catppuccin": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", + "lastModified": 1774616169, + "narHash": "sha256-fP4bU3SOH5sefSl6EagqULFs+bXoo3h3VLQCCyJplo4=", + "owner": "catppuccin", + "repo": "nix", + "rev": "e616c61cd9f7b05b32af266bc005fa266860dacf", "type": "github" }, "original": { - "owner": "lnl7", - "repo": "nix-darwin", + "owner": "catppuccin", + "repo": "nix", "type": "github" } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -56,11 +88,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -77,11 +109,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -90,6 +122,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -97,11 +151,11 @@ ] }, "locked": { - "lastModified": 1752093218, - "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", + "lastModified": 1774626137, + "narHash": "sha256-1WelwA45Xm4glTG8R9IX9jYeFKDG2HbR79jAauLezUE=", "owner": "nix-community", "repo": "home-manager", - "rev": "206ed3c71418b52e176f16f58805c96e84555320", + "rev": "9df3a639007cfe0d074433f7fc225ea94f877d08", "type": "github" }, "original": { @@ -111,36 +165,447 @@ "type": "github" } }, - "nix-homebrew": { + "hyprcursor": { "inputs": { - "brew-src": "brew-src" + "hyprlang": "hyprlang", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" }, "locked": { - "lastModified": 1749952250, - "narHash": "sha256-V2ix0knpdJXirQ+4pjbnggjdSALTsFWGIP/NDpaQkdU=", - "owner": "zhaofengli", - "repo": "nix-homebrew", - "rev": "37126f06f4890f019af3d7606ce5d30a457afcd0", + "lastModified": 1772461003, + "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", "type": "github" }, "original": { - "owner": "zhaofengli", - "repo": "nix-homebrew", + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprcursor_2": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772461003, + "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor_2", + "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_2", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1774620536, + "narHash": "sha256-VJQKCMBM+4ZREFlECae/ZpigoHvECRusQ207K/JydCU=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "2c4852e31f1cc974164fdd1bf383a67c26cafe44", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772467975, + "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771865848, + "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": [ + "hyprcursor", + "nixpkgs" + ], + "systems": [ + "hyprcursor", + "systems" + ] + }, + "locked": { + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprcursor", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprcursor", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1774211405, + "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "cb4e152dc72095a2af422956c6b689590572231a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1773074819, + "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "f68afd0e73687598cc2774804fedad76693046f0", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", "type": "github" } }, "nixcord": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1766917993, - "narHash": "sha256-Hf5T3qQX4hgGQITFSCqsIorMo0FxcI4TsygB1iruUeU=", + "lastModified": 1774628878, + "narHash": "sha256-21dB8FCl49FLyQhdEvzlK/J0AnLP0HdRGk03BzOANiY=", "owner": "kaylorben", "repo": "nixcord", - "rev": "63871baa87897231803d617eab908261caa5907c", + "rev": "387c582a215bc7e97a952b764f7eb326fed7ef91", "type": "github" }, "original": { @@ -151,11 +616,42 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766201043, - "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-nixcord": { + "locked": { + "lastModified": 1773222311, + "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", + "rev": "0590cd39f728e129122770c029970378a79d076a", "type": "github" }, "original": { @@ -165,81 +661,20 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1766653575, - "narHash": "sha256-TPgxCS7+hWc4kPhzkU5dD2M5UuPhLuuaMNZ/IpwKQvI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c1016e6acd16ad96053116d0d3043029c9e2649", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems" + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" }, "locked": { - "lastModified": 1766604046, - "narHash": "sha256-9Wvp2G/z0YYMn7oeN/E90pRtXJxQCo7EZrKKkNpwru4=", + "lastModified": 1774612943, + "narHash": "sha256-hRhq5cpDyBm/ZQyuzI+/YzQEVt35d/M6ko7ADfodw9s=", "owner": "nix-community", "repo": "nixvim", - "rev": "48b23bdae0770d86e1d0cb8ed830a0cb58810333", + "rev": "2b9f8e1d659d1c7664e1b85ab1620c219672696c", "type": "github" }, "original": { @@ -248,28 +683,76 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { - "darwin": "darwin", + "catppuccin": "catppuccin", "home-manager": "home-manager", - "nix-homebrew": "nix-homebrew", + "hyprcursor": "hyprcursor", + "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixvim": "nixvim", + "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774303811, + "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", - "systems": "systems_2" + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4" }, "locked": { - "lastModified": 1766897356, - "narHash": "sha256-oKp9luuuXuMoUwpGUKUdt0G7lZGovcyOEI3guG0rNCw=", + "lastModified": 1774157037, + "narHash": "sha256-kJpgEIF0sxMW0vx543m3AwyqptJOxPoOJY1DfJ4jQas=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "6b49c4094e93629af2fcf789e0897450f57e2551", + "rev": "2e2234c2932a3aff5f845cda33cb1972a9e889aa", "type": "github" }, "original": { @@ -280,20 +763,35 @@ }, "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" } }, "systems_2": { + "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_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -307,6 +805,62 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1773601989, + "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7ff6abf..efa03d6 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # declarative Configs home-manager = { - url = "github:nix-community/home-manager/main"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -74,14 +74,18 @@ { # $ nixos-rebuild switch --flake .# nixosConfigurations."cyper-desktop" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; modules = [ + { nixpkgs.hostPlatform = "x86_64-linux"; } ./nixos ./hosts/cyper-desktop/configuration.nix inputs.home-manager.nixosModules.home-manager + { + home-manager.extraSpecialArgs = { inherit inputs primaryUser self; }; + home-manager.users.${primaryUser} = import ./home; + } inputs.sops-nix.nixosModules.sops ]; - specialArgs = { inherit inputs primaryUser; }; + specialArgs = { inherit inputs primaryUser self; }; }; }; diff --git a/home/default.nix b/home/default.nix index ce62b29..de75a1e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,6 +2,7 @@ config, primaryUser, inputs, + self, ... }: { @@ -12,21 +13,19 @@ ./shell.nix ./xdg.nix - inputs.nixvim.homeModules.nixvim ./neovim ./python.nix - inputs.nixcord.homeModules.nixcord ./nixcord.nix - inputs.spicetify-nix.homeManagerModules.default ./spicetify.nix ./floorp.nix ./obsidian.nix - inputs.catppuccin.homeManagerModules.catppuccin ./desktop + + inputs.sops-nix.homeManagerModules.sops ]; catppuccin = { @@ -36,21 +35,39 @@ home = { username = primaryUser; - stateVersion = "25.11"; + stateVersion = "26.05"; sessionVariables = { GROQ_API_KEY = config.sops.secrets.GROQ_API_KEY.path; + OPENWEATHER_API_KEY = config.sops.secrets.OPENWEATHER_API_KEY.path; }; file = { "Pictures/Avatar" = { - source = ../assets/avatar; + source = "${self}/assets/avatar"; recursive = true; }; "Pictures/Wallpapers" = { - source = ../assets/wallpapers; + source = "${self}/assets/wallpapers"; recursive = true; }; }; }; + + sops = { + defaultSopsFile = ../secrets/secrets.yaml; + defaultSopsFormat = "yaml"; + age.keyFile = "/home/phil/.config/sops/age/keys.txt"; + + secrets = { + GROQ_API_KEY = { }; + OPENWEATHER_API_KEY = { }; + ssh_private_key = { + path = "/home/${primaryUser}/.ssh/ssh"; + mode = "0600"; + }; + }; + }; + + programs.man.enable = false; } diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 10a4081..ba2bdcb 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ + inputs.catppuccin.homeModules.catppuccin ./hyprland ./rofi ./waybar diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix index 61ad6f6..ed41a1d 100644 --- a/home/desktop/gtk.nix +++ b/home/desktop/gtk.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { - home.packages = with pkgs; [ catppuccin-papirus-folders ]; + home.packages = with pkgs; [ catppuccin-papirus-folders adwaita-icon-theme]; gtk = { enable = true; @@ -17,12 +17,12 @@ iconTheme = { name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; + package = lib.mkForce pkgs.catppuccin-papirus-folders; # deactivate and check }; cursorTheme = { name = "catppuccin-mocha-dark"; - package = pkgs.catppuccin-cursors.mocha-dark; + package = pkgs.catppuccin-cursors.mochaDark; size = 24; }; diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 51ba27a..edaa407 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -20,7 +20,7 @@ in ]; home.packages = with pkgs; [ - catppuccin-cursors.mocha-dark + catppuccin-cursors.mochaDark grim slurp wl-clipboard @@ -43,8 +43,8 @@ in }; plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [ - hyprbars - hyprexpo + #hyprbars + # hyprexpo ]; settings = { @@ -139,24 +139,24 @@ in ]; }; - layerrule = [ - "ignorezero,notifications" - "ignorezero,rofi" - ]; + # layerrule = [ + # "ignorezero,notifications" + # "ignorezero,rofi" + # ]; dwindle = { pseudotile = "yes"; preserve_split = "yes"; }; - gestures = { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = true; - workspace_swipe_fingers = 3; - workspace_swipe_distance = 300; - workspace_swipe_invert = false; - workspace_swipe_cancel_ratio = 0.5; - }; + # gestures = { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + # workspace_swipe = true; + # workspace_swipe_fingers = 3; + # workspace_swipe_distance = 300; + # workspace_swipe_invert = false; + # workspace_swipe_cancel_ratio = 0.5; + # }; misc = { force_default_wallpaper = 0; @@ -170,7 +170,7 @@ in device = { name = "usb-optical-mouse-"; - sensitivity = -0.5; + sensitivity = 0; }; windowrulev2 = [ @@ -181,15 +181,15 @@ in "center, class:^(xdg-desktop-portal-gtk)$" ]; - windowrule = [ - "opacity 0.0 override, class:^(xwaylandvideobridge)$" - "noanim, class:^(xwaylandvideobridge)$" - "noinitialfocus, class:^(xwaylandvideobridge)$" - "maxsize 1 1, class:^(xwaylandvideobridge)$" - "noblur, class:^(xwaylandvideobridge)$" - "nofocus, class:^(xwaylandvideobridge)$" - "noblur, class:^(org\\.gnome\\.|io\\.github\\.|org\\.gtk\\.)" - ]; + # windowrule = [ + # "opacity 0.0 override, class:^(xwaylandvideobridge)$" + # "noanim, class:^(xwaylandvideobridge)$" + # "noinitialfocus, class:^(xwaylandvideobridge)$" + # "maxsize 1 1, class:^(xwaylandvideobridge)$" + # "noblur, class:^(xwaylandvideobridge)$" + # "nofocus, class:^(xwaylandvideobridge)$" + # "noblur, class:^(org\\.gnome\\.|io\\.github\\.|org\\.gtk\\.)" + # ]; exec-once = [ "waybar &" @@ -265,7 +265,7 @@ in # Screenshot ''${super}, Z, exec, grim -g "$(slurp)" $HOME/Pictures/Screenshots/$(date +'%s_grim.png')'' - ''${super}, U, exec, grim $HOME/Pictures/Screenshots/$(date +'%s_grim.png')'' + "${super}, U, exec, grim $HOME/Pictures/Screenshots/$(date +'%s_grim.png')" ]; bindl = [ diff --git a/home/desktop/hyprland/portal.nix b/home/desktop/hyprland/portal.nix index 879a9b5..2c123ab 100644 --- a/home/desktop/hyprland/portal.nix +++ b/home/desktop/hyprland/portal.nix @@ -12,7 +12,6 @@ }; extraPortals = [ pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-hyprland ]; }; } diff --git a/home/desktop/rofi/default.nix b/home/desktop/rofi/default.nix index a9292b3..b69adda 100644 --- a/home/desktop/rofi/default.nix +++ b/home/desktop/rofi/default.nix @@ -12,7 +12,7 @@ programs.rofi = { enable = true; cycle = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; font = "FiraCode Nerd Font Mono 12"; location = "center"; diff --git a/home/desktop/waybar/configs/style.css b/home/desktop/waybar/configs/style.css index dc25e86..d162038 100644 --- a/home/desktop/waybar/configs/style.css +++ b/home/desktop/waybar/configs/style.css @@ -1 +1,175 @@ -*{border:none;min-height:10px;font-family:FiraCode Nerd Font;font-size:15px}window#waybar{background:@crust}window#waybar.hidden{opacity:.2}󠀰 #media,#clock,#cpu,#memory,#disk,#temperature,#network,#custom-wallpaper,#media,#custom-weather{color:@crust;margin-top:6px;margin-bottom:6px;padding-left:10px;padding-right:10px;transition:none}#custom-nixicon,#cpu{border-top-left-radius:10px;border-bottom-left-radius:10px;margin-left:5px}#clock,#temperature{border-top-right-radius:10px;border-bottom-right-radius:10px;margin-right:20px}#custom-nixicon{background-image:url(nix-snowflake.svg);background-position:50%;background-repeat:no-repeat;background-size:contain;min-width:24px;min-height:24px;margin-top:6px;margin-bottom:6px;margin-left:15px;padding:0 15px 0 10px}#clock{background:@yellow}#cpu{background:@blue}#memory{background:@red}#disk{background:@peach}#temperature{background:@sky}#network{background:@lavender;padding-right:13px}#workspaces{border-radius:10px;margin:6px 5px;padding:0 6px}#workspaces button{color:@text;background:0 0;border:none;padding:4px;transition:color .3s,text-shadow .3s,transform .3s}#workspaces button.occupied{color:@red}#workspaces button.active{color:@green;text-shadow:0 0 4px @green}#workspaces button:hover{color:@teal;border:none}#media{background:@overlay2;color:@crust;border-radius:10px;margin-left:20px}#custom-cava{color:@green}#wireplumber,#custom-cava,#mpris{margin-left:10px;margin-right:5px}#wireplumber{margin-right:5px}#custom-weather{background:@sky;color:@crust;border-radius:10px;margin-right:20px}#custom-notification{background:@green;border-radius:10px;padding-left:10px;padding-right:5px;font-family:NotoSansMono Nerd Font}#custom-wallpaper{background:@red;color:@mantle;border-radius:10px;margin-left:5px} +@import "catppuccin.css"; + +* { + border: none; + font-family: "FiraCode Nerd Font"; + font-size: 15px; + min-height: 10px; +} + +window#waybar { + background: @crust; +} + +window#waybar.hidden { + opacity: 0.2; +} +󠀰 +/* - Genera rules for visible modules -- */ +#media, +#clock, +#cpu, +#memory, +#disk, +#temperature, +#network, +#custom-wallpaper, +#media, +#custom-weather { + color: @crust; + margin-top: 6px; + margin-bottom: 6px; + padding-left: 10px; + padding-right: 10px; + transition: none; +} + +/* Separation to the left */ +#custom-nixicon, +#cpu { + margin-left: 5px; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; +} + +/* Separation to the rigth */ +#clock, +#temperature { + margin-right: 20px; + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; +} + +/* -- Specific styles -- */ + +#custom-nixicon { + background-image: url("nix-snowflake.svg"); + background-size: contain; + background-repeat: no-repeat; + background-position: center; + min-height: 24px; + min-width: 24px; + + padding: 0px; + padding-right: 15px; + padding-left: 10px; + margin-top: 6px; + margin-bottom: 6px; + margin-left: 15px; +} + +/* Hardware Group */ +#clock { + background: @yellow; +} + +#cpu { + background: @blue; +} + +#memory { + background: @red; +} + +#disk { + background: @peach; +} + +#temperature { + background: @sky; +} + +#network { + background: @lavender; + padding-right: 13px; +} + +/* Workspace */ +#workspaces { + border-radius: 10px; + margin: 6px 5px; + padding: 0px 6px; +} + +#workspaces button { + color: @text; + background: transparent; + padding: 4px 4px; + transition: color 0.3s ease, text-shadow 0.3s ease, transform 0.3s ease; + border: none; +} + +#workspaces button.occupied { + color: @red; +} + +#workspaces button.active { + color: @green; + text-shadow: 0 0 4px @green; +} + +#workspaces button:hover { + color: @teal; + border: none; +} + +#workspaces button.active:hover {} + + + +/* Media Group */ +#media { + background: @overlay2; + border-radius: 10px; + color: @crust; + margin-left: 20px; +} + +#custom-cava { + color: @green; +} + +#wireplumber, #custom-cava, #mpris { + margin-left: 10px; + margin-right: 5px; +} + +#wireplumber { + margin-right: 5px; +} + + +/* Weather */ +#custom-weather { + background: @sky; + color: @crust; + border-radius: 10px; + margin-right: 20px; +} + +/* SwayNC */ +#custom-notification { + font-family: "NotoSansMono Nerd Font"; + background: @green; + border-radius: 10px; + padding-left: 10px; + padding-right: 5px; +} + +/* Wallpaper */ +#custom-wallpaper { + background: @red; + color: @mantle; + border-radius: 10px; + margin-left: 5px; +} diff --git a/home/desktop/waybar/configs/style.min.css b/home/desktop/waybar/configs/style.min.css new file mode 100644 index 0000000..dc25e86 --- /dev/null +++ b/home/desktop/waybar/configs/style.min.css @@ -0,0 +1 @@ +*{border:none;min-height:10px;font-family:FiraCode Nerd Font;font-size:15px}window#waybar{background:@crust}window#waybar.hidden{opacity:.2}󠀰 #media,#clock,#cpu,#memory,#disk,#temperature,#network,#custom-wallpaper,#media,#custom-weather{color:@crust;margin-top:6px;margin-bottom:6px;padding-left:10px;padding-right:10px;transition:none}#custom-nixicon,#cpu{border-top-left-radius:10px;border-bottom-left-radius:10px;margin-left:5px}#clock,#temperature{border-top-right-radius:10px;border-bottom-right-radius:10px;margin-right:20px}#custom-nixicon{background-image:url(nix-snowflake.svg);background-position:50%;background-repeat:no-repeat;background-size:contain;min-width:24px;min-height:24px;margin-top:6px;margin-bottom:6px;margin-left:15px;padding:0 15px 0 10px}#clock{background:@yellow}#cpu{background:@blue}#memory{background:@red}#disk{background:@peach}#temperature{background:@sky}#network{background:@lavender;padding-right:13px}#workspaces{border-radius:10px;margin:6px 5px;padding:0 6px}#workspaces button{color:@text;background:0 0;border:none;padding:4px;transition:color .3s,text-shadow .3s,transform .3s}#workspaces button.occupied{color:@red}#workspaces button.active{color:@green;text-shadow:0 0 4px @green}#workspaces button:hover{color:@teal;border:none}#media{background:@overlay2;color:@crust;border-radius:10px;margin-left:20px}#custom-cava{color:@green}#wireplumber,#custom-cava,#mpris{margin-left:10px;margin-right:5px}#wireplumber{margin-right:5px}#custom-weather{background:@sky;color:@crust;border-radius:10px;margin-right:20px}#custom-notification{background:@green;border-radius:10px;padding-left:10px;padding-right:5px;font-family:NotoSansMono Nerd Font}#custom-wallpaper{background:@red;color:@mantle;border-radius:10px;margin-left:5px} diff --git a/home/desktop/waybar/configs/style.src.css b/home/desktop/waybar/configs/style.src.css deleted file mode 100644 index d6ff9f0..0000000 --- a/home/desktop/waybar/configs/style.src.css +++ /dev/null @@ -1,173 +0,0 @@ -* { - border: none; - font-family: "FiraCode Nerd Font"; - font-size: 15px; - min-height: 10px; -} - -window#waybar { - background: @crust; -} - -window#waybar.hidden { - opacity: 0.2; -} -󠀰 -/* - Genera rules for visible modules -- */ -#media, -#clock, -#cpu, -#memory, -#disk, -#temperature, -#network, -#custom-wallpaper, -#media, -#custom-weather { - color: @crust; - margin-top: 6px; - margin-bottom: 6px; - padding-left: 10px; - padding-right: 10px; - transition: none; -} - -/* Separation to the left */ -#custom-nixicon, -#cpu { - margin-left: 5px; - border-top-left-radius: 10px; - border-bottom-left-radius: 10px; -} - -/* Separation to the rigth */ -#clock, -#temperature { - margin-right: 20px; - border-top-right-radius: 10px; - border-bottom-right-radius: 10px; -} - -/* -- Specific styles -- */ - -#custom-nixicon { - background-image: url("nix-snowflake.svg"); - background-size: contain; - background-repeat: no-repeat; - background-position: center; - min-height: 24px; - min-width: 24px; - - padding: 0px; - padding-right: 15px; - padding-left: 10px; - margin-top: 6px; - margin-bottom: 6px; - margin-left: 15px; -} - -/* Hardware Group */ -#clock { - background: @yellow; -} - -#cpu { - background: @blue; -} - -#memory { - background: @red; -} - -#disk { - background: @peach; -} - -#temperature { - background: @sky; -} - -#network { - background: @lavender; - padding-right: 13px; -} - -/* Workspace */ -#workspaces { - border-radius: 10px; - margin: 6px 5px; - padding: 0px 6px; -} - -#workspaces button { - color: @text; - background: transparent; - padding: 4px 4px; - transition: color 0.3s ease, text-shadow 0.3s ease, transform 0.3s ease; - border: none; -} - -#workspaces button.occupied { - color: @red; -} - -#workspaces button.active { - color: @green; - text-shadow: 0 0 4px @green; -} - -#workspaces button:hover { - color: @teal; - border: none; -} - -#workspaces button.active:hover {} - - - -/* Media Group */ -#media { - background: @overlay2; - border-radius: 10px; - color: @crust; - margin-left: 20px; -} - -#custom-cava { - color: @green; -} - -#wireplumber, #custom-cava, #mpris { - margin-left: 10px; - margin-right: 5px; -} - -#wireplumber { - margin-right: 5px; -} - - -/* Weather */ -#custom-weather { - background: @sky; - color: @crust; - border-radius: 10px; - margin-right: 20px; -} - -/* SwayNC */ -#custom-notification { - font-family: "NotoSansMono Nerd Font"; - background: @green; - border-radius: 10px; - padding-left: 10px; - padding-right: 5px; -} - -/* Wallpaper */ -#custom-wallpaper { - background: @red; - color: @mantle; - border-radius: 10px; - margin-left: 5px; -} diff --git a/home/desktop/waybar/default.nix b/home/desktop/waybar/default.nix index 58822c3..03f4885 100644 --- a/home/desktop/waybar/default.nix +++ b/home/desktop/waybar/default.nix @@ -4,13 +4,18 @@ ... }: { + catppuccin.waybar.mode = "createLink"; + programs.waybar = { enable = true; package = pkgs.waybar; } // (import ./dual.nix { inherit compositor; }); - home.file.".config/waybar" = { - source = ./configs; - recursive = true; + home = { + packages = with pkgs; [ cava ]; + file.".config/waybar" = { + source = ./configs; + recursive = true; + }; }; } diff --git a/home/desktop/waybar/dual.nix b/home/desktop/waybar/dual.nix index ce67f16..ab6ade7 100644 --- a/home/desktop/waybar/dual.nix +++ b/home/desktop/waybar/dual.nix @@ -3,7 +3,7 @@ }: let common = import ./common.nix; - wm = if compositor == "hyprland" then import ./hyprland.wm.nix else import ./niri-wm.nix; + wm = if compositor == "hyprland" then import ./hyprland-wm.nix else import ./niri-wm.nix; in { enable = true; diff --git a/home/git.nix b/home/git.nix index c552777..0e67de8 100644 --- a/home/git.nix +++ b/home/git.nix @@ -8,20 +8,20 @@ programs.git = { enable = true; - userName = "DerGrumpf"; # TODO replace - userEmail = "p.keier@beyerstedt-it.de"; # TODO replace - - lfs.enable = true; - - ignores = [ "**/.DS_STORE" ]; - - extraConfig = { + settings = { github = { user = primaryUser; }; init = { defaultBranch = "main"; }; + user = { + name = "DerGrumpf"; # TODO replace + email = "p.keier@beyerstedt-it.de"; # TODO replace + }; }; + + lfs.enable = true; + ignores = [ "**/.DS_STORE" ]; }; } diff --git a/home/neovim/conform.nix b/home/neovim/conform.nix index 54186a5..f915b04 100644 --- a/home/neovim/conform.nix +++ b/home/neovim/conform.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ # Conform: Code formatter that runs external formatting tools # Automatically formats code on save for consistent style. programs.nixvim = { @@ -24,7 +25,7 @@ # Install formatters extraPackages = with pkgs; [ stylua - nixfmt-classic + nixfmt black rustfmt prettierd diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 758eeee..2ae855d 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -1,6 +1,7 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ + inputs.nixvim.homeModules.nixvim ./treesitter.nix ./lint.nix ./lsp.nix @@ -21,7 +22,6 @@ home.packages = with pkgs; [ nil biome - nixfmt-rfc-style ]; programs.nixvim = { diff --git a/home/neovim/lsp.nix b/home/neovim/lsp.nix index 3fe2059..1c7a960 100644 --- a/home/neovim/lsp.nix +++ b/home/neovim/lsp.nix @@ -85,7 +85,7 @@ lua-language-server nil rust-analyzer - python311Packages.python-lsp-server + python314Packages.python-lsp-server ]; }; } diff --git a/home/nixcord.nix b/home/nixcord.nix index 171e6aa..e63dabb 100644 --- a/home/nixcord.nix +++ b/home/nixcord.nix @@ -1,4 +1,9 @@ -{ lib, ... }: { +{ lib, inputs, ... }: +{ + imports = [ + inputs.nixcord.homeModules.nixcord + ]; + programs.nixcord = { enable = true; discord = lib.mkForce { enable = false; }; diff --git a/home/packages.nix b/home/packages.nix index fefe365..bfefed6 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -33,7 +33,7 @@ fstl nautilus swayimg - okular + kdePackages.okular gnumeric sqlitebrowser thunderbird diff --git a/home/python.nix b/home/python.nix index be4b85d..b4d09d0 100644 --- a/home/python.nix +++ b/home/python.nix @@ -1,17 +1,20 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ home.packages = with pkgs; [ # Python 3.13 (newest stable) - python313 - python313Packages.pip - python313Packages.virtualenv + python314 + python314Packages.pip + python314Packages.virtualenv # Additional useful tools - python313Packages.pipx # Install Python apps in isolated environments + python314Packages.pipx # Install Python apps in isolated environments uv # Fast Python package installer (alternative to pip) ]; # Set up default Python version - home.sessionVariables = { PYTHON = "${pkgs.python313}/bin/python3"; }; + home.sessionVariables = { + PYTHON = "${pkgs.python313}/bin/python3"; + }; # Shell aliases for convenience programs.zsh.shellAliases = { diff --git a/home/shell.nix b/home/shell.nix index c0b73c2..78bc20f 100644 --- a/home/shell.nix +++ b/home/shell.nix @@ -10,7 +10,8 @@ tabiew # Table viewer glow # MD Viewer - llm # LLM in the Terminal + # LLM in the Terminal + llm # Fun stuff zoxide @@ -24,7 +25,7 @@ font = { name = "Fira Code Nerd Font"; - size = 12; + size = 10; }; settings = { @@ -97,13 +98,6 @@ i = "kitty +kitten icat"; "nix-switch" = "sudo darwin-rebuild switch --flake ~/.config/nix#cyper-mac"; }; - - initContent = '' - fastfetch - ai() { - llm -m groq/groq/compound "$@" | glow - } - ''; }; programs.fish = { @@ -124,12 +118,6 @@ fastfetch end ''; - - functions.ai = { - body = '' - llm -m groq/groq/compound $argv | glow - ''; - }; }; programs.starship = { diff --git a/home/spicetify.nix b/home/spicetify.nix index 4eab067..6c6db79 100644 --- a/home/spicetify.nix +++ b/home/spicetify.nix @@ -1,7 +1,14 @@ -{ pkgs, inputs, ... }: { +{ pkgs, inputs, ... }: +{ + imports = [ + inputs.spicetify-nix.homeManagerModules.default + ]; + programs.spicetify = - let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; - in { + let + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + in + { enable = true; spotifyPackage = pkgs.spotify; theme = spicePkgs.themes.catppuccin; diff --git a/hosts/cyper-desktop/configuration.nix b/hosts/cyper-desktop/configuration.nix index 31cb060..0abe6a7 100644 --- a/hosts/cyper-desktop/configuration.nix +++ b/hosts/cyper-desktop/configuration.nix @@ -28,4 +28,6 @@ }; efi.canTouchEfiVariables = true; }; + + system.stateVersion = "26.05"; } diff --git a/nixos/audio.nix b/nixos/audio.nix index de9a862..7b424f0 100644 --- a/nixos/audio.nix +++ b/nixos/audio.nix @@ -5,10 +5,9 @@ alsa = { enable = true; support32Bit = true; - pulse.enable = true; - #jack.enable = true; # audio production }; - + #jack.enable = true; # audio production + pulse.enable = true; }; security.rtkit.enable = true; } diff --git a/nixos/default.nix b/nixos/default.nix index c5f6089..6dde0b4 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -49,7 +49,7 @@ documentation = { enable = true; doc.enable = false; # Skip large documentation - man.enable = true; # Keep man pages + man.enable = false; # Keep man pages info.enable = false; # Skip info pages }; @@ -63,6 +63,7 @@ users.${primaryUser} = { imports = [ ../home ]; }; + backupFileExtension = "backup"; extraSpecialArgs = { inherit inputs primaryUser; }; }; diff --git a/nixos/webcam.nix b/nixos/webcam.nix index 29bedea..d330e3f 100644 --- a/nixos/webcam.nix +++ b/nixos/webcam.nix @@ -5,7 +5,7 @@ SUBSYSTEM=="usb", \ ATTR{idVendor}=="04a9", \ ATTR{idProduct}=="31ea", \ - RUN+="systemctl restart webcam" + RUN+="${pkgs.systemd}/bin/systemctl restart webcam" ''; systemd.services.webcam = {