From 9272749b6f495bb9b06e9fcb620769fe11402efd Mon Sep 17 00:00:00 2001 From: stubdesu Date: Sun, 14 Jan 2024 20:58:52 +0700 Subject: [PATCH 001/584] a --- packages/linux-lava/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 9b0ba41..f6ea9d4 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.6.7"; + version = "6.7.0"; kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; @@ -37,7 +37,7 @@ in { }; kernelPatches = [ - kernelPatchSrc + #kernelPatchSrc ] ++ builtins.map (name: { inherit name; From 0f759811201c8665035bf67bc4c1abd0c8307a3c Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 16:09:39 +0700 Subject: [PATCH 002/584] a --- flake.nix | 1 + hosts/anemone/default.nix | 43 ++++++++++++++++++++++++++++++++ hosts/anemone/filesystem.nix | 36 ++++++++++++++++++++++++++ hosts/anemone/kernel.nix | 14 +++++++++++ hosts/anemone/networking.nix | 12 +++++++++ modules/system/kernel.nix | 1 - packages/linux-lava/sources.nix | 2 +- secrets.nix | 3 ++- secrets/acme_dns.age | 15 +++++------ secrets/passwd.age | Bin 675 -> 751 bytes secrets/warden_admin.age | 16 ++++++------ secrets/wg_blossom.age | 17 ++++++------- secrets/wg_caramel.age | Bin 479 -> 367 bytes secrets/wg_sugarcane.age | Bin 461 -> 367 bytes secrets/wpa_conf.age | Bin 567 -> 530 bytes 15 files changed, 129 insertions(+), 31 deletions(-) create mode 100644 hosts/anemone/default.nix create mode 100644 hosts/anemone/filesystem.nix create mode 100644 hosts/anemone/kernel.nix create mode 100644 hosts/anemone/networking.nix diff --git a/flake.nix b/flake.nix index d5ef5c7..e6aa1ef 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ }; in { + nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true []; nixosConfigurations."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true []; diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix new file mode 100644 index 0000000..76118cf --- /dev/null +++ b/hosts/anemone/default.nix @@ -0,0 +1,43 @@ +{ config, inputs, modules, overlays, pkgs, ... }: { + networking.hostName = "anemone"; + system.stateVersion = "23.11"; + time.timeZone = "Asia/Phnom_Penh"; + + nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; + age.secrets = { + passwd.file = ../../secrets/passwd.age; + #wg_hyacinth.file = ../../secrets/wg_blossom.age; + #wpa_conf.file = ../../secrets/wpa_conf.age; + }; + imports = with modules.system; [ + inputs.home-manager.nixosModule + home-manager + + audio + base + ccache + corectrl + flatpak + greetd + gui + input + kernel + nix + packages + printing + security + snapper + #wireguard + + ./filesystem.nix + ./kernel.nix + ./networking.nix + + ../../users/rin + ]; + + # For steam fhs-env + nixpkgs.config.permittedInsecurePackages = [ + "openssl-1.1.1w" + ]; +} diff --git a/hosts/anemone/filesystem.nix b/hosts/anemone/filesystem.nix new file mode 100644 index 0000000..2ba2d02 --- /dev/null +++ b/hosts/anemone/filesystem.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: +let + mkLabelMount = label: type: { + device = "/dev/disk/by-label/${label}"; + fsType = type; + options = [ "defaults" "relatime" ]; + }; + mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" // { + options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ]; + }; + submount = mkBtrfsMount "Anemone"; +in +{ + fileSystems = { + "/" = { + device = "rootfs"; + fsType = "tmpfs"; + options = [ "defaults" "size=8G" "mode=755" ]; + }; + "/boot" = mkLabelMount "SYSTEM" "vfat"; + + "/mnt/butter" = submount "/" true; + "/nix" = submount "/current/snow" false; + "/home" = submount "/current/home" true; + "/home/.snapshots" = submount "/snapshot/home" false; + "/root" = submount "/current/root" false; + "/var" = submount "/current/var" false; + "/persist" = { + depends = [ "/var" ]; + device = "/var/persist"; + fsType = "none"; + options = [ "bind" ]; + neededForBoot = true; + }; + }; +} diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix new file mode 100644 index 0000000..d782fe3 --- /dev/null +++ b/hosts/anemone/kernel.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: { + boot = { + loader = { + efi.canTouchEfiVariables = true; + systemd-boot.enable = true; + }; + initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + initrd.kernelModules = [ "amdgpu" ]; + kernelModules = [ "kvm-amd" ]; + kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); + }; + + hardware.cpu.amd.updateMicrocode = true; +} diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix new file mode 100644 index 0000000..d8ca7a7 --- /dev/null +++ b/hosts/anemone/networking.nix @@ -0,0 +1,12 @@ +{ config, ... }: { + networking = { + useDHCP = true; + nameservers = [ "1.1.1.1" "8.8.8.8" ]; + wireless.userControlled.enable = true; + + extraHosts = '' + 192.168.100.12 strawberry + 192.168.100.15 caramel + ''; + }; +} diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix index 181ef90..e4c5b6b 100644 --- a/modules/system/kernel.nix +++ b/modules/system/kernel.nix @@ -9,7 +9,6 @@ "kernel.core_pattern" = "|/bin/false"; "kernel.sysrq" = 1; }; - loader.grub.useOSProber = true; }; hardware.enableRedistributableFirmware = true; zramSwap.enable = true; diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index f6ea9d4..9f1773b 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, inputs, lib }: let version = "6.7.0"; - kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; + kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; mm = lib.versions.majorMinor version; diff --git a/secrets.nix b/secrets.nix index a713b13..f83332a 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,11 +1,12 @@ let + anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc"; blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj"; caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80"; sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ"; rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15"; in { - "secrets/passwd.age".publicKeys = [ blossom caramel sugarcane rin ]; + "secrets/passwd.age".publicKeys = [ anemone blossom caramel sugarcane rin ]; "secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ]; "secrets/acme_dns.age".publicKeys = [ caramel rin ]; diff --git a/secrets/acme_dns.age b/secrets/acme_dns.age index aae2a16..17f90a8 100644 --- a/secrets/acme_dns.age +++ b/secrets/acme_dns.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg dDnXFO4iUwixemx1WPFZSM15/z7xtAGjZxriBbsURRg -uv6gdP/LDmZMZu/B3IWWYEzfR+H7TJsR3Zo8hYzthQE --> ssh-ed25519 krYeuQ Yo3FXb2pDijXv2JxYvNP3IF0DADygWjIHEoUlfCw3zc -vly4m2xyGfuJxBPue0mk9dodc4YAEKYTWLwx9ljVhWs --> ,-grease -v4PvG0kmxXhjh7Jf ---- 6yg8u5a9px36osMqiVI4ZPfea+ySjKB8GR/TcCG/ZXU -qT!|E#r QT QMɑIX#:f|kSis^~^ _K}"I)GI -~ы*4A^w( \ No newline at end of file +-> ssh-ed25519 krYeuQ SBY9moNFVc8mdntk13DRWSIyoJfSuzsBrhzmaH8u51c +5QU1vtRllrmYsArw6LSktuRLQ7QbrtNBKVrOG8d2pyk +-> ssh-ed25519 U9FXlg HR/A429gFyLaUq6QSyTYv8yK5syfJbLDFzmhGGTZt1M +jCXRzzzp8vfB4n8pM6BAZr/IC9E+vBeeOm0AYGYBOe0 +--- /vlh5vuiRyVyiQpn4PZ5zBeUNaQclSW5Y5z1mR43fFg +,S=;9}J|5UjB{j-v(T7l^kɀQx^?`/N|aqxI \ No newline at end of file diff --git a/secrets/passwd.age b/secrets/passwd.age index 0e7d693b257338eabfa2faf4388d64f7ea60f713..7d2a22449bce6d1b4351487b311a26e2c4412171 100644 GIT binary patch delta 687 zcmZ3?`kr-yYFvIsWpIh3La338c|@^^aiL?Hb5f>nM!1n#d2V2+N0nDzftz+xk-mPu zxnWggUZj%&m$sKrVr5loxSye;wt;I=QAAdSc1d`)mwvfLKuJ(>j=x_~zHgyrYLJWL z{g!h$2YTrAT9^z$9d41zt9oDIUu zgFTHhO`?*s%sjFK^fTRkybJxpwOtC6ja*#0bnO(1i!*dnQ;bYa4J{QsDvZsO%N5cL zlRSdcO#_Yn0!>mYt2`|0wJS|rBGQ7w(!v}~LaNg9DkHHj7SP}OUX|(Fi5iq%TM<3@W?WBOs)#$($&>f(9TJ9HqMRo^@(sZGPm&6_6P|# z^UMq>EXgqm_bD$6GfGa*DT%1aO4Rq|S|UB`hQH2oFQu})bGIYjoHCuAy8NBca<(T~ z7R$nKD4*d}>nzZmlDm3d)$b;j9q(q_T9x!1if7|0ju7qI|3l;PfwzgR3l1neC=0na zz5dJWpF delta 608 zcmaFQx|nr>>g2nO?BSuNPGx>6&Y?j*<;GEo`mSzym6_#U;jY?wK?bG;6OmT zC8=3K>0F`Z;Re}xuCC=NNyUDiE^ZbD&Ynr-iE5LvjkE!V4WEs*;UNQlkvhqk=P>JSTn>uXk}Sb`32IGqDU$ zH*rb{uS}`%&J7F9bBih}uPAU!F^kIZGAy?Ys&qCk=St7aw@md6Newp6&hih}&nn3^ zO3cdjE-Z6OP0rFT%E~EoEcEg8Da{Nw;nKBJC@#*>O-(T}H8r$Ua1M3OiU?FlbA4n;Y!NrK_u};2G>(oKslfZ04Np?`R&BTo6$2U*hO&;pJ#%QEcp(;hPef zlIoJ<;>rXW;2Ub1M`ukK=$L8p_tIq|wM1Q@meCT{kp=VidPh_y; z@mr<0J5Imj_`O=>_k;ZpLl6Bn`abQ}kB9FPTtY9Ff7IFdBCRg?!R$v{YMgGcY+*P0 y{?dBJsbuY|8xxx~ndLTix4Nmk-xk7lXGhV6)n&8dioZEd;VVfwyy<)de*gfv4&@dA diff --git a/secrets/warden_admin.age b/secrets/warden_admin.age index 972ef49..ef48c4d 100644 --- a/secrets/warden_admin.age +++ b/secrets/warden_admin.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg YL/xEUVIIOIeP2FRVxZhkCg/yaiX50S74HSMslKzoSw -SqzuQt4hd6ICDRlq+6Vqy0j/ZuNm3waCg7pUt9EqVD0 --> ssh-ed25519 krYeuQ IsFu0w7BFrTm5rAE6Ysxuievf3NiC60h/KkoUO51FUA -/BCYR/4qP+1449Kf2MY79sq0ahpjqI5fq7Sme2swU6U --> V;-grease ^F.M -lxjBnTXUAhPceJGeXm985SzVP4D2PsxkUEv/kKSx+6LGCHUzYAggYXi8C2ahorkY -XrYNvorBDG0aezi2GSicmAf4pQkkrLcvZhsmU+/QOKzyAxMw7V0 ---- jUlhN0y3o/J/jQlcN0um+lTQ3hZv2Ur0crxSsGeZ28c -DJ?w9%s5zkA3U"V3[in0kXi:LoaD'$O54&Ս² ^ULEQP/ \ No newline at end of file +-> ssh-ed25519 krYeuQ V3hCVmXcLm9tDavUNciUCqqCc7+hg6lJir0t4iUoOA4 +CH3+qpJsmjTJ9+lB7hr1nE5W9RteMtpkuJHlCOSrc0c +-> ssh-ed25519 U9FXlg VT5DxyuigkAL6btdC5Mt4vvCuzOB7xjuf/n/fYOALF0 +Ln3p2c9swsONWzPSkuY/ovv3HG8Sl/3dHpHqRHIckrU +--- sBS5K5WGRvcgrs9CRXZjvteE5qQrPhM/Trmhc7bU+dg +t f9Kh3"ԧcL\E@-nj b+BI; +(Q|0jrmHQ.hZ#l䘻1 OIptPxqCY \ No newline at end of file diff --git a/secrets/wg_blossom.age b/secrets/wg_blossom.age index 6b5df62..f7f550e 100644 --- a/secrets/wg_blossom.age +++ b/secrets/wg_blossom.age @@ -1,11 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg Y/Q29duiKdP+fV11ellTIMtHFyi9saczXfbcnq7iB0s -D9P8MAHlFOLR7P8Ux90CjljnhExARGnuSuw24AXOr5c --> ssh-ed25519 CUCjXQ eGpAJd5fydYBlC7o34CP7091jg4O4NsuLji1/rYtQVg -9/rgYCpe9wcCrLM7fTYI92oa+3+SAEK6ZgJNmBeOtnM --> A-grease xTj~+6%4 aF]RZn tj](JCp -5iDN8bexrr7eNqyFwBNCUefrOqAIS10KppbrdDJH1+fD0TkUifEOjcM2uV/+3tH2 -dYX5eM94zkmwxw ---- QKnJmu6ICTTfadXCKLKii03FXVTBqAFvbAZVHGzGLzE - ssh-ed25519 CUCjXQ iM2w01v4y0Q3DVbpGtt6f3HiHMRw7Xr08JgTB6fe8x4 +WiBMVRZr1edBVfLAPAFT4GSEGoyn9jWzO92yysNM9Mo +-> ssh-ed25519 U9FXlg Bvlaqu4nEbjfBGgBFKDmD1cBbxH2+dyz1BHzegz1AS4 ++sf3rC0J2Ik1SNtpr52GxV6G6tzGLiwlvjXFWE3qrSw +--- yaZjH1jeXqPGiw1lIkH9uz6QJo/nM1lBezbpVlJDNUM +cgj" +U"^ *ADvl2cRq).NLtZjCB5l^0)䥆. \ No newline at end of file diff --git a/secrets/wg_caramel.age b/secrets/wg_caramel.age index 2a18202bcd6cea702c270ac871e992141510fdfb..37276ac0c5d7aa79178598407f787d3ba0778cf9 100644 GIT binary patch delta 339 zcmcc5{GMroYJGN5WNK-kLRpTtrDLMLTSj)4VOEG^a&mHocV2K+mO++ZnrnW9X=QFe zMowa(XIOACS6GsHPEfIPuD7p&TUlC?wqK=Ro}Y78p|fLPabAj#Uy7q)UW8kArhkzm zm#&>cadC!jYKoDmsiCDpsHIy(PP&4JWoB8SV^ErTa(zl#rBjMYU|vq4PiBB$L0Yy^ zgnp{GnSr;dzP`43j$t}ieq?&0M_9O*MMbi9TCQ)1Z&^`9aEYNyaadZCpPNCINtm{u zzO!Ljc|;_auCA^^R!OOGMMb!qOSn@>ZmMajuc?u1v2U(_xwlJkv4v}LNnWJ6TR~c2 zvZo2x1Rtrd30;edm$+X4r_B)&*6s1t{p9+Co>7xMsx4;kKep)Z%$cvB%(~s$oo_6X mY-`!IqNl^jD!pXdvbBAG7vykWocQ{ZfY5Q->1AF&?YID5uzhR* delta 452 zcmaFQbf0;GYJI4sTSQK}LSA99hq0%Aj%SfeN>!$7ildojrg@Tqf22{OWv0KWL1ku+ zrMIhTNp5g5msv@PS%!OZq(!BXqhGeKmy3UZfqA8|yQ^Q4p=*k-t9y`RdS$kMcD{!z zm#&>cadC!jYKoDmsiCDpc2Q(%X`n(_T10T6iLskUL48QLNtAxLzhAngPlaKYNm03L zRep$Jh((~YZ=zd9dU`omaEPl}e!g*9T1IZVSwWhAgtvcMXp);(PElD@TCty3h)<cgJ4JJG%xM&$_g%BU0nr>!VH7Ts-P@S*Ssi8mnai`=ipS!?0}MRW9RaS)RF+7 zl+1`qGyg(;uTZYqJdbH^Z*&Y|!!|98xxiCpTlwqt>=j{)8SdQr&3Vo6@b72o&1`&U t)e_1~!qz)ISs(i~EkV)pXyfUIc^OL>EvEbyNtyUw;cw=Xg=szB8v$<abdbImt&fVdqI{_c3`nzc#&_3NmQVrXGyMiacOX&xo@(orE_+&Wv*j(eo1aI zm#&>cadC!jYKoDmsiCDpsHIy(PP&42ab9LgnVC_JbA3grNwII0erB*mZk2_nwyAe$ zd5Mp|K~|+>q+x17kwGz6YCvIVaIUv;fN?;WPrkNiO1QVNd!e>@l2NvAc9K_aL2+e7 zVRE>eW10n*uCA^^zN1B?sb#)?W`4Ozu2D!(qVOl|^QE`x8Nkv{n zm2o835}&?Dmk(%&ySML2$u;})F7x8Y-|cp-cAGWou3voWRGoCS-q_>n6Zh?+=GW#& nPhvk?=wx+sje6VqS5ls*&RX7k@y6&v>rJm4EIU&^)ZPaGjt_uS delta 434 zcmaFQbe4I7YJI4sTSQK}f^R@}a*2MFM^u=TS-4YyQ+ZK_Nq~M@X@)_fXNr4@e~Q0> zZ@FoHj-Q7km$|n`RkD|}XHHUXkcnSFuv3YlUv{CdYp{1(hGAq@s=leQp<7m7M7pH` zm#&>cadC!jYKoDmsiCEUM}@I@a=AjOYhsycWLl)QM}2BWWroF4aJsp#NnVnNzGJXY<`k7UQl$ZU&%l5*qRFw-oj68$7+H^0nsuGVh9Nh@Zl zirSoH1pSCr7eD)iW^L`&TR;mU^<*RDFyHIAd bSB^KX;97rXtH5mDHJ;bJ8BTnelkW}yQze$l diff --git a/secrets/wpa_conf.age b/secrets/wpa_conf.age index 60be4dbaa21a3f34ff8a9cc41e0c90ccf1fa59b0..17e93a9e7aecee8096bb02f3eea576b17cdd583a 100644 GIT binary patch delta 503 zcmdnaGKpn^YQ1x)b5=y4LP}7Oi*J=_ZfUS-WVmxih*yA7erZK`L3p`eQkschZd6`* zQG{nfXs}BcadC!jYKoDmsiCDpc2Q(%X`n)SzE^&tuWPDHe!ZVZdSZHIRhqHBM`m(xYNmHo zd1kP)QHp_Ase77nk!v8Ab7YBjfI(4VR8g6iYf`RXK!968QBJa{L4K-5KyZekQ&p%- zVVHAhPM9aUb)lAS5jp7!W?`j%-fjk|VeXj`X~9YU#zu}g7NNP$c?HS!UI9hv8RlUw z$p)#W;W_2LT;55!$$llN&Z$+7Wk$|<9{H{T7GcSu#--)y29Zww1sTcN`XQBu!MRDH zT)Mit3LYL27EYS zlPYGYJP-_dUVKeEW9E`$1-ZfbF4gb<{o(#(?|%8sjB5&u*^>NZ8~#hrb?D#cX~BJO z-KuEYh(%XlN#0~VbmHm-_Csll_dc_Wi)8AnEuFw?I)9Ji44$9AgVVz7mv3G8bDM=& k(DAtoI*QA#EV}$|!mhIA=NQ_<8(Vz-O4wiK6TEN^04Qj?)c^nh delta 541 zcmbQlvYlmuYJI4sTSQK}LQ+VOvvFWSSzdubW@S!9WSM@rXQ6+he^_XUyOB|@XNgy7 zX0}_lyMJ~*SCM&^i?)e#YKpsYP-tO}S-7!Rs!O<8scadC!jYKoDmsiCDpc2Q(%X`n)hQAI#uUWjp_e|?U-mqlPfQn*2pzIIhoUZ#6d zj<$bdkb!%kVOnyorJ)6vQ;2y%l6#VmpKpFjM0iO+nz6n|a$as)j((X(l#!c9Vrr_P zexhfducraJb$!_6=c^Drdz z+1?o@!6t6STqS8?MFml2Y33y<24+F2f!V?R5F5PBYBQkYX$;XmCqIFD@cwSU*m?>Wq)fJe!`sn-Y`h#!Gtu)f#2ze^} zdXo1=VS!IQ-D=6(2iAa&x! TGS3|Q;I$dT@9p;Lcs>FE7xTeT From adde051c61ec009b9aeec2d360f4c6c898289df1 Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 17:23:29 +0700 Subject: [PATCH 003/584] fixkernel --- flake.lock | 12 ++++++------ packages/linux-lava/sources.nix | 4 +--- users/rin/packages.nix | 2 -- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 0338d1b..4111c00 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1702296374, - "narHash": "sha256-KYZFl0LVZ4FXXi2T6J5ELWWAhRO+CUrlditEv9fMCGc=", + "lastModified": 1704890137, + "narHash": "sha256-uh1ielVK71BP/MYK85KA8B8DBltFPF4oEeHXyKcMqyY=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "112adb9e50485de74c371d6efa93fb6c32a5a976", + "rev": "80fdc82a9a76b81d9fcc4a321566f285fb956e76", "type": "github" }, "original": { @@ -510,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 9f1773b..cef6ed7 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -6,14 +6,12 @@ let mm = lib.versions.majorMinor version; tkgPatches = [ - "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" "0002-clear-patches" - "0002-mm-Support-soft-dirty-flag-read-with-reset" "0003-glitched-base" "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" - "0007-v${mm}-winesync" +# "0007-v${mm}-winesync" currently fails to patch "0012-misc-additions" ]; diff --git a/users/rin/packages.nix b/users/rin/packages.nix index b541f31..e6c8f0c 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -28,7 +28,6 @@ gimp gnome.file-roller gnome.zenity - kotatogram-desktop krita lm_sensors lutris @@ -37,7 +36,6 @@ mangohud me.tetrio-desktop-plus inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin - inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol prismlauncher psensor From 4edcad74e4055ff69f4c4f47a2447a479bb959b2 Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 17:38:20 +0700 Subject: [PATCH 004/584] ujarofjia --- packages/linux-lava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index 17b15ef..8d5cd59 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -4,14 +4,14 @@ , inputs , kernelPatches , lib -, llvmPackages_16 +, llvmPackages_17 , overrideCC , ... } @ args: let sources = callPackage ./sources.nix { inherit inputs; }; - llvmPackages = llvmPackages_16; + llvmPackages = llvmPackages_17; kernel = buildLinux (args // { inherit (sources) src kernelPatches; stdenv = ccacheStdenv.override { From d1688ad0d98ec7a5418d0514cf677ca7c36bf84e Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 17:52:43 +0700 Subject: [PATCH 005/584] test --- packages/linux-lava/sources.nix | 10 +++++---- pathc.patch | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 pathc.patch diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index cef6ed7..9b0ba41 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,17 +1,19 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.7.0"; - kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; + version = "6.6.7"; + kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; mm = lib.versions.majorMinor version; tkgPatches = [ + "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" "0002-clear-patches" + "0002-mm-Support-soft-dirty-flag-read-with-reset" "0003-glitched-base" "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" -# "0007-v${mm}-winesync" currently fails to patch + "0007-v${mm}-winesync" "0012-misc-additions" ]; @@ -35,7 +37,7 @@ in { }; kernelPatches = [ - #kernelPatchSrc + kernelPatchSrc ] ++ builtins.map (name: { inherit name; diff --git a/pathc.patch b/pathc.patch new file mode 100644 index 0000000..7269733 --- /dev/null +++ b/pathc.patch @@ -0,0 +1,36 @@ +diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix +index 9b0ba41..cef6ed7 100644 +--- a/packages/linux-lava/sources.nix ++++ b/packages/linux-lava/sources.nix +@@ -1,19 +1,17 @@ + { fetchFromGitHub, inputs, lib }: + let +- version = "6.6.7"; +- kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; ++ version = "6.7.0"; ++ kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; + kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; + + mm = lib.versions.majorMinor version; + tkgPatches = [ +- "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" + "0002-clear-patches" +- "0002-mm-Support-soft-dirty-flag-read-with-reset" + "0003-glitched-base" + "0003-glitched-eevdf-additions" + "0003-glitched-cfs" + "0007-v${mm}-fsync1_via_futex_waitv" +- "0007-v${mm}-winesync" ++# "0007-v${mm}-winesync" currently fails to patch + "0012-misc-additions" + ]; + +@@ -37,7 +35,7 @@ in { + }; + + kernelPatches = [ +- kernelPatchSrc ++ #kernelPatchSrc + ] + ++ builtins.map (name: { + inherit name; From 21e2790580b4c00a7a3097ac0ccea139dd7dc0e0 Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 17:58:07 +0700 Subject: [PATCH 006/584] da --- flake.lock | 6 +++--- pdathc.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 pdathc.patch diff --git a/flake.lock b/flake.lock index 4111c00..7e9d21d 100644 --- a/flake.lock +++ b/flake.lock @@ -510,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { diff --git a/pdathc.patch b/pdathc.patch new file mode 100644 index 0000000..bcff374 --- /dev/null +++ b/pdathc.patch @@ -0,0 +1,19 @@ +diff --git a/flake.lock b/flake.lock +index 0338d1b..4111c00 100644 +--- a/flake.lock ++++ b/flake.lock +@@ -510,11 +510,11 @@ + }, + "nixpkgs_2": { + "locked": { +- "lastModified": 1702312524, +- "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", ++ "lastModified": 1705133751, ++ "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "owner": "NixOS", + "repo": "nixpkgs", +- "rev": "a9bf124c46ef298113270b1f84a164865987a91c", ++ "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "type": "github" + }, + "original": { From 015f72777b40851f4cd9de09d5aa5c667865a2fc Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 18:00:03 +0700 Subject: [PATCH 007/584] a --- packages/linux-lava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index 8d5cd59..17b15ef 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -4,14 +4,14 @@ , inputs , kernelPatches , lib -, llvmPackages_17 +, llvmPackages_16 , overrideCC , ... } @ args: let sources = callPackage ./sources.nix { inherit inputs; }; - llvmPackages = llvmPackages_17; + llvmPackages = llvmPackages_16; kernel = buildLinux (args // { inherit (sources) src kernelPatches; stdenv = ccacheStdenv.override { From 0e4b6b3064263d004560bc42bd129ea9b2f9d2e7 Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 18:20:44 +0700 Subject: [PATCH 008/584] mm --- flake.lock | 6 +- packages/linux-lava/sources.nix | 10 ++- pathc.patch | 36 ---------- pdathc.patch | 19 ----- uwa.patch | 122 ++++++++++++++++++++++++++++++++ 5 files changed, 129 insertions(+), 64 deletions(-) delete mode 100644 pathc.patch delete mode 100644 pdathc.patch create mode 100644 uwa.patch diff --git a/flake.lock b/flake.lock index 7e9d21d..4111c00 100644 --- a/flake.lock +++ b/flake.lock @@ -510,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 9b0ba41..cef6ed7 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,19 +1,17 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.6.7"; - kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; + version = "6.7.0"; + kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; mm = lib.versions.majorMinor version; tkgPatches = [ - "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" "0002-clear-patches" - "0002-mm-Support-soft-dirty-flag-read-with-reset" "0003-glitched-base" "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" - "0007-v${mm}-winesync" +# "0007-v${mm}-winesync" currently fails to patch "0012-misc-additions" ]; @@ -37,7 +35,7 @@ in { }; kernelPatches = [ - kernelPatchSrc + #kernelPatchSrc ] ++ builtins.map (name: { inherit name; diff --git a/pathc.patch b/pathc.patch deleted file mode 100644 index 7269733..0000000 --- a/pathc.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix -index 9b0ba41..cef6ed7 100644 ---- a/packages/linux-lava/sources.nix -+++ b/packages/linux-lava/sources.nix -@@ -1,19 +1,17 @@ - { fetchFromGitHub, inputs, lib }: - let -- version = "6.6.7"; -- kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; -+ version = "6.7.0"; -+ kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; - kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; - - mm = lib.versions.majorMinor version; - tkgPatches = [ -- "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" - "0002-clear-patches" -- "0002-mm-Support-soft-dirty-flag-read-with-reset" - "0003-glitched-base" - "0003-glitched-eevdf-additions" - "0003-glitched-cfs" - "0007-v${mm}-fsync1_via_futex_waitv" -- "0007-v${mm}-winesync" -+# "0007-v${mm}-winesync" currently fails to patch - "0012-misc-additions" - ]; - -@@ -37,7 +35,7 @@ in { - }; - - kernelPatches = [ -- kernelPatchSrc -+ #kernelPatchSrc - ] - ++ builtins.map (name: { - inherit name; diff --git a/pdathc.patch b/pdathc.patch deleted file mode 100644 index bcff374..0000000 --- a/pdathc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/flake.lock b/flake.lock -index 0338d1b..4111c00 100644 ---- a/flake.lock -+++ b/flake.lock -@@ -510,11 +510,11 @@ - }, - "nixpkgs_2": { - "locked": { -- "lastModified": 1702312524, -- "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", -+ "lastModified": 1705133751, -+ "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", - "owner": "NixOS", - "repo": "nixpkgs", -- "rev": "a9bf124c46ef298113270b1f84a164865987a91c", -+ "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", - "type": "github" - }, - "original": { diff --git a/uwa.patch b/uwa.patch new file mode 100644 index 0000000..caf24d1 --- /dev/null +++ b/uwa.patch @@ -0,0 +1,122 @@ +diff --git a/flake.lock b/flake.lock +index 4111c00..7e9d21d 100644 +--- a/flake.lock ++++ b/flake.lock +@@ -510,11 +510,11 @@ + }, + "nixpkgs_2": { + "locked": { +- "lastModified": 1705133751, +- "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", ++ "lastModified": 1702312524, ++ "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "owner": "NixOS", + "repo": "nixpkgs", +- "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", ++ "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "type": "github" + }, + "original": { +diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix +index cef6ed7..9b0ba41 100644 +--- a/packages/linux-lava/sources.nix ++++ b/packages/linux-lava/sources.nix +@@ -1,17 +1,19 @@ + { fetchFromGitHub, inputs, lib }: + let +- version = "6.7.0"; +- kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; ++ version = "6.6.7"; ++ kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; + kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; + + mm = lib.versions.majorMinor version; + tkgPatches = [ ++ "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" + "0002-clear-patches" ++ "0002-mm-Support-soft-dirty-flag-read-with-reset" + "0003-glitched-base" + "0003-glitched-eevdf-additions" + "0003-glitched-cfs" + "0007-v${mm}-fsync1_via_futex_waitv" +-# "0007-v${mm}-winesync" currently fails to patch ++ "0007-v${mm}-winesync" + "0012-misc-additions" + ]; + +@@ -35,7 +37,7 @@ in { + }; + + kernelPatches = [ +- #kernelPatchSrc ++ kernelPatchSrc + ] + ++ builtins.map (name: { + inherit name; +diff --git a/pathc.patch b/pathc.patch +new file mode 100644 +index 0000000..7269733 +--- /dev/null ++++ b/pathc.patch +@@ -0,0 +1,36 @@ ++diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix ++index 9b0ba41..cef6ed7 100644 ++--- a/packages/linux-lava/sources.nix +++++ b/packages/linux-lava/sources.nix ++@@ -1,19 +1,17 @@ ++ { fetchFromGitHub, inputs, lib }: ++ let ++- version = "6.6.7"; ++- kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; +++ version = "6.7.0"; +++ kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; ++ kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; ++ ++ mm = lib.versions.majorMinor version; ++ tkgPatches = [ ++- "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" ++ "0002-clear-patches" ++- "0002-mm-Support-soft-dirty-flag-read-with-reset" ++ "0003-glitched-base" ++ "0003-glitched-eevdf-additions" ++ "0003-glitched-cfs" ++ "0007-v${mm}-fsync1_via_futex_waitv" ++- "0007-v${mm}-winesync" +++# "0007-v${mm}-winesync" currently fails to patch ++ "0012-misc-additions" ++ ]; ++ ++@@ -37,7 +35,7 @@ in { ++ }; ++ ++ kernelPatches = [ ++- kernelPatchSrc +++ #kernelPatchSrc ++ ] ++ ++ builtins.map (name: { ++ inherit name; +diff --git a/pdathc.patch b/pdathc.patch +new file mode 100644 +index 0000000..bcff374 +--- /dev/null ++++ b/pdathc.patch +@@ -0,0 +1,19 @@ ++diff --git a/flake.lock b/flake.lock ++index 0338d1b..4111c00 100644 ++--- a/flake.lock +++++ b/flake.lock ++@@ -510,11 +510,11 @@ ++ }, ++ "nixpkgs_2": { ++ "locked": { ++- "lastModified": 1702312524, ++- "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", +++ "lastModified": 1705133751, +++ "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", ++ "owner": "NixOS", ++ "repo": "nixpkgs", ++- "rev": "a9bf124c46ef298113270b1f84a164865987a91c", +++ "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", ++ "type": "github" ++ }, ++ "original": { From 6567a561e3a86aaa98b1bc73b58f04084e54e3ca Mon Sep 17 00:00:00 2001 From: stubdesu Date: Mon, 15 Jan 2024 18:21:35 +0700 Subject: [PATCH 009/584] test --- packages/linux-lava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index 17b15ef..d1bc52e 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -14,14 +14,14 @@ let llvmPackages = llvmPackages_16; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - stdenv = ccacheStdenv.override { + #stdenv = ccacheStdenv.override { # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 stdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { bintools = llvmPackages.bintools.override { sharedLibraryLoader = null; }; }); - }; + #}; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; From fd126721cfa84a11f439bd2a980646cb4a19dc9e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 15 Jan 2024 23:01:29 +0700 Subject: [PATCH 010/584] uwhfaouefj --- hosts/anemone/default.nix | 4 ++++ hosts/anemone/networking.nix | 5 ++++- modules/user/hyprland.nix | 0 users/rin/default.nix | 16 +++++++++------- 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 modules/user/hyprland.nix diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index 76118cf..abf6ed6 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -36,6 +36,10 @@ ../../users/rin ]; + environment.systemPackages = with pkgs; [ wpa_supplicant_gui ]; + + programs.hyprland.enable = true; + # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index d8ca7a7..5f64fb3 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -2,7 +2,10 @@ networking = { useDHCP = true; nameservers = [ "1.1.1.1" "8.8.8.8" ]; - wireless.userControlled.enable = true; + wireless = { + enable = true; + userControlled.enable = true; + }; extraHosts = '' 192.168.100.12 strawberry diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix new file mode 100644 index 0000000..e69de29 diff --git a/users/rin/default.nix b/users/rin/default.nix index 3734f52..a9df75e 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -34,15 +34,17 @@ mpv obs rofi - spicetify +# spicetify - dunst - eww - picom +# dunst +# eww +# picom +# +# xorg +# sxhkd +# bspwm - xorg - sxhkd - bspwm + #hyprland ]; home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { From 4667653ed1857bff9fe442edc08044de4e3035c0 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 15 Jan 2024 23:31:25 +0700 Subject: [PATCH 011/584] hyprstuff --- modules/user/rofi.nix | 3 ++- users/rin/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/user/rofi.nix b/modules/user/rofi.nix index 45fcc4d..ed78204 100644 --- a/modules/user/rofi.nix +++ b/modules/user/rofi.nix @@ -1,6 +1,7 @@ -{ config, inputs, ... }: { +{ config, inputs, pkgs, ... }: { programs.rofi = { enable = true; + package = pkgs.rofi-wayland; theme = "theme"; }; xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi; diff --git a/users/rin/default.nix b/users/rin/default.nix index a9df75e..ea23526 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -36,7 +36,7 @@ rofi # spicetify -# dunst + dunst # eww # picom # From d149a7704bc481f940d73a19f9a862b4bb9bd0b4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 01:08:18 +0700 Subject: [PATCH 012/584] eww --- modules/user/eww.nix | 2 +- overlays/eww.nix | 2 +- res/eww/eww.yuck | 40 +++++++++--------------- res/eww/scripts/active-workspace.sh | 6 ++++ res/eww/scripts/line-workspaces.sh | 43 -------------------------- res/eww/scripts/title.sh | 15 ++++++--- res/eww/scripts/workspaces.sh | 48 ++++------------------------- users/rin/default.nix | 2 +- 8 files changed, 41 insertions(+), 117 deletions(-) create mode 100755 res/eww/scripts/active-workspace.sh delete mode 100755 res/eww/scripts/line-workspaces.sh diff --git a/modules/user/eww.nix b/modules/user/eww.nix index b0a8099..2e3e58b 100644 --- a/modules/user/eww.nix +++ b/modules/user/eww.nix @@ -1,6 +1,6 @@ # Depends on bspwm { pkgs, ... }: { - home.packages = with pkgs; [ xtitle ]; + home.packages = with pkgs; [ socat ]; programs.eww = { enable = true; configDir = ../../res/eww; diff --git a/overlays/eww.nix b/overlays/eww.nix index 8d89aa1..bea0aec 100644 --- a/overlays/eww.nix +++ b/overlays/eww.nix @@ -1,5 +1,5 @@ self: super: { - eww = super.eww.overrideAttrs (old: rec { + eww = (super.eww.override { withWayland = true; }).overrideAttrs (old: rec { patches = old.patches ++ [ # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 ) ./patches/eww.patch diff --git a/res/eww/eww.yuck b/res/eww/eww.yuck index a0a433b..60e0f8a 100644 --- a/res/eww/eww.yuck +++ b/res/eww/eww.yuck @@ -1,14 +1,3 @@ -(defwindow linebar :monitor 0 - :geometry (geometry :x "30px" - :y "0%" - :width "100%" - :height "2px" - :anchor "top center") - :stacking "fg" - :windowtype "dock" - :wm-ignore false - (wlinebar)) - (defwindow mainbar :monitor 0 :geometry (geometry :x "0%" :y "0%" @@ -16,8 +5,8 @@ :height "30px" :anchor "top center") :stacking "fg" - :windowtype "dock" - :wm-ignore false + :exclusive false + :focusable false (bar)) (defvar time-extended false) ; for :run-while property of below variable @@ -34,8 +23,6 @@ :run-while time-extended `date "+:%S"`) -(deflisten lworkspaces "./scripts/workspaces.sh") -(deflisten llineworkspaces "./scripts/line-workspaces.sh") (deflisten ltitle "./scripts/title.sh") (defwidget bar [] @@ -46,15 +33,19 @@ (title) (time)))) -(defwidget wlinebar [] - (eventbox :onscroll "./scripts/scroll.sh {}" - (line_workspaces))) - +(deflisten workspaces :initial "[]" "bash ~/.config/eww/scripts/workspaces.sh") +(deflisten current_workspace :initial "1" "bash ~/.config/eww/scripts/active-workspace.sh") (defwidget workspaces [] - (literal :content lworkspaces)) - -(defwidget line_workspaces [] - (literal :content llineworkspaces)) + (box :class "widget workspaces" + :halign "start" + :valign "center" + :vexpand true + :hexpand true + (for workspace in workspaces + (eventbox :cursor "hand" + (button :class "${workspace.id == current_workspace ? "focused" : (workspace.windows > 0 ? "occupied" : "empty")}" + :onclick "hyprctl dispatch workspace ${workspace.id}" + "${workspace.id == current_workspace ? "" : (workspace.windows > 0 ? "" : "")}"))))) (defwidget title [] (literal :content ltitle)) @@ -72,6 +63,5 @@ (time_extension :text {time-extended ? petimea : ""}) (label :text ptime :class "base") - (time_extension :text {time-extended ? petimeb : ""}) - ))) + (time_extension :text {time-extended ? petimeb : ""})))) diff --git a/res/eww/scripts/active-workspace.sh b/res/eww/scripts/active-workspace.sh new file mode 100755 index 0000000..cbdf971 --- /dev/null +++ b/res/eww/scripts/active-workspace.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' + +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | + stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' diff --git a/res/eww/scripts/line-workspaces.sh b/res/eww/scripts/line-workspaces.sh deleted file mode 100755 index 960c444..0000000 --- a/res/eww/scripts/line-workspaces.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env sh - -# Checks if a list ($1) contains an element ($2) -contains() { - for e in $1; do - [ "$e" -eq "$2" ] && echo 1 && return - done - echo 0 -} - -print_workspaces() { - buf="" - desktops=$(bspc query -D --names) - focused_desktop=$(bspc query -D -d focused --names) - occupied_desktops=$(bspc query -D -d .occupied --names) - urgent_desktops=$(bspc query -D -d .urgent --names) - - for d in $desktops; do - if [ "$(contains "$focused_desktop" "$d")" -eq 1 ]; then - ws=$d - class="focused" - elif [ "$(contains "$occupied_desktops" "$d")" -eq 1 ]; then - ws=$d - class="occupied" - elif [ "$(contains "$urgent_desktops" "$d")" -eq 1 ]; then - ws=$d - class="urgent" - else - ws=$d - class="empty" - fi - - buf="$buf (eventbox :cursor \"hand\" (button :class \"$class\" :onclick \"bspc desktop -f $ws\" \"\"))" - done - - echo "(box :class \"widget line-workspaces\" :halign \"start\" :valign \"center\" :vexpand true :hexpand true $buf)" -} - -# Listen to bspwm changes -print_workspaces -bspc subscribe desktop node_transfer | while read -r _ ; do - print_workspaces -done diff --git a/res/eww/scripts/title.sh b/res/eww/scripts/title.sh index 26664ba..baaffdf 100755 --- a/res/eww/scripts/title.sh +++ b/res/eww/scripts/title.sh @@ -1,10 +1,17 @@ #!/usr/bin/env sh -xtitle -s | while read -r line ; do - trunc=$(echo $line | cut -c-85) - if [ -z "$line" ]; then +out () { + if [ -z "$1" ]; then echo "" else - echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"${trunc}\"))" + echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"$1\"))" fi +} + +init=$(hyprctl activewindow -j | jq --raw-output .title) +out "$init" + +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do + trunc=$(echo $line | cut -c-85) + out "$trunc" done diff --git a/res/eww/scripts/workspaces.sh b/res/eww/scripts/workspaces.sh index 3eb9b52..a496f8f 100755 --- a/res/eww/scripts/workspaces.sh +++ b/res/eww/scripts/workspaces.sh @@ -1,47 +1,11 @@ #!/usr/bin/env sh -# Checks if a list ($1) contains an element ($2) -contains() { - for e in $1; do - [ "$e" -eq "$2" ] && echo 1 && return - done - echo 0 +spaces (){ + WORKSPACE_WINDOWS=$(hyprctl workspaces -j | jq 'map({key: .id | tostring, value: .windows}) | from_entries') + seq 1 10 | jq --argjson windows "${WORKSPACE_WINDOWS}" --slurp -Mc 'map(tostring) | map({id: ., windows: ($windows[.]//0)})' } -print_workspaces() { - buf="" - desktops=$(bspc query -D --names) - focused_desktop=$(bspc query -D -d focused --names) - occupied_desktops=$(bspc query -D -d .occupied --names) - urgent_desktops=$(bspc query -D -d .urgent --names) - - for d in $desktops; do - if [ "$(contains "$focused_desktop" "$d")" -eq 1 ]; then - ws=$d - icon="" - class="focused" - elif [ "$(contains "$occupied_desktops" "$d")" -eq 1 ]; then - ws=$d - icon="" - class="occupied" - elif [ "$(contains "$urgent_desktops" "$d")" -eq 1 ]; then - ws=$d - icon="" - class="urgent" - else - ws=$d - icon="" - class="empty" - fi - - buf="$buf (eventbox :cursor \"hand\" (button :class \"$class\" :onclick \"bspc desktop -f $ws\" \"$icon\"))" - done - - echo "(box :class \"widget workspaces\" :halign \"start\" :valign \"center\" :vexpand true :hexpand true $buf)" -} - -# Listen to bspwm changes -print_workspaces -bspc subscribe desktop node_transfer | while read -r _ ; do - print_workspaces +spaces +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do + spaces done diff --git a/users/rin/default.nix b/users/rin/default.nix index ea23526..0f726f0 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -37,7 +37,7 @@ # spicetify dunst -# eww + eww # picom # # xorg From e1e28a4b2fc7941e47fcccfd71d2944c1ed29274 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 13:33:43 +0700 Subject: [PATCH 013/584] whew --- packages/linux-lava/default.nix | 4 ++-- res/eww/eww.yuck | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index d1bc52e..17b15ef 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -14,14 +14,14 @@ let llvmPackages = llvmPackages_16; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - #stdenv = ccacheStdenv.override { + stdenv = ccacheStdenv.override { # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 stdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { bintools = llvmPackages.bintools.override { sharedLibraryLoader = null; }; }); - #}; + }; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; diff --git a/res/eww/eww.yuck b/res/eww/eww.yuck index 60e0f8a..73d718b 100644 --- a/res/eww/eww.yuck +++ b/res/eww/eww.yuck @@ -33,8 +33,8 @@ (title) (time)))) -(deflisten workspaces :initial "[]" "bash ~/.config/eww/scripts/workspaces.sh") -(deflisten current_workspace :initial "1" "bash ~/.config/eww/scripts/active-workspace.sh") +(deflisten workspaces :initial "[]" "./scripts/workspaces.sh") +(deflisten current_workspace :initial "1" "./scripts/active-workspace.sh") (defwidget workspaces [] (box :class "widget workspaces" :halign "start" From 1a2f9e80942962a432ce7fc45a333c2e54df1966 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 13:52:15 +0700 Subject: [PATCH 014/584] rma --- uwa.patch | 122 ------------------------------------------------------ 1 file changed, 122 deletions(-) delete mode 100644 uwa.patch diff --git a/uwa.patch b/uwa.patch deleted file mode 100644 index caf24d1..0000000 --- a/uwa.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/flake.lock b/flake.lock -index 4111c00..7e9d21d 100644 ---- a/flake.lock -+++ b/flake.lock -@@ -510,11 +510,11 @@ - }, - "nixpkgs_2": { - "locked": { -- "lastModified": 1705133751, -- "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", -+ "lastModified": 1702312524, -+ "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", - "owner": "NixOS", - "repo": "nixpkgs", -- "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", -+ "rev": "a9bf124c46ef298113270b1f84a164865987a91c", - "type": "github" - }, - "original": { -diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix -index cef6ed7..9b0ba41 100644 ---- a/packages/linux-lava/sources.nix -+++ b/packages/linux-lava/sources.nix -@@ -1,17 +1,19 @@ - { fetchFromGitHub, inputs, lib }: - let -- version = "6.7.0"; -- kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; -+ version = "6.6.7"; -+ kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; - kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; - - mm = lib.versions.majorMinor version; - tkgPatches = [ -+ "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" - "0002-clear-patches" -+ "0002-mm-Support-soft-dirty-flag-read-with-reset" - "0003-glitched-base" - "0003-glitched-eevdf-additions" - "0003-glitched-cfs" - "0007-v${mm}-fsync1_via_futex_waitv" --# "0007-v${mm}-winesync" currently fails to patch -+ "0007-v${mm}-winesync" - "0012-misc-additions" - ]; - -@@ -35,7 +37,7 @@ in { - }; - - kernelPatches = [ -- #kernelPatchSrc -+ kernelPatchSrc - ] - ++ builtins.map (name: { - inherit name; -diff --git a/pathc.patch b/pathc.patch -new file mode 100644 -index 0000000..7269733 ---- /dev/null -+++ b/pathc.patch -@@ -0,0 +1,36 @@ -+diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix -+index 9b0ba41..cef6ed7 100644 -+--- a/packages/linux-lava/sources.nix -++++ b/packages/linux-lava/sources.nix -+@@ -1,19 +1,17 @@ -+ { fetchFromGitHub, inputs, lib }: -+ let -+- version = "6.6.7"; -+- kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; -++ version = "6.7.0"; -++ kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; -+ kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; -+ -+ mm = lib.versions.majorMinor version; -+ tkgPatches = [ -+- "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" -+ "0002-clear-patches" -+- "0002-mm-Support-soft-dirty-flag-read-with-reset" -+ "0003-glitched-base" -+ "0003-glitched-eevdf-additions" -+ "0003-glitched-cfs" -+ "0007-v${mm}-fsync1_via_futex_waitv" -+- "0007-v${mm}-winesync" -++# "0007-v${mm}-winesync" currently fails to patch -+ "0012-misc-additions" -+ ]; -+ -+@@ -37,7 +35,7 @@ in { -+ }; -+ -+ kernelPatches = [ -+- kernelPatchSrc -++ #kernelPatchSrc -+ ] -+ ++ builtins.map (name: { -+ inherit name; -diff --git a/pdathc.patch b/pdathc.patch -new file mode 100644 -index 0000000..bcff374 ---- /dev/null -+++ b/pdathc.patch -@@ -0,0 +1,19 @@ -+diff --git a/flake.lock b/flake.lock -+index 0338d1b..4111c00 100644 -+--- a/flake.lock -++++ b/flake.lock -+@@ -510,11 +510,11 @@ -+ }, -+ "nixpkgs_2": { -+ "locked": { -+- "lastModified": 1702312524, -+- "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", -++ "lastModified": 1705133751, -++ "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", -+ "owner": "NixOS", -+ "repo": "nixpkgs", -+- "rev": "a9bf124c46ef298113270b1f84a164865987a91c", -++ "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", -+ "type": "github" -+ }, -+ "original": { From 74d7cb64b82d00366965c37b7323dfdba7c138c4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 13:55:31 +0700 Subject: [PATCH 015/584] hm --- users/rin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/rin/default.nix b/users/rin/default.nix index 0f726f0..9f33e51 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -39,7 +39,7 @@ dunst eww # picom -# +# # xorg # sxhkd # bspwm From 9223a71650595b7a0f3bd1c60cfe3101ccdbddda Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 14:35:47 +0700 Subject: [PATCH 016/584] fitmware tewst --- overlays/default.nix | 1 + overlays/linux-firmware.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 overlays/linux-firmware.nix diff --git a/overlays/default.nix b/overlays/default.nix index d6c9151..5e39c5c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,6 +4,7 @@ builtins.map (path: import path) [ ./corectrl.nix ./discord.nix ./eww.nix + ./linux-firmware.nix ./material-icons.nix ./picom.nix ./rofi.nix diff --git a/overlays/linux-firmware.nix b/overlays/linux-firmware.nix new file mode 100644 index 0000000..7020eda --- /dev/null +++ b/overlays/linux-firmware.nix @@ -0,0 +1,20 @@ +self: super: { + linux-firmware = super.linux-firmware.overrideAttrs(o: { + postInstall = '' + ls -al + cd cirrus + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin.xz + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin.xz + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin.xz + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin.xz + + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin.xz + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin.xz + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin.xz + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin.xz + + ln -s cs35l41-dsp1-spk-cali-10431e12.wmfw.xz cs35l41-dsp1-spk-cali-10431683.wmfw.xz + ln -s cs35l41-dsp1-spk-prot-10431e12.wmfw.xz cs35l41-dsp1-spk-prot-10431683.wmfw.xz + ''; + }); +} From 59a27fd2b6ac48640fe4e5490fb135d749e74159 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 14:37:45 +0700 Subject: [PATCH 017/584] recomment --- packages/linux-lava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index 17b15ef..d1bc52e 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -14,14 +14,14 @@ let llvmPackages = llvmPackages_16; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - stdenv = ccacheStdenv.override { + #stdenv = ccacheStdenv.override { # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 stdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { bintools = llvmPackages.bintools.override { sharedLibraryLoader = null; }; }); - }; + #}; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; From 8fbe93c70300c863b9d9d09d6a173a783e98ac34 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 15:49:15 +0700 Subject: [PATCH 018/584] lifirm --- overlays/linux-firmware.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/linux-firmware.nix b/overlays/linux-firmware.nix index 7020eda..f2815fb 100644 --- a/overlays/linux-firmware.nix +++ b/overlays/linux-firmware.nix @@ -1,7 +1,7 @@ self: super: { linux-firmware = super.linux-firmware.overrideAttrs(o: { - postInstall = '' - ls -al + installPhase = '' + ls -al cd cirrus ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin.xz ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin.xz From d0e6b9b715a14afb161d7abbaca841d842c66b06 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 16:05:32 +0700 Subject: [PATCH 019/584] ftest --- hosts/anemone/default.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index abf6ed6..fb0e817 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -9,6 +9,7 @@ #wg_hyacinth.file = ../../secrets/wg_blossom.age; #wpa_conf.file = ../../secrets/wpa_conf.age; }; + imports = with modules.system; [ inputs.home-manager.nixosModule home-manager @@ -40,6 +41,27 @@ programs.hyprland.enable = true; + hardware.firmware = [ + ( + pkgs.runCommandNoCC "cs35l41-10431683" { } '' + mkdir -p $out/lib/firmware/cirrus + cd $out/lib/firmware/cirrus + ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin.xz + ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin.xz + ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin.xz + ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin.xz + + ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin.xz + ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin.xz + ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin.xz + ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin.xz + + ln -s ./cs35l41-dsp1-spk-cali-10431e12.wmfw.xz cs35l41-dsp1-spk-cali-10431683.wmfw.xz + ln -s ./cs35l41-dsp1-spk-prot-10431e12.wmfw.xz cs35l41-dsp1-spk-prot-10431683.wmfw.xz + '' + ) + ]; + # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" From 2a1e0f6d7e57418222d298b04539842e36d9e5cc Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 16:57:00 +0700 Subject: [PATCH 020/584] fwww --- hosts/anemone/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index fb0e817..0daf0ec 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -41,23 +41,25 @@ programs.hyprland.enable = true; - hardware.firmware = [ + hardware.firmware = let + fw = "${pkgs.linux-firmware}/lib/firmware/cirrus/"; + in [ ( pkgs.runCommandNoCC "cs35l41-10431683" { } '' mkdir -p $out/lib/firmware/cirrus cd $out/lib/firmware/cirrus - ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin.xz - ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin.xz - ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin.xz - ln -s ./cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin.xz + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin - ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin.xz - ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin.xz - ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin.xz - ln -s ./cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin.xz + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin - ln -s ./cs35l41-dsp1-spk-cali-10431e12.wmfw.xz cs35l41-dsp1-spk-cali-10431683.wmfw.xz - ln -s ./cs35l41-dsp1-spk-prot-10431e12.wmfw.xz cs35l41-dsp1-spk-prot-10431683.wmfw.xz + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12.wmfw cs35l41-dsp1-spk-cali-10431683.wmfw + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12.wmfw cs35l41-dsp1-spk-prot-10431683.wmfw '' ) ]; From 8b45b4225400ba3c29082746af65dda6826e45c4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 17:09:47 +0700 Subject: [PATCH 021/584] anemone/networking: allow imperative networks --- hosts/anemone/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 5f64fb3..31ee7bd 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -5,6 +5,7 @@ wireless = { enable = true; userControlled.enable = true; + #allowAuxiliaryImperativeNetworks = true; }; extraHosts = '' From fefbc964cd1dedaeb175cd0d889251eed345f847 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 17:42:39 +0700 Subject: [PATCH 022/584] packages/linux-lava: fix my spekaers --- packages/linux-lava/dsd_um3402yar.patch | 20 ++++++++++++++++++++ packages/linux-lava/sources.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 packages/linux-lava/dsd_um3402yar.patch diff --git a/packages/linux-lava/dsd_um3402yar.patch b/packages/linux-lava/dsd_um3402yar.patch new file mode 100644 index 0000000..27a13a9 --- /dev/null +++ b/packages/linux-lava/dsd_um3402yar.patch @@ -0,0 +1,20 @@ +diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c +index 2eca5822055..503f3b889f1 100644 +--- a/sound/pci/hda/cs35l41_hda_property.c ++++ b/sound/pci/hda/cs35l41_hda_property.c +@@ -54,6 +54,7 @@ + { "10431533", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, + { "10431573", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, + { "10431663", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 }, ++ { "10431683", I2C, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 }, + { "104316D3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, + { "104316F3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, + { "104317F3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, +@@ -358,6 +359,7 @@ + { "CSC3551", "10431533", generic_dsd_config }, + { "CSC3551", "10431573", generic_dsd_config }, + { "CSC3551", "10431663", generic_dsd_config }, ++ { "CSC3551", "10431683", generic_dsd_config }, + { "CSC3551", "104316D3", generic_dsd_config }, + { "CSC3551", "104316F3", generic_dsd_config }, + { "CSC3551", "104317F3", generic_dsd_config }, diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index cef6ed7..3f3f862 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -35,6 +35,7 @@ in { }; kernelPatches = [ + ./dsd_um3402yar.patch #kernelPatchSrc ] ++ builtins.map (name: { From b26de7e19a32300508aaa5ad0c4275b6c2989bfc Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 17:43:28 +0700 Subject: [PATCH 023/584] ccache --- packages/linux-lava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index d1bc52e..17b15ef 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -14,14 +14,14 @@ let llvmPackages = llvmPackages_16; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - #stdenv = ccacheStdenv.override { + stdenv = ccacheStdenv.override { # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 stdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { bintools = llvmPackages.bintools.override { sharedLibraryLoader = null; }; }); - #}; + }; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; From d908b35023e03323b9ed2bce09fa03a6a5dccc3e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 16 Jan 2024 17:45:22 +0700 Subject: [PATCH 024/584] jsolifjsnoilfjrs --- packages/linux-lava/sources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 3f3f862..55aa46f 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -35,7 +35,7 @@ in { }; kernelPatches = [ - ./dsd_um3402yar.patch + (patch ./dsd_um3402yar.patch) #kernelPatchSrc ] ++ builtins.map (name: { From 06d312100963d2702198a86ee364429cb5f05d2a Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:09:47 +0700 Subject: [PATCH 025/584] flake: bump linux-tkg and nixpkgs --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0338d1b..4111c00 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1702296374, - "narHash": "sha256-KYZFl0LVZ4FXXi2T6J5ELWWAhRO+CUrlditEv9fMCGc=", + "lastModified": 1704890137, + "narHash": "sha256-uh1ielVK71BP/MYK85KA8B8DBltFPF4oEeHXyKcMqyY=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "112adb9e50485de74c371d6efa93fb6c32a5a976", + "rev": "80fdc82a9a76b81d9fcc4a321566f285fb956e76", "type": "github" }, "original": { @@ -510,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { From 3a73b323b2c677d89566eb64682b4de6a417a21d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:10:38 +0700 Subject: [PATCH 026/584] system/kernel: remove redundant grub config --- modules/system/kernel.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix index 181ef90..e4c5b6b 100644 --- a/modules/system/kernel.nix +++ b/modules/system/kernel.nix @@ -9,7 +9,6 @@ "kernel.core_pattern" = "|/bin/false"; "kernel.sysrq" = 1; }; - loader.grub.useOSProber = true; }; hardware.enableRedistributableFirmware = true; zramSwap.enable = true; From 364ecd0516c3e5511b08ade07bdf34800c16ce7f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:12:53 +0700 Subject: [PATCH 027/584] packages/linux-lava: bump to 6.7.0 --- packages/linux-lava/sources.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 9b0ba41..50cae06 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,19 +1,17 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.6.7"; - kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; + version = "6.7.0"; + kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; mm = lib.versions.majorMinor version; tkgPatches = [ - "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" "0002-clear-patches" - "0002-mm-Support-soft-dirty-flag-read-with-reset" "0003-glitched-base" "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" - "0007-v${mm}-winesync" +# "0007-v${mm}-winesync" fails to patch "0012-misc-additions" ]; @@ -37,7 +35,7 @@ in { }; kernelPatches = [ - kernelPatchSrc + #kernelPatchSrc ] ++ builtins.map (name: { inherit name; From 7697d85a7770096ee41a4cda536a1231fddc9ee4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:13:23 +0700 Subject: [PATCH 028/584] secrets: add anemone and rekey --- secrets.nix | 3 ++- secrets/acme_dns.age | 15 ++++++--------- secrets/passwd.age | Bin 675 -> 751 bytes secrets/warden_admin.age | 16 +++++++--------- secrets/wg_blossom.age | 17 +++++++---------- secrets/wg_caramel.age | Bin 479 -> 367 bytes secrets/wg_sugarcane.age | Bin 461 -> 367 bytes secrets/wpa_conf.age | Bin 567 -> 530 bytes 8 files changed, 22 insertions(+), 29 deletions(-) diff --git a/secrets.nix b/secrets.nix index a713b13..f83332a 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,11 +1,12 @@ let + anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc"; blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj"; caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80"; sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ"; rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15"; in { - "secrets/passwd.age".publicKeys = [ blossom caramel sugarcane rin ]; + "secrets/passwd.age".publicKeys = [ anemone blossom caramel sugarcane rin ]; "secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ]; "secrets/acme_dns.age".publicKeys = [ caramel rin ]; diff --git a/secrets/acme_dns.age b/secrets/acme_dns.age index aae2a16..17f90a8 100644 --- a/secrets/acme_dns.age +++ b/secrets/acme_dns.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg dDnXFO4iUwixemx1WPFZSM15/z7xtAGjZxriBbsURRg -uv6gdP/LDmZMZu/B3IWWYEzfR+H7TJsR3Zo8hYzthQE --> ssh-ed25519 krYeuQ Yo3FXb2pDijXv2JxYvNP3IF0DADygWjIHEoUlfCw3zc -vly4m2xyGfuJxBPue0mk9dodc4YAEKYTWLwx9ljVhWs --> ,-grease -v4PvG0kmxXhjh7Jf ---- 6yg8u5a9px36osMqiVI4ZPfea+ySjKB8GR/TcCG/ZXU -qT!|E#r QT QMɑIX#:f|kSis^~^ _K}"I)GI -~ы*4A^w( \ No newline at end of file +-> ssh-ed25519 krYeuQ SBY9moNFVc8mdntk13DRWSIyoJfSuzsBrhzmaH8u51c +5QU1vtRllrmYsArw6LSktuRLQ7QbrtNBKVrOG8d2pyk +-> ssh-ed25519 U9FXlg HR/A429gFyLaUq6QSyTYv8yK5syfJbLDFzmhGGTZt1M +jCXRzzzp8vfB4n8pM6BAZr/IC9E+vBeeOm0AYGYBOe0 +--- /vlh5vuiRyVyiQpn4PZ5zBeUNaQclSW5Y5z1mR43fFg +,S=;9}J|5UjB{j-v(T7l^kɀQx^?`/N|aqxI \ No newline at end of file diff --git a/secrets/passwd.age b/secrets/passwd.age index 0e7d693b257338eabfa2faf4388d64f7ea60f713..7d2a22449bce6d1b4351487b311a26e2c4412171 100644 GIT binary patch delta 687 zcmZ3?`kr-yYFvIsWpIh3La338c|@^^aiL?Hb5f>nM!1n#d2V2+N0nDzftz+xk-mPu zxnWggUZj%&m$sKrVr5loxSye;wt;I=QAAdSc1d`)mwvfLKuJ(>j=x_~zHgyrYLJWL z{g!h$2YTrAT9^z$9d41zt9oDIUu zgFTHhO`?*s%sjFK^fTRkybJxpwOtC6ja*#0bnO(1i!*dnQ;bYa4J{QsDvZsO%N5cL zlRSdcO#_Yn0!>mYt2`|0wJS|rBGQ7w(!v}~LaNg9DkHHj7SP}OUX|(Fi5iq%TM<3@W?WBOs)#$($&>f(9TJ9HqMRo^@(sZGPm&6_6P|# z^UMq>EXgqm_bD$6GfGa*DT%1aO4Rq|S|UB`hQH2oFQu})bGIYjoHCuAy8NBca<(T~ z7R$nKD4*d}>nzZmlDm3d)$b;j9q(q_T9x!1if7|0ju7qI|3l;PfwzgR3l1neC=0na zz5dJWpF delta 608 zcmaFQx|nr>>g2nO?BSuNPGx>6&Y?j*<;GEo`mSzym6_#U;jY?wK?bG;6OmT zC8=3K>0F`Z;Re}xuCC=NNyUDiE^ZbD&Ynr-iE5LvjkE!V4WEs*;UNQlkvhqk=P>JSTn>uXk}Sb`32IGqDU$ zH*rb{uS}`%&J7F9bBih}uPAU!F^kIZGAy?Ys&qCk=St7aw@md6Newp6&hih}&nn3^ zO3cdjE-Z6OP0rFT%E~EoEcEg8Da{Nw;nKBJC@#*>O-(T}H8r$Ua1M3OiU?FlbA4n;Y!NrK_u};2G>(oKslfZ04Np?`R&BTo6$2U*hO&;pJ#%QEcp(;hPef zlIoJ<;>rXW;2Ub1M`ukK=$L8p_tIq|wM1Q@meCT{kp=VidPh_y; z@mr<0J5Imj_`O=>_k;ZpLl6Bn`abQ}kB9FPTtY9Ff7IFdBCRg?!R$v{YMgGcY+*P0 y{?dBJsbuY|8xxx~ndLTix4Nmk-xk7lXGhV6)n&8dioZEd;VVfwyy<)de*gfv4&@dA diff --git a/secrets/warden_admin.age b/secrets/warden_admin.age index 972ef49..ef48c4d 100644 --- a/secrets/warden_admin.age +++ b/secrets/warden_admin.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg YL/xEUVIIOIeP2FRVxZhkCg/yaiX50S74HSMslKzoSw -SqzuQt4hd6ICDRlq+6Vqy0j/ZuNm3waCg7pUt9EqVD0 --> ssh-ed25519 krYeuQ IsFu0w7BFrTm5rAE6Ysxuievf3NiC60h/KkoUO51FUA -/BCYR/4qP+1449Kf2MY79sq0ahpjqI5fq7Sme2swU6U --> V;-grease ^F.M -lxjBnTXUAhPceJGeXm985SzVP4D2PsxkUEv/kKSx+6LGCHUzYAggYXi8C2ahorkY -XrYNvorBDG0aezi2GSicmAf4pQkkrLcvZhsmU+/QOKzyAxMw7V0 ---- jUlhN0y3o/J/jQlcN0um+lTQ3hZv2Ur0crxSsGeZ28c -DJ?w9%s5zkA3U"V3[in0kXi:LoaD'$O54&Ս² ^ULEQP/ \ No newline at end of file +-> ssh-ed25519 krYeuQ V3hCVmXcLm9tDavUNciUCqqCc7+hg6lJir0t4iUoOA4 +CH3+qpJsmjTJ9+lB7hr1nE5W9RteMtpkuJHlCOSrc0c +-> ssh-ed25519 U9FXlg VT5DxyuigkAL6btdC5Mt4vvCuzOB7xjuf/n/fYOALF0 +Ln3p2c9swsONWzPSkuY/ovv3HG8Sl/3dHpHqRHIckrU +--- sBS5K5WGRvcgrs9CRXZjvteE5qQrPhM/Trmhc7bU+dg +t f9Kh3"ԧcL\E@-nj b+BI; +(Q|0jrmHQ.hZ#l䘻1 OIptPxqCY \ No newline at end of file diff --git a/secrets/wg_blossom.age b/secrets/wg_blossom.age index 6b5df62..f7f550e 100644 --- a/secrets/wg_blossom.age +++ b/secrets/wg_blossom.age @@ -1,11 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg Y/Q29duiKdP+fV11ellTIMtHFyi9saczXfbcnq7iB0s -D9P8MAHlFOLR7P8Ux90CjljnhExARGnuSuw24AXOr5c --> ssh-ed25519 CUCjXQ eGpAJd5fydYBlC7o34CP7091jg4O4NsuLji1/rYtQVg -9/rgYCpe9wcCrLM7fTYI92oa+3+SAEK6ZgJNmBeOtnM --> A-grease xTj~+6%4 aF]RZn tj](JCp -5iDN8bexrr7eNqyFwBNCUefrOqAIS10KppbrdDJH1+fD0TkUifEOjcM2uV/+3tH2 -dYX5eM94zkmwxw ---- QKnJmu6ICTTfadXCKLKii03FXVTBqAFvbAZVHGzGLzE - ssh-ed25519 CUCjXQ iM2w01v4y0Q3DVbpGtt6f3HiHMRw7Xr08JgTB6fe8x4 +WiBMVRZr1edBVfLAPAFT4GSEGoyn9jWzO92yysNM9Mo +-> ssh-ed25519 U9FXlg Bvlaqu4nEbjfBGgBFKDmD1cBbxH2+dyz1BHzegz1AS4 ++sf3rC0J2Ik1SNtpr52GxV6G6tzGLiwlvjXFWE3qrSw +--- yaZjH1jeXqPGiw1lIkH9uz6QJo/nM1lBezbpVlJDNUM +cgj" +U"^ *ADvl2cRq).NLtZjCB5l^0)䥆. \ No newline at end of file diff --git a/secrets/wg_caramel.age b/secrets/wg_caramel.age index 2a18202bcd6cea702c270ac871e992141510fdfb..37276ac0c5d7aa79178598407f787d3ba0778cf9 100644 GIT binary patch delta 339 zcmcc5{GMroYJGN5WNK-kLRpTtrDLMLTSj)4VOEG^a&mHocV2K+mO++ZnrnW9X=QFe zMowa(XIOACS6GsHPEfIPuD7p&TUlC?wqK=Ro}Y78p|fLPabAj#Uy7q)UW8kArhkzm zm#&>cadC!jYKoDmsiCDpsHIy(PP&4JWoB8SV^ErTa(zl#rBjMYU|vq4PiBB$L0Yy^ zgnp{GnSr;dzP`43j$t}ieq?&0M_9O*MMbi9TCQ)1Z&^`9aEYNyaadZCpPNCINtm{u zzO!Ljc|;_auCA^^R!OOGMMb!qOSn@>ZmMajuc?u1v2U(_xwlJkv4v}LNnWJ6TR~c2 zvZo2x1Rtrd30;edm$+X4r_B)&*6s1t{p9+Co>7xMsx4;kKep)Z%$cvB%(~s$oo_6X mY-`!IqNl^jD!pXdvbBAG7vykWocQ{ZfY5Q->1AF&?YID5uzhR* delta 452 zcmaFQbf0;GYJI4sTSQK}LSA99hq0%Aj%SfeN>!$7ildojrg@Tqf22{OWv0KWL1ku+ zrMIhTNp5g5msv@PS%!OZq(!BXqhGeKmy3UZfqA8|yQ^Q4p=*k-t9y`RdS$kMcD{!z zm#&>cadC!jYKoDmsiCDpc2Q(%X`n(_T10T6iLskUL48QLNtAxLzhAngPlaKYNm03L zRep$Jh((~YZ=zd9dU`omaEPl}e!g*9T1IZVSwWhAgtvcMXp);(PElD@TCty3h)<cgJ4JJG%xM&$_g%BU0nr>!VH7Ts-P@S*Ssi8mnai`=ipS!?0}MRW9RaS)RF+7 zl+1`qGyg(;uTZYqJdbH^Z*&Y|!!|98xxiCpTlwqt>=j{)8SdQr&3Vo6@b72o&1`&U t)e_1~!qz)ISs(i~EkV)pXyfUIc^OL>EvEbyNtyUw;cw=Xg=szB8v$<abdbImt&fVdqI{_c3`nzc#&_3NmQVrXGyMiacOX&xo@(orE_+&Wv*j(eo1aI zm#&>cadC!jYKoDmsiCDpsHIy(PP&42ab9LgnVC_JbA3grNwII0erB*mZk2_nwyAe$ zd5Mp|K~|+>q+x17kwGz6YCvIVaIUv;fN?;WPrkNiO1QVNd!e>@l2NvAc9K_aL2+e7 zVRE>eW10n*uCA^^zN1B?sb#)?W`4Ozu2D!(qVOl|^QE`x8Nkv{n zm2o835}&?Dmk(%&ySML2$u;})F7x8Y-|cp-cAGWou3voWRGoCS-q_>n6Zh?+=GW#& nPhvk?=wx+sje6VqS5ls*&RX7k@y6&v>rJm4EIU&^)ZPaGjt_uS delta 434 zcmaFQbe4I7YJI4sTSQK}f^R@}a*2MFM^u=TS-4YyQ+ZK_Nq~M@X@)_fXNr4@e~Q0> zZ@FoHj-Q7km$|n`RkD|}XHHUXkcnSFuv3YlUv{CdYp{1(hGAq@s=leQp<7m7M7pH` zm#&>cadC!jYKoDmsiCEUM}@I@a=AjOYhsycWLl)QM}2BWWroF4aJsp#NnVnNzGJXY<`k7UQl$ZU&%l5*qRFw-oj68$7+H^0nsuGVh9Nh@Zl zirSoH1pSCr7eD)iW^L`&TR;mU^<*RDFyHIAd bSB^KX;97rXtH5mDHJ;bJ8BTnelkW}yQze$l diff --git a/secrets/wpa_conf.age b/secrets/wpa_conf.age index 60be4dbaa21a3f34ff8a9cc41e0c90ccf1fa59b0..17e93a9e7aecee8096bb02f3eea576b17cdd583a 100644 GIT binary patch delta 503 zcmdnaGKpn^YQ1x)b5=y4LP}7Oi*J=_ZfUS-WVmxih*yA7erZK`L3p`eQkschZd6`* zQG{nfXs}BcadC!jYKoDmsiCDpc2Q(%X`n)SzE^&tuWPDHe!ZVZdSZHIRhqHBM`m(xYNmHo zd1kP)QHp_Ase77nk!v8Ab7YBjfI(4VR8g6iYf`RXK!968QBJa{L4K-5KyZekQ&p%- zVVHAhPM9aUb)lAS5jp7!W?`j%-fjk|VeXj`X~9YU#zu}g7NNP$c?HS!UI9hv8RlUw z$p)#W;W_2LT;55!$$llN&Z$+7Wk$|<9{H{T7GcSu#--)y29Zww1sTcN`XQBu!MRDH zT)Mit3LYL27EYS zlPYGYJP-_dUVKeEW9E`$1-ZfbF4gb<{o(#(?|%8sjB5&u*^>NZ8~#hrb?D#cX~BJO z-KuEYh(%XlN#0~VbmHm-_Csll_dc_Wi)8AnEuFw?I)9Ji44$9AgVVz7mv3G8bDM=& k(DAtoI*QA#EV}$|!mhIA=NQ_<8(Vz-O4wiK6TEN^04Qj?)c^nh delta 541 zcmbQlvYlmuYJI4sTSQK}LQ+VOvvFWSSzdubW@S!9WSM@rXQ6+he^_XUyOB|@XNgy7 zX0}_lyMJ~*SCM&^i?)e#YKpsYP-tO}S-7!Rs!O<8scadC!jYKoDmsiCDpc2Q(%X`n)hQAI#uUWjp_e|?U-mqlPfQn*2pzIIhoUZ#6d zj<$bdkb!%kVOnyorJ)6vQ;2y%l6#VmpKpFjM0iO+nz6n|a$as)j((X(l#!c9Vrr_P zexhfducraJb$!_6=c^Drdz z+1?o@!6t6STqS8?MFml2Y33y<24+F2f!V?R5F5PBYBQkYX$;XmCqIFD@cwSU*m?>Wq)fJe!`sn-Y`h#!Gtu)f#2ze^} zdXo1=VS!IQ-D=6(2iAa&x! TGS3|Q;I$dT@9p;Lcs>FE7xTeT From 24fe2a0b9930e07e6652b6d2d1ad0ce0761f4959 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:13:56 +0700 Subject: [PATCH 029/584] rin/packages: remove kotatogram and wine-osu for now --- users/rin/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index b541f31..ab63479 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -28,7 +28,7 @@ gimp gnome.file-roller gnome.zenity - kotatogram-desktop + #kotatogram-desktop krita lm_sensors lutris @@ -37,7 +37,7 @@ mangohud me.tetrio-desktop-plus inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin - inputs.nix-gaming.packages.x86_64-linux.wine-osu + #inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol prismlauncher psensor From aaa036f0c8bd7abc6bb82cea10601b370bbd7d95 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:16:07 +0700 Subject: [PATCH 030/584] packages/linux-lava: add UM3402YAR audio patch --- packages/linux-lava/dsd_um3402yar.patch | 20 ++++++++++++++++++++ packages/linux-lava/sources.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 packages/linux-lava/dsd_um3402yar.patch diff --git a/packages/linux-lava/dsd_um3402yar.patch b/packages/linux-lava/dsd_um3402yar.patch new file mode 100644 index 0000000..27a13a9 --- /dev/null +++ b/packages/linux-lava/dsd_um3402yar.patch @@ -0,0 +1,20 @@ +diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c +index 2eca5822055..503f3b889f1 100644 +--- a/sound/pci/hda/cs35l41_hda_property.c ++++ b/sound/pci/hda/cs35l41_hda_property.c +@@ -54,6 +54,7 @@ + { "10431533", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, + { "10431573", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, + { "10431663", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 }, ++ { "10431683", I2C, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 }, + { "104316D3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, + { "104316F3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, + { "104317F3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, +@@ -358,6 +359,7 @@ + { "CSC3551", "10431533", generic_dsd_config }, + { "CSC3551", "10431573", generic_dsd_config }, + { "CSC3551", "10431663", generic_dsd_config }, ++ { "CSC3551", "10431683", generic_dsd_config }, + { "CSC3551", "104316D3", generic_dsd_config }, + { "CSC3551", "104316F3", generic_dsd_config }, + { "CSC3551", "104317F3", generic_dsd_config }, diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 50cae06..c6f501c 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -36,6 +36,7 @@ in { kernelPatches = [ #kernelPatchSrc + (patch ./dsd_um3402yar.patch) ] ++ builtins.map (name: { inherit name; From 7d9a857f77fac09fd72ff270b310899c2bafbe38 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:16:45 +0700 Subject: [PATCH 031/584] user/sessionVariables: enable electron ozone by default --- modules/user/sessionVariables.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/sessionVariables.nix b/modules/user/sessionVariables.nix index 0ec2dde..ef9caab 100644 --- a/modules/user/sessionVariables.nix +++ b/modules/user/sessionVariables.nix @@ -17,6 +17,7 @@ GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc"; LESSHISTFILE = "-"; LUTRIS_SKIP_INIT = "1"; + NIXOS_OZONE_WL = "1"; NODE_REPL_HISTORY = "${config.xdg.dataHome}/nodejs/repl_history"; NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; PUB_CACHE = "${config.xdg.cacheHome}/dart"; From 67798937bb9e3130a839abd6da249750fe0ad515 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:22:07 +0700 Subject: [PATCH 032/584] system/{greetd,gui}: slight refactor --- modules/system/greetd.nix | 5 +++++ modules/system/gui.nix | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/system/greetd.nix b/modules/system/greetd.nix index de3b6cc..2958926 100644 --- a/modules/system/greetd.nix +++ b/modules/system/greetd.nix @@ -8,4 +8,9 @@ }; }; }; + + services.xserver = { + autorun = false; + displayManager.startx.enable = true; + }; } diff --git a/modules/system/gui.nix b/modules/system/gui.nix index e9c81de..5f951e3 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -24,11 +24,7 @@ }; services.xserver = { enable = true; - autorun = false; - displayManager = { - lightdm.enable = lib.mkForce false; - startx.enable = true; - }; + displayManager.lightdm.enable = lib.mkForce false; desktopManager.xterm.enable = false; }; } From 2602b8bc1c425faf6e9f1ac61ea5cd69b44f6148 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:33:46 +0700 Subject: [PATCH 033/584] treewide: preliminary Wayland! --- modules/default.nix | 2 + modules/system/greetd.nix | 2 +- modules/user/eww-wayland.nix | 7 ++ modules/user/rofi-wayland.nix | 8 +++ overlays/eww.nix | 2 +- res/eww-wayland/eww.scss | 72 +++++++++++++++++++++ res/eww-wayland/eww.yuck | 67 +++++++++++++++++++ res/eww-wayland/scripts/active-workspace.sh | 6 ++ res/eww-wayland/scripts/title.sh | 17 +++++ res/eww-wayland/scripts/workspaces.sh | 11 ++++ users/rin/default.nix | 14 ++-- 11 files changed, 197 insertions(+), 11 deletions(-) create mode 100644 modules/user/eww-wayland.nix create mode 100644 modules/user/rofi-wayland.nix create mode 100644 res/eww-wayland/eww.scss create mode 100644 res/eww-wayland/eww.yuck create mode 100755 res/eww-wayland/scripts/active-workspace.sh create mode 100755 res/eww-wayland/scripts/title.sh create mode 100755 res/eww-wayland/scripts/workspaces.sh diff --git a/modules/default.nix b/modules/default.nix index 4c4da77..bc442dc 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -50,6 +50,7 @@ in { ./user/direnv.nix ./user/dunst.nix ./user/eww.nix + ./user/eww-wayland.nix ./user/git.nix ./user/gpg.nix ./user/kitty.nix @@ -63,6 +64,7 @@ in { ./user/picom.nix ./user/polybar.nix ./user/rofi.nix + ./user/rofi-wayland.nix ./user/sessionVariables.nix ./user/spicetify.nix ./user/sxhkd.nix diff --git a/modules/system/greetd.nix b/modules/system/greetd.nix index 2958926..4e2a41f 100644 --- a/modules/system/greetd.nix +++ b/modules/system/greetd.nix @@ -3,7 +3,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && Hyprland > $XDG_RUNTIME_DIR/Hyprland.out\"'"; user = "greeter"; }; }; diff --git a/modules/user/eww-wayland.nix b/modules/user/eww-wayland.nix new file mode 100644 index 0000000..e939a1f --- /dev/null +++ b/modules/user/eww-wayland.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ socat ]; + programs.eww = { + enable = true; + configDir = ../../res/eww-wayland; + }; +} diff --git a/modules/user/rofi-wayland.nix b/modules/user/rofi-wayland.nix new file mode 100644 index 0000000..6bb85a0 --- /dev/null +++ b/modules/user/rofi-wayland.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: { + programs.rofi = { + enable = true; + package = pkgs.rofi-wayland; + theme = "theme"; + }; + xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi; +} diff --git a/overlays/eww.nix b/overlays/eww.nix index 8d89aa1..bea0aec 100644 --- a/overlays/eww.nix +++ b/overlays/eww.nix @@ -1,5 +1,5 @@ self: super: { - eww = super.eww.overrideAttrs (old: rec { + eww = (super.eww.override { withWayland = true; }).overrideAttrs (old: rec { patches = old.patches ++ [ # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 ) ./patches/eww.patch diff --git a/res/eww-wayland/eww.scss b/res/eww-wayland/eww.scss new file mode 100644 index 0000000..08b2270 --- /dev/null +++ b/res/eww-wayland/eww.scss @@ -0,0 +1,72 @@ +$background: #1a1b26; +$accent: #9d7cd8; +$foreground: #c0caf5; + +* { + all: unset; +} + +window { + background: transparent; +} + +.bar { + margin: 5px 20px 0px 20px; +} + +.widget { + background: $background; + color: $foreground; + font-family: "Noto Sans"; + font-weight: 600; + font-size: 15px; + padding: 5px 15px; + border-radius: 50px; +} + +.time { + .base { + font-weight: 700; + } + .extension { + font-weight: 500; + color: rgba($foreground, .7); + } +} + +.workspaces { + padding: 5px 10px; + font-size: 22px; + + button { + padding: 0px 2px; + } + + .empty, .occupied { + color: $accent; + } +} + +.widget.line-workspaces { + color: transparent; + padding: 0; + border-radius: 0; + font-size: 0; + + button { + padding: 0 13px; + } + + .empty { + background-color: $background; + } + + .occupied { + background-color: $accent; + } + + .focused { + background-color: $foreground; + } +} + diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck new file mode 100644 index 0000000..6a89d2b --- /dev/null +++ b/res/eww-wayland/eww.yuck @@ -0,0 +1,67 @@ +(defwindow mainbar :monitor 0 + :geometry (geometry :x "0%" + :y "0%" + :width "100%" + :height "30px" + :anchor "top center") + :stacking "fg" + :exclusive false + :focusable false + (bar)) + +(defvar time-extended false) ; for :run-while property of below variable + ; when this turns true, the polling starts and + ; var gets updated with given interval + +(defpoll ptime :interval "1s" + :run-while !time-extended + `date +%H:%M`) +(defpoll petimea :interval "1s" + :run-while time-extended + `date "+%A, %d %B %Y "`) +(defpoll petimeb :interval "1s" + :run-while time-extended + `date "+:%S"`) + +(deflisten ltitle "./scripts/title.sh") +(deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh") +(deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh") + +(defwidget bar [] + (eventbox :onscroll "./scripts/scroll.sh {}" + (centerbox :orientation "h" + :class "bar" + (workspaces) + (title) + (time)))) + +(defwidget workspaces [] + (box :class "widget workspaces" + :halign "start" + :valign "center" + :vexpand true + :hexpand true + (for workspace in lworkspaces + (eventbox :cursor "hand" + (button :class "${workspace.id == lcurrent_workspace ? "focused" : (workspace.windows > 0 ? "occupied" : "empty")}" + :onclick "hyprctl dispatch workspace ${workspace.id}" + "${workspace.id == lcurrent_workspace ? "" : (workspace.windows > 0 ? "" : "")}"))))) + +(defwidget title [] + (literal :content ltitle)) + +(defwidget time_extension [text] + (label :text text + :class "extension")) + +(defwidget time [] + (button :onclick `eww update time-extended=${time-extended ? "false" : "true"}` + (box :orientation "horizontal" + :space-evenly false + :halign "end" + :class "widget time" + (time_extension :text {time-extended ? petimea : ""}) + (label :text ptime + :class "base") + (time_extension :text {time-extended ? petimeb : ""})))) + diff --git a/res/eww-wayland/scripts/active-workspace.sh b/res/eww-wayland/scripts/active-workspace.sh new file mode 100755 index 0000000..cbdf971 --- /dev/null +++ b/res/eww-wayland/scripts/active-workspace.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' + +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | + stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' diff --git a/res/eww-wayland/scripts/title.sh b/res/eww-wayland/scripts/title.sh new file mode 100755 index 0000000..baaffdf --- /dev/null +++ b/res/eww-wayland/scripts/title.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env sh + +out () { + if [ -z "$1" ]; then + echo "" + else + echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"$1\"))" + fi +} + +init=$(hyprctl activewindow -j | jq --raw-output .title) +out "$init" + +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do + trunc=$(echo $line | cut -c-85) + out "$trunc" +done diff --git a/res/eww-wayland/scripts/workspaces.sh b/res/eww-wayland/scripts/workspaces.sh new file mode 100755 index 0000000..a496f8f --- /dev/null +++ b/res/eww-wayland/scripts/workspaces.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +spaces (){ + WORKSPACE_WINDOWS=$(hyprctl workspaces -j | jq 'map({key: .id | tostring, value: .windows}) | from_entries') + seq 1 10 | jq --argjson windows "${WORKSPACE_WINDOWS}" --slurp -Mc 'map(tostring) | map({id: ., windows: ($windows[.]//0)})' +} + +spaces +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do + spaces +done diff --git a/users/rin/default.nix b/users/rin/default.nix index 3734f52..78bdd09 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -2,7 +2,7 @@ programs.zsh.enable = true; users.users.rin = { isNormalUser = true; - extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "video" "wheel" ]; + extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ]; shell = pkgs.zsh; uid = 1001; passwordFile = config.age.secrets.passwd.path; @@ -33,18 +33,14 @@ kitty mpv obs - rofi - spicetify + rofi-wayland dunst - eww - picom - - xorg - sxhkd - bspwm + eww-wayland ]; + services.mpris-proxy.enable = true; + home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe"; sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns"; From 1ba66868bef91b3530f3c61e9ae6d9898dcd841b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:37:48 +0700 Subject: [PATCH 034/584] system/bluetooth: init --- modules/default.nix | 1 + modules/system/bluetooth.nix | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 modules/system/bluetooth.nix diff --git a/modules/default.nix b/modules/default.nix index bc442dc..60cea74 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -27,6 +27,7 @@ in { system = mkAttrsFromPaths [ ./system/audio.nix ./system/base.nix + ./system/bluetooth.nix ./system/ccache.nix ./system/corectrl.nix ./system/flatpak.nix diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix new file mode 100644 index 0000000..1e2a72e --- /dev/null +++ b/modules/system/bluetooth.nix @@ -0,0 +1,6 @@ +{ ... }: { + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; +} From 1700e735f6a7ffb568c1e0648a3cf33205269eec Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:40:02 +0700 Subject: [PATCH 035/584] hosts/anemone: init --- flake.nix | 1 + hosts/anemone/default.nix | 44 +++++++++++++++++++++++++++++++++ hosts/anemone/filesystem.nix | 36 +++++++++++++++++++++++++++ hosts/anemone/kernel.nix | 47 ++++++++++++++++++++++++++++++++++++ hosts/anemone/networking.nix | 15 ++++++++++++ 5 files changed, 143 insertions(+) create mode 100644 hosts/anemone/default.nix create mode 100644 hosts/anemone/filesystem.nix create mode 100644 hosts/anemone/kernel.nix create mode 100644 hosts/anemone/networking.nix diff --git a/flake.nix b/flake.nix index d5ef5c7..e6aa1ef 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ }; in { + nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true []; nixosConfigurations."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true []; diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix new file mode 100644 index 0000000..8ae4d4c --- /dev/null +++ b/hosts/anemone/default.nix @@ -0,0 +1,44 @@ +{ config, inputs, modules, overlays, pkgs, ... }: { + networking.hostName = "anemone"; + system.stateVersion = "23.11"; + time.timeZone = "Asia/Phnom_Penh"; + + nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; + age.secrets = { + passwd.file = ../../secrets/passwd.age; + }; + + imports = with modules.system; [ + inputs.home-manager.nixosModule + home-manager + + audio + base + bluetooth + ccache + corectrl + flatpak + greetd + gui + input + kernel + nix + packages + printing + security + snapper + + ./filesystem.nix + ./kernel.nix + ./networking.nix + + ../../users/rin + ]; + + programs.hyprland.enable = true; + + # For steam fhs-env + nixpkgs.config.permittedInsecurePackages = [ + "openssl-1.1.1w" + ]; +} diff --git a/hosts/anemone/filesystem.nix b/hosts/anemone/filesystem.nix new file mode 100644 index 0000000..1c984e8 --- /dev/null +++ b/hosts/anemone/filesystem.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: +let + mkLabelMount = label: type: lazy: { + device = "/dev/disk/by-label/${label}"; + fsType = type; + options = [ "defaults" "relatime" ] ++ lib.optionals lazy [ "nofail" ]; + }; + mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" false // { + options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ]; + }; + submount = mkBtrfsMount "Anemone"; +in +{ + fileSystems = { + "/" = { + device = "rootfs"; + fsType = "tmpfs"; + options = [ "defaults" "size=8G" "mode=755" ]; + }; + "/boot" = mkLabelMount "SYSTEM" "vfat" true; + + "/mnt/butter" = submount "/" true; + "/nix" = submount "/current/snow" false; + "/home" = submount "/current/home" true; + "/home/.snapshots" = submount "/snapshot/home" false; + "/root" = submount "/current/root" false; + "/var" = submount "/current/var" false; + "/persist" = { + depends = [ "/var" ]; + device = "/var/persist"; + fsType = "none"; + options = [ "bind" ]; + neededForBoot = true; + }; + }; +} diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix new file mode 100644 index 0000000..a8d8cad --- /dev/null +++ b/hosts/anemone/kernel.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: { + boot = { + consoleLogLevel = 0; + loader = { + efi.canTouchEfiVariables = true; + systemd-boot.enable = true; + }; + initrd = { + availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + verbose = false; + }; + kernelModules = [ "kvm-amd" ]; + kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); + kernelParams = [ + "quiet" + "console=tty2" + "systemd.show_status=0" + "rd.systemd.show_status=0" + "rd.udev.log_level=3" + "udev.log_level=3" + "udev.log_priority=3" + ]; + }; + + hardware.cpu.amd.updateMicrocode = true; + + hardware.firmware = let + fw = "${pkgs.linux-firmware}/lib/firmware/cirrus/"; + in [( + pkgs.runCommandNoCC "cs35l41-10431683" { } '' + mkdir -p $out/lib/firmware/cirrus + cd $out/lib/firmware/cirrus + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin + + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin + + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12.wmfw cs35l41-dsp1-spk-cali-10431683.wmfw + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12.wmfw cs35l41-dsp1-spk-prot-10431683.wmfw + '' + )]; +} diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix new file mode 100644 index 0000000..0431249 --- /dev/null +++ b/hosts/anemone/networking.nix @@ -0,0 +1,15 @@ +{ config, ... }: { + networking = { + nameservers = [ "1.1.1.1" "8.8.8.8" ]; + wireless.iwd.enable = true; + + networkmanager = { + enable = true; + wifi.backend = "iwd"; + }; + + extraHosts = '' + 192.168.100.16 hyacinth + ''; + }; +} From 06251d8da5de726d8f5134c4dd6e7e4d3ddc125e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 15:45:58 +0700 Subject: [PATCH 036/584] user/neovim: add additional treesitter grammars --- modules/user/neovim.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix index dbe6b0a..c90448b 100644 --- a/modules/user/neovim.nix +++ b/modules/user/neovim.nix @@ -51,21 +51,27 @@ in { #(pkgs.me.nvim-treesitter-nightly.withPlugins (p: with p; [ (nvim-treesitter.withPlugins (p: with p; [ + tree-sitter-bash + tree-sitter-c tree-sitter-c-sharp - pkgs.me.tree-sitter-glimmer + tree-sitter-cpp tree-sitter-html tree-sitter-javascript tree-sitter-json - pkgs.me.tree-sitter-jsonc tree-sitter-lua + tree-sitter-markdown tree-sitter-nix tree-sitter-php tree-sitter-prisma + tree-sitter-python + tree-sitter-query tree-sitter-regex tree-sitter-rust tree-sitter-toml - tree-sitter-typescript tree-sitter-tsx + tree-sitter-typescript + tree-sitter-vim + tree-sitter-vimdoc tree-sitter-yaml ])) ]; From f1b6d5c0e73c54abc16a53248369f73cdbc66793 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 17 Jan 2024 18:20:59 +0700 Subject: [PATCH 037/584] flake: unlock and bump nix-gamign --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 4111c00..991f21e 100644 --- a/flake.lock +++ b/flake.lock @@ -393,17 +393,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1701364751, - "narHash": "sha256-E1bufKdUPp3r+Tsfj0DyvuFz/hABUsQ/2n2NynPf0iw=", + "lastModified": 1705434512, + "narHash": "sha256-bQJjtlHWU5aOnEtbZfMRuqXvHd5ufQEVATDY0gN4ZCA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "81af8b6232ed99c46413ca6d43aeb185c53f65b8", + "rev": "e2abe296c5fb4673207e0c2b45b12507629970e5", "type": "github" }, "original": { "owner": "fufexan", "repo": "nix-gaming", - "rev": "81af8b6232ed99c46413ca6d43aeb185c53f65b8", "type": "github" } }, diff --git a/flake.nix b/flake.nix index e6aa1ef..feae5da 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; - nix-gaming.url = "github:fufexan/nix-gaming/81af8b6232ed99c46413ca6d43aeb185c53f65b8"; + nix-gaming.url = "github:fufexan/nix-gaming"; # services hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; }; From 5e5fc24e5954d595d12609851a44f839e9c3e013 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 18 Jan 2024 12:03:39 +0700 Subject: [PATCH 038/584] system/nix: add rin to trusted users --- modules/system/nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/system/nix.nix b/modules/system/nix.nix index dc16ed4..be8c472 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -15,6 +15,7 @@ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; trusted-substituters = substituters; + trusted-users = [ "root" "rin" ]; }; extraOptions = '' From 5c343c2e0ca04fdda0bfbb5a769fb49e8cbfd020 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 26 Jan 2024 20:55:34 +0700 Subject: [PATCH 039/584] rin/packages: add vscode --- users/rin/packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index ab63479..ef6780a 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -48,6 +48,12 @@ transmission-remote-gtk virt-manager winetricks + (vscode-with-extensions.override { + vscodeExtensions = with vscode-extensions; [ + ms-vsliveshare.vsliveshare + vscodevim.vim + ]; + }) xclip xorg.xgamma ]; From 2801e946d28839085111ce40efb89fde0ab64917 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 27 Jan 2024 13:21:23 +0700 Subject: [PATCH 040/584] rin/packages: add swaybg --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index ef6780a..aff0d4d 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -28,6 +28,7 @@ gimp gnome.file-roller gnome.zenity + swaybg #kotatogram-desktop krita lm_sensors From 07eae0a0ebede33db64b841410e82b8b589f7772 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 27 Jan 2024 13:46:14 +0700 Subject: [PATCH 041/584] user/eww: always show extended time --- res/eww-wayland/eww.yuck | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 6a89d2b..899195f 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -9,18 +9,11 @@ :focusable false (bar)) -(defvar time-extended false) ; for :run-while property of below variable - ; when this turns true, the polling starts and - ; var gets updated with given interval - (defpoll ptime :interval "1s" - :run-while !time-extended `date +%H:%M`) (defpoll petimea :interval "1s" - :run-while time-extended `date "+%A, %d %B %Y "`) (defpoll petimeb :interval "1s" - :run-while time-extended `date "+:%S"`) (deflisten ltitle "./scripts/title.sh") @@ -55,13 +48,11 @@ :class "extension")) (defwidget time [] - (button :onclick `eww update time-extended=${time-extended ? "false" : "true"}` - (box :orientation "horizontal" - :space-evenly false - :halign "end" - :class "widget time" - (time_extension :text {time-extended ? petimea : ""}) - (label :text ptime - :class "base") - (time_extension :text {time-extended ? petimeb : ""})))) - + (box :orientation "horizontal" + :space-evenly false + :halign "end" + :class "widget time" + (time_extension :text petimea) + (label :text ptime + :class "base") + (time_extension :text petimeb))) From 1c4fe002720be6812b6b040ec693bbc40494b45f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 27 Jan 2024 13:52:10 +0700 Subject: [PATCH 042/584] user/eww: fix null title --- res/eww-wayland/eww.yuck | 2 +- res/eww-wayland/scripts/title.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 899195f..a5bb2d1 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -16,7 +16,7 @@ (defpoll petimeb :interval "1s" `date "+:%S"`) -(deflisten ltitle "./scripts/title.sh") +(deflisten ltitle :initial "" "./scripts/title.sh") (deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh") (deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh") diff --git a/res/eww-wayland/scripts/title.sh b/res/eww-wayland/scripts/title.sh index baaffdf..9b19289 100755 --- a/res/eww-wayland/scripts/title.sh +++ b/res/eww-wayland/scripts/title.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh out () { - if [ -z "$1" ]; then + if [ -z "$1" ] || [ "$1" == "null" ]; then echo "" else echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"$1\"))" From 2aad80ddb0f21790d5214789bbf4f27217371178 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 27 Jan 2024 15:51:39 +0700 Subject: [PATCH 043/584] rin/packages: add gamescope --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index aff0d4d..cac2bf6 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -25,6 +25,7 @@ element-desktop eww feh + gamescope gimp gnome.file-roller gnome.zenity From 3b41385a967550be5e0b1d192fe129427c046c3b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 11 Feb 2024 21:01:47 +0700 Subject: [PATCH 044/584] rin/packages: add grim and slurp --- users/rin/packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index cac2bf6..2dd65a1 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -29,7 +29,7 @@ gimp gnome.file-roller gnome.zenity - swaybg + grim #kotatogram-desktop krita lm_sensors @@ -46,6 +46,8 @@ qbittorrent rivalcfg screenkey + slurp + swaybg tor-browser-bundle-bin transmission-remote-gtk virt-manager From 78f45a4fe8d8a293b8d39a3553ea55ac0032725f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 19 Feb 2024 11:39:58 +0700 Subject: [PATCH 045/584] hosts/anemone: change timezone --- hosts/anemone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index 8ae4d4c..8a8f995 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -1,7 +1,7 @@ { config, inputs, modules, overlays, pkgs, ... }: { networking.hostName = "anemone"; system.stateVersion = "23.11"; - time.timeZone = "Asia/Phnom_Penh"; + time.timeZone = "Australia/Melbourne"; nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; age.secrets = { From 56d541cfa506aa343f201628e4268d73e076d390 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 19 Feb 2024 16:32:50 +1100 Subject: [PATCH 046/584] anemone/networking: disable nm dns --- hosts/anemone/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 0431249..62f57f9 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -6,6 +6,7 @@ networkmanager = { enable = true; wifi.backend = "iwd"; + dns = "none"; }; extraHosts = '' From b5e2d10d8e80aa0a0e6e1d87bd45c758f9c5b3f5 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 19 Feb 2024 16:38:34 +1100 Subject: [PATCH 047/584] anemone/networking: try google dns --- hosts/anemone/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 62f57f9..d686053 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -1,6 +1,6 @@ { config, ... }: { networking = { - nameservers = [ "1.1.1.1" "8.8.8.8" ]; + nameservers = [ "8.8.8.8" "8.8.4.4" ]; wireless.iwd.enable = true; networkmanager = { From a1510113a51c66b0e3669af6c5f7b660c6f70adf Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 29 Feb 2024 11:32:19 +1100 Subject: [PATCH 048/584] anemone/networking: use wpa_supplicant --- hosts/anemone/networking.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index d686053..797e2d9 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -1,11 +1,10 @@ { config, ... }: { networking = { nameservers = [ "8.8.8.8" "8.8.4.4" ]; - wireless.iwd.enable = true; + wireless.enable = true; networkmanager = { enable = true; - wifi.backend = "iwd"; dns = "none"; }; From d13a8e5cd4d8cb625cb1d491c87db639aeec53f1 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 13 Mar 2024 16:00:37 +1100 Subject: [PATCH 049/584] hosts/dandelion: init --- flake.nix | 6 +++++- hosts/dandelion/default.nix | 24 ++++++++++++++++++++++++ hosts/dandelion/filesystem.nix | 34 ++++++++++++++++++++++++++++++++++ hosts/dandelion/kernel.nix | 18 ++++++++++++++++++ hosts/dandelion/networking.nix | 10 ++++++++++ hosts/dandelion/packages.nix | 14 ++++++++++++++ users/hana/default.nix | 4 ++-- 7 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 hosts/dandelion/default.nix create mode 100644 hosts/dandelion/filesystem.nix create mode 100644 hosts/dandelion/kernel.nix create mode 100644 hosts/dandelion/networking.nix create mode 100644 hosts/dandelion/packages.nix diff --git a/flake.nix b/flake.nix index feae5da..c6619c5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,10 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-raccoon.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager.url = "github:nix-community/home-manager"; home-manager-raccoon.url = "github:nix-community/home-manager/release-22.11"; + home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; nixos-hardware.url = "github:NixOS/nixos-hardware"; agenix.url = "github:ryantm/agenix"; @@ -13,6 +15,7 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; + home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; neovim-nightly.inputs.nixpkgs.follows = "nixpkgs"; nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -46,7 +49,7 @@ rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-raccoon, ... } @ inputs: + outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: let overlays = (import ./overlays) ++ [(final: prev: { @@ -81,6 +84,7 @@ ]; }]; nixosConfigurations."sugarcane" = mkSystem nixpkgs-raccoon "sugarcane" "x86_64-linux" false []; + nixosConfigurations."dandelion" = mkSystem nixpkgs-stable "dandelion" "aarch64-linux" false []; packages."x86_64-linux" = let diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix new file mode 100644 index 0000000..c3fd0a1 --- /dev/null +++ b/hosts/dandelion/default.nix @@ -0,0 +1,24 @@ +{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: { + networking.hostName = "dandelion"; + system.stateVersion = "23.11"; + time.timeZone = "Australia/Melbourne"; + + imports = with modules.system; [ + (modulesPath + "/profiles/qemu-guest.nix") + inputs.home-manager-stable.nixosModule + + base + home-manager + input + nix-stable + security + #wireguard + + ./filesystem.nix + ./kernel.nix + ./networking.nix + ./packages.nix + + ../../users/hana + ]; +} diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix new file mode 100644 index 0000000..55c9c2a --- /dev/null +++ b/hosts/dandelion/filesystem.nix @@ -0,0 +1,34 @@ +{ config, ... }: +let + bind = src: { + depends = [ "/nix" ]; + device = src; + fsType = "none"; + neededForBoot = true; + options = [ "bind" ]; + }; + + mkLabelMount = label: type: lazy: { + device = "/dev/disk/by-label/${label}"; + fsType = type; + options = [ "defaults" "relatime" ] ++ lib.optionals lazy [ "nofail" ]; + }; + mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" false // { + options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ]; + }; + submount = mkBtrfsMount "DANDELION"; +in { + fileSystems = { + "/" = { + device = "rootfs"; + fsType = "tmpfs"; + options = [ "defaults" "size=12G" "mode=755" ]; + }; + + "/boot" = mkLabelMount "UEFI" "vfat" true; + "/nix" = submount "/@/nix" false; + "/persist" = (submount "/@/persist" true) // { neededForBoot = true; }; + "/persist/.snapshots" = submount "/snap/persist" false; + "/var/log/journal" = bind "/persist/journal"; + }; +} diff --git a/hosts/dandelion/kernel.nix b/hosts/dandelion/kernel.nix new file mode 100644 index 0000000..76629f3 --- /dev/null +++ b/hosts/dandelion/kernel.nix @@ -0,0 +1,18 @@ +{ config, inputs, pkgs, ... }: { + boot = { + loader = { + systemd-boot.enable = false; + efi.canTouchEfiVariables = true; + grub = { + enable = true; + device = "/dev/sda"; + }; + }; + initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ]; + initrd.kernelModules = [ "nvme" ]; + kernel.sysctl = { + "kernel.core_pattern" = "|/bin/false"; + "kernel.sysrq" = 1; + }; + }; +} diff --git a/hosts/dandelion/networking.nix b/hosts/dandelion/networking.nix new file mode 100644 index 0000000..555dcdd --- /dev/null +++ b/hosts/dandelion/networking.nix @@ -0,0 +1,10 @@ +{ config, ... }: { + networking = { + useDHCP = true; + + # extraHosts = '' + # 10.100.0.3 blossom + # 10.100.0.4 strawberry + # ''; + }; +} diff --git a/hosts/dandelion/packages.nix b/hosts/dandelion/packages.nix new file mode 100644 index 0000000..e3e3f15 --- /dev/null +++ b/hosts/dandelion/packages.nix @@ -0,0 +1,14 @@ +{ lib, pkgs, ... }: { + environment.systemPackages = with pkgs; [ + git + htop + jq + neovim + rsync + sshfs + wget + + kitty.terminfo + ]; + environment.variables.EDITOR = "nvim"; +} diff --git a/users/hana/default.nix b/users/hana/default.nix index a7c683a..0e9276f 100644 --- a/users/hana/default.nix +++ b/users/hana/default.nix @@ -4,7 +4,7 @@ extraGroups = [ "wheel" ]; shell = pkgs.zsh; uid = 1002; - passwordFile = config.age.secrets.passwd.path; + hashedPassword = "$y$j9T$BxnsFaGwBfSKe4jAJaaxI.$cpFtu8fzFhKalIV3WGuA2jz4//KJBwhiybpnlmoZPy."; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15 rin@blossom" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5l9t8dc6mPsKKYqZlPKvhOdyqz+DS5UOcvHuh3uVGt @strawberry" @@ -15,7 +15,7 @@ home = { username = "hana"; homeDirectory = "/home/hana"; - stateVersion = "21.11"; + stateVersion = "23.11"; }; imports = with modules.user; [ From 81f935d8425ec2a92b297095364df4d95fc6ad6d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 14 Mar 2024 13:54:52 +1100 Subject: [PATCH 050/584] flake: lock inputs --- flake.lock | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/flake.lock b/flake.lock index 991f21e..84ae1c0 100644 --- a/flake.lock +++ b/flake.lock @@ -287,6 +287,27 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -507,6 +528,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1710283656, + "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1705133751, @@ -579,6 +616,7 @@ "fast-syntax-highlighting": "fast-syntax-highlighting", "home-manager": "home-manager_2", "home-manager-raccoon": "home-manager-raccoon", + "home-manager-stable": "home-manager-stable", "hosts-blocklists": "hosts-blocklists", "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", @@ -587,6 +625,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-raccoon": "nixpkgs-raccoon", + "nixpkgs-stable": "nixpkgs-stable", "nvim-treesitter": "nvim-treesitter", "packwiz": "packwiz", "pure": "pure", From a45a0bbcb5703f44c7199cb8650f381ed509b4cf Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 14 Mar 2024 13:55:04 +1100 Subject: [PATCH 051/584] flake: expose spotify-adblock --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c6619c5..48dcb21 100644 --- a/flake.nix +++ b/flake.nix @@ -94,7 +94,7 @@ }; in { - inherit (pkgs.me) linux-lava; + inherit (pkgs.me) linux-lava spotify-adblock; }; packages."aarch64-linux" = From fb9bedc9409cfe94d87130e1e9aa069861991e6b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 14 Mar 2024 13:55:31 +1100 Subject: [PATCH 052/584] anemone/networking: use wg-quick --- hosts/anemone/networking.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 797e2d9..09a21e4 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -3,6 +3,8 @@ nameservers = [ "8.8.8.8" "8.8.4.4" ]; wireless.enable = true; + wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf"; + networkmanager = { enable = true; dns = "none"; From 19e9865e8a99f0885bcfff3ff0199a3950857af6 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 14 Mar 2024 13:56:05 +1100 Subject: [PATCH 053/584] anemone/networking: remove networking.wireless --- hosts/anemone/networking.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 09a21e4..7ae5881 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -1,7 +1,6 @@ { config, ... }: { networking = { nameservers = [ "8.8.8.8" "8.8.4.4" ]; - wireless.enable = true; wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf"; From ab18a8d0a2d51d41a011607ea0f86f41dc42ed63 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 14 Mar 2024 14:03:39 +1100 Subject: [PATCH 054/584] rin/packages: add drawio --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 2dd65a1..be0c0bb 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -22,6 +22,7 @@ nodePackages_latest.pnpm ] ++ lib.optionals enableGUI [ discord-canary + drawio element-desktop eww feh From c04568cc858194831f93b896b7307e4007f5598c Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 14 Mar 2024 14:22:04 +1100 Subject: [PATCH 055/584] anemone/networking: let nm manage dns --- hosts/anemone/networking.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 7ae5881..851d7e7 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -1,12 +1,12 @@ { config, ... }: { networking = { - nameservers = [ "8.8.8.8" "8.8.4.4" ]; + #nameservers = [ "8.8.8.8" "8.8.4.4" ]; wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf"; networkmanager = { enable = true; - dns = "none"; + #dns = "none"; }; extraHosts = '' From 909ea3e2c4bb9f6b84ba52276c716aa52968f1a6 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 24 Mar 2024 14:12:05 +1100 Subject: [PATCH 056/584] anemone/networking: persist networkmanager --- hosts/anemone/networking.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 851d7e7..0e9f115 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -13,4 +13,6 @@ 192.168.100.16 hyacinth ''; }; + + environment.etc."NetworkManager/system-connections".source = "/persist/nm_system-connections"; } From 32a7b148a5d5f702875c55f0875c13425dd4b9e0 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 11 Jun 2024 19:16:50 +1000 Subject: [PATCH 057/584] flake: bump inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'agenix': 'github:ryantm/agenix/13ac9ac6d68b9a0896e3d43a082947233189e247' (2023-11-29) → 'github:ryantm/agenix/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9' (2024-05-24) • Updated input 'agenix/darwin': 'github:lnl7/nix-darwin/87b9d090ad39b25b2400029c64825fc2a8868943' (2023-01-09) → 'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24) • Updated input 'agenix/home-manager': 'github:nix-community/home-manager/32d3e39c491e2f91152c84f8ad8b003420eab0a1' (2023-04-22) → 'github:nix-community/home-manager/3bfaacf46133c037bb356193bd2f1765d9dc82c1' (2023-12-20) • Added input 'agenix/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Updated input 'discover': 'github:trigg/Discover/14069fbd722156c3a3abce70e7a912941556d4ab' (2023-11-15) → 'github:trigg/Discover/bbd1a08d54c37db48970d1c7312f1fc3a893e728' (2024-06-10) • Updated input 'home-manager': 'github:nix-community/home-manager/0e2e443ff24f9d75925e91b89d1da44b863734af' (2023-12-14) → 'github:nix-community/home-manager/3d65009effd77cb0d6e7520b68b039836a7606cf' (2024-06-09) • Updated input 'home-manager-stable': 'github:nix-community/home-manager/652fda4ca6dafeb090943422c34ae9145787af37' (2024-02-03) → 'github:nix-community/home-manager/095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a' (2024-06-04) • Updated input 'linux-tkg': 'github:Frogging-Family/linux-tkg/80fdc82a9a76b81d9fcc4a321566f285fb956e76' (2024-01-10) → 'github:Frogging-Family/linux-tkg/9c28c505bffe42093e4b4b6385a1b1ff16c0d7a2' (2024-06-11) • Updated input 'neovim-nightly': 'github:nix-community/neovim-nightly-overlay/21a2bc2a9f18c49d4c9ba811ab6c6746b8d62580' (2023-12-15) → 'github:nix-community/neovim-nightly-overlay/60a8a1b221308566c51aa9a66e11145a3f141fc8' (2024-06-11) • Updated input 'neovim-nightly/flake-parts': 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01) → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) • Added input 'neovim-nightly/git-hooks': 'github:cachix/git-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1' (2024-06-06) • Added input 'neovim-nightly/git-hooks/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Added input 'neovim-nightly/git-hooks/gitignore': 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28) • Added input 'neovim-nightly/git-hooks/gitignore/nixpkgs': follows 'neovim-nightly/git-hooks/nixpkgs' • Added input 'neovim-nightly/git-hooks/nixpkgs': follows 'neovim-nightly/nixpkgs' • Added input 'neovim-nightly/git-hooks/nixpkgs-stable': follows 'neovim-nightly/nixpkgs' • Updated input 'neovim-nightly/hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/31b6cd7569191bfcd0a548575b0e2ef953ed7d09' (2023-11-26) → 'github:hercules-ci/hercules-ci-effects/0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414' (2024-06-10) • Updated input 'neovim-nightly/hercules-ci-effects/flake-parts': 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03) → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) • Removed input 'neovim-nightly/neovim-flake' • Removed input 'neovim-nightly/neovim-flake/flake-utils' • Removed input 'neovim-nightly/neovim-flake/flake-utils/systems' • Removed input 'neovim-nightly/neovim-flake/nixpkgs' • Added input 'neovim-nightly/neovim-src': 'github:neovim/neovim/37bf4c572a8fa20dc4a8433524ecc8c8d68fe53c' (2024-06-10) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/e2abe296c5fb4673207e0c2b45b12507629970e5' (2024-01-16) → 'github:fufexan/nix-gaming/58f43669b808e4a2679ce0e5ff12665e7082cc85' (2024-06-11) • Updated input 'nix-gaming/flake-parts': 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01) → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) • Updated input 'nix-gaming/flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29) → 'https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz?narHash=sha256-lIbdfCsf8LMFloheeE6N31%2BBMIeixqyQWbSr2vk79EQ%3D' (2024-06-01) • Updated input 'nix-gaming/nixpkgs': 'github:NixOS/nixpkgs/e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7' (2023-12-08) → 'github:NixOS/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288' (2024-06-07) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/246219bc21b943c6f6812bb7744218ba0df08600' (2023-12-04) → 'github:nix-community/nixos-generators/35c20ba421dfa5059e20e0ef2343c875372bdcf3' (2024-06-10) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/f5af57d3ef9947a70ac86e42695231ac1ad00c25' (2023-09-03) → 'github:nix-community/nixpkgs.lib/3c62b6a12571c9a7f65ab037173ee153d539905f' (2024-04-07) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7763c6fd1f299cb9361ff2abf755ed9619ef01d6' (2023-12-13) → 'github:NixOS/nixos-hardware/58b52b0dd191af70f538c707c66c682331cfdffc' (2024-06-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9b19f5e77dd906cb52dade0b7bd280339d2a1f3d' (2024-01-13) → 'github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3' (2024-06-09) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/51063ed4f2343a59fdeebb279bb81d87d453942b' (2024-03-12) → 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c' (2024-06-08) • Updated input 'nvim-treesitter': 'github:nvim-treesitter/nvim-treesitter/194b3f0047816132b08bcc2857b23a49fa967d04' (2023-12-15) → 'github:nvim-treesitter/nvim-treesitter/9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421' (2024-06-11) • Updated input 'packwiz': 'github:comp500/packwiz/7e3ca8d9d54ec56d0ceaaca293e502c39d824422' (2023-10-22) → 'github:comp500/packwiz/7b4be47578151c36e784306b36d251ec2590e50c' (2024-05-27) • Updated input 'pure': 'github:sindresorhus/pure/87e6f5dd4c793f6d980532205aaefe196780606f' (2023-06-25) → 'github:sindresorhus/pure/da1a722238febb9a4b97c77628fae753d1817490' (2024-04-29) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/d7aaf97c7c5ea7b4198ef85d3d66b3dfe5c6ce57' (2023-12-15) → 'github:oxalica/rust-overlay/bedc47af18fc41bb7d2edc2b212d59ca36253f59' (2024-06-11) • Updated input 'rust-overlay/flake-utils': 'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'spicetify-nix': 'github:the-argus/spicetify-nix/3c702af1f717b7876fac08809201b1368d0d956c' (2023-11-14) → 'github:the-argus/spicetify-nix/1325416f951d6a82cfddb1289864ad782e2b87c4' (2024-01-02) • Updated input 'spicetify-themes': 'github:spicetify/spicetify-themes/8b6a8010359914b3c8fdaf810705c754ce69c2a4' (2023-11-30) → 'github:spicetify/spicetify-themes/dfdd89ad84d5c68915c65e4a83580047349c49b4' (2024-05-17) • Updated input 'tree-sitter-glimmer': 'github:alexlafroscia/tree-sitter-glimmer/f9746dc1d0707717fbba84cb5c22a71586af23e1' (2023-10-05) → 'github:alexlafroscia/tree-sitter-glimmer/6b25d265c990139353e1f7f97baf84987ebb7bf0' (2024-03-19) • Updated input 'zsh-abbr': 'github:olets/zsh-abbr/6802d7353b2422d7a82134ce655aff97367eefa0' (2023-10-19) → 'github:olets/zsh-abbr/84f18ab195547324c3addd735688f78909df61d4' (2024-06-05) • Updated input 'zsh-history-substring-search': 'github:zsh-users/zsh-history-substring-search/8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64' (2023-11-23) → 'github:zsh-users/zsh-history-substring-search/87ce96b1862928d84b1afe7c173316614b30e301' (2024-06-05) --- flake.lock | 327 +++++++++++++++++++++++++++++------------------------ 1 file changed, 181 insertions(+), 146 deletions(-) diff --git a/flake.lock b/flake.lock index 84ae1c0..89454e4 100644 --- a/flake.lock +++ b/flake.lock @@ -6,14 +6,15 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1701216516, - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -30,11 +31,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -63,11 +64,11 @@ "discover": { "flake": false, "locked": { - "lastModified": 1700057968, - "narHash": "sha256-k/20+NBEewELv0GWTFhL2+168lpKGFI8KLEgGhOmOa4=", + "lastModified": 1718055168, + "narHash": "sha256-aQWn4lOWdbybI2PwWLhhDhImIdqhufr0dRpJwWv9684=", "owner": "trigg", "repo": "Discover", - "rev": "14069fbd722156c3a3abce70e7a912941556d4ab", + "rev": "bbd1a08d54c37db48970d1c7312f1fc3a893e728", "type": "github" }, "original": { @@ -108,6 +109,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -116,11 +133,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -138,11 +155,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -155,11 +172,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -170,14 +187,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -187,24 +204,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -222,6 +221,55 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "neovim-nightly", + "git-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" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -231,11 +279,11 @@ ] }, "locked": { - "lastModified": 1701009247, - "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", + "lastModified": 1718018037, + "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", + "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", "type": "github" }, "original": { @@ -252,11 +300,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -294,11 +342,11 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1717476296, + "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", "type": "github" }, "original": { @@ -315,11 +363,11 @@ ] }, "locked": { - "lastModified": 1702538064, - "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=", + "lastModified": 1717931644, + "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af", + "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "type": "github" }, "original": { @@ -347,11 +395,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1704890137, - "narHash": "sha256-uh1ielVK71BP/MYK85KA8B8DBltFPF4oEeHXyKcMqyY=", + "lastModified": 1718071891, + "narHash": "sha256-l0eB8nIiLmx+k0U+/v3TkxBr6LV/ByqnBd9vTAqniE8=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "80fdc82a9a76b81d9fcc4a321566f285fb956e76", + "rev": "9c28c505bffe42093e4b4b6385a1b1ff16c0d7a2", "type": "github" }, "original": { @@ -360,46 +408,23 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "neovim-nightly", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1702595978, - "narHash": "sha256-PvcPk+f9ENeY5Jq1nvWpkL12KWeVQFhqQ2a8PLNfP/k=", - "owner": "neovim", - "repo": "neovim", - "rev": "f31f260f0c6449dba4c84071be6bfe91d3cb4993", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "neovim-nightly": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", + "neovim-src": "neovim-src", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1702598962, - "narHash": "sha256-uh0Tw7og6xswrrQ9PxEFOCLQXcwQHUynO4bL1fkUJO8=", + "lastModified": 1718090902, + "narHash": "sha256-XlFgIhunVheMVT5hv+Ov7wkjFldqqOWsRleYQHrgWQY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "21a2bc2a9f18c49d4c9ba811ab6c6746b8d62580", + "rev": "60a8a1b221308566c51aa9a66e11145a3f141fc8", "type": "github" }, "original": { @@ -408,17 +433,33 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1718038388, + "narHash": "sha256-npcA3yWucHF5uKKqcrSLJAy0hk3tTxfVCo/Da/Z4OOM=", + "owner": "neovim", + "repo": "neovim", + "rev": "37bf4c572a8fa20dc4a8433524ecc8c8d68fe53c", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1705434512, - "narHash": "sha256-bQJjtlHWU5aOnEtbZfMRuqXvHd5ufQEVATDY0gN4ZCA=", + "lastModified": 1718068951, + "narHash": "sha256-wt9iAsStd4ghkkxKgByOnRfQ+9VRQoCc06nQ+VvsH/E=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e2abe296c5fb4673207e0c2b45b12507629970e5", + "rev": "58f43669b808e4a2679ce0e5ff12665e7082cc85", "type": "github" }, "original": { @@ -429,11 +470,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -450,11 +491,11 @@ ] }, "locked": { - "lastModified": 1701689616, - "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "246219bc21b943c6f6812bb7744218ba0df08600", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -465,11 +506,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1702453208, - "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", + "lastModified": 1717995329, + "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", + "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "type": "github" }, "original": { @@ -480,11 +521,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702029940, - "narHash": "sha256-qM3Du0perpLesh5hr87mVPZ79McMUKIWUH7EQMh2kWo=", + "lastModified": 1717774105, + "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7", + "rev": "d226935fd75012939397c83f6c385e4d6d832288", "type": "github" }, "original": { @@ -496,20 +537,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", - "type": "github" + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-raccoon": { @@ -530,11 +565,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710283656, - "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "lastModified": 1717880976, + "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "type": "github" }, "original": { @@ -546,11 +581,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -563,11 +598,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1702633625, - "narHash": "sha256-0wnqdug2VUgx1V+cD/sByym2UT9W5c+Lizl+BjBapVc=", + "lastModified": 1718071668, + "narHash": "sha256-7QLrIu3bN6vjEUZsdP6+DyciF7N/BWtPDcU8rISMVwo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "194b3f0047816132b08bcc2857b23a49fa967d04", + "rev": "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421", "type": "github" }, "original": { @@ -579,11 +614,11 @@ "packwiz": { "flake": false, "locked": { - "lastModified": 1697971110, - "narHash": "sha256-eYXA2r6oxvB1774qnQIb12EhnvdOBg02bTxa5nbIb1w=", + "lastModified": 1716839662, + "narHash": "sha256-XBp8Xv55R8rhhsQiWnOPH8c3fCpV/yq41ozJDcGdWfs=", "owner": "comp500", "repo": "packwiz", - "rev": "7e3ca8d9d54ec56d0ceaaca293e502c39d824422", + "rev": "7b4be47578151c36e784306b36d251ec2590e50c", "type": "github" }, "original": { @@ -595,11 +630,11 @@ "pure": { "flake": false, "locked": { - "lastModified": 1687718525, - "narHash": "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w=", + "lastModified": 1714417298, + "narHash": "sha256-Hdb5wGVkNrmmVWZaKf3xUnNYsTX/8Bb7AhgLNJxNAUc=", "owner": "sindresorhus", "repo": "pure", - "rev": "87e6f5dd4c793f6d980532205aaefe196780606f", + "rev": "da1a722238febb9a4b97c77628fae753d1817490", "type": "github" }, "original": { @@ -643,17 +678,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1702606645, - "narHash": "sha256-o3kM+nzw0qaphSJfdmV+JcDBVMZEll5EVDCLHY+L83A=", + "lastModified": 1718072316, + "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d7aaf97c7c5ea7b4198ef85d3d66b3dfe5c6ce57", + "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", "type": "github" }, "original": { @@ -664,17 +699,17 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1699986787, - "narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=", + "lastModified": 1704167711, + "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", "owner": "the-argus", "repo": "spicetify-nix", - "rev": "3c702af1f717b7876fac08809201b1368d0d956c", + "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", "type": "github" }, "original": { @@ -686,11 +721,11 @@ "spicetify-themes": { "flake": false, "locked": { - "lastModified": 1701328736, - "narHash": "sha256-iMRutzOrZHaKfHOr2qOM/TkTYHysFBlmunVhU65kf2k=", + "lastModified": 1715934942, + "narHash": "sha256-8IF2Y7xJtzk92rl4bfjiMXCISzUMaxXxOaMZkLS5mww=", "owner": "spicetify", "repo": "spicetify-themes", - "rev": "8b6a8010359914b3c8fdaf810705c754ce69c2a4", + "rev": "dfdd89ad84d5c68915c65e4a83580047349c49b4", "type": "github" }, "original": { @@ -763,11 +798,11 @@ "tree-sitter-glimmer": { "flake": false, "locked": { - "lastModified": 1696541973, - "narHash": "sha256-57Sp4LrvyNNuOc+8ZiHl6cwvGg1tmXZemRsWeW+Kzys=", + "lastModified": 1710886185, + "narHash": "sha256-azLagXPC659Ee0UwqtW0XgpxGLqMSrwmKZy8htsp4xU=", "owner": "alexlafroscia", "repo": "tree-sitter-glimmer", - "rev": "f9746dc1d0707717fbba84cb5c22a71586af23e1", + "rev": "6b25d265c990139353e1f7f97baf84987ebb7bf0", "type": "github" }, "original": { @@ -843,11 +878,11 @@ "zsh-abbr": { "flake": false, "locked": { - "lastModified": 1697757732, - "narHash": "sha256-MvxJkEbJKMmYRku/RF6ayOb7u7NI4HZehO8ty64jEnE=", + "lastModified": 1717607378, + "narHash": "sha256-uIJHQp5Lrtxm2SWd56nctl5HOClgRzfeEXVERvVk2Kg=", "owner": "olets", "repo": "zsh-abbr", - "rev": "6802d7353b2422d7a82134ce655aff97367eefa0", + "rev": "84f18ab195547324c3addd735688f78909df61d4", "type": "github" }, "original": { @@ -859,11 +894,11 @@ "zsh-history-substring-search": { "flake": false, "locked": { - "lastModified": 1700734334, - "narHash": "sha256-houujb1CrRTjhCc+dp3PRHALvres1YylgxXwjjK6VZA=", + "lastModified": 1717563893, + "narHash": "sha256-1+w0AeVJtu1EK5iNVwk3loenFuIyVlQmlw8TWliHZGI=", "owner": "zsh-users", "repo": "zsh-history-substring-search", - "rev": "8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64", + "rev": "87ce96b1862928d84b1afe7c173316614b30e301", "type": "github" }, "original": { From b6f4f1942d99f61708fd702dc57ea5ca33f89c67 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 11 Jun 2024 19:44:49 +1000 Subject: [PATCH 058/584] packages/linux-lava: bump to 6.9.3 --- packages/linux-lava/dsd_um3402yar.patch | 20 -------------------- packages/linux-lava/sources.nix | 13 ++++++------- 2 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 packages/linux-lava/dsd_um3402yar.patch diff --git a/packages/linux-lava/dsd_um3402yar.patch b/packages/linux-lava/dsd_um3402yar.patch deleted file mode 100644 index 27a13a9..0000000 --- a/packages/linux-lava/dsd_um3402yar.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c -index 2eca5822055..503f3b889f1 100644 ---- a/sound/pci/hda/cs35l41_hda_property.c -+++ b/sound/pci/hda/cs35l41_hda_property.c -@@ -54,6 +54,7 @@ - { "10431533", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, - { "10431573", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, - { "10431663", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 }, -+ { "10431683", I2C, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 }, - { "104316D3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, - { "104316F3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, - { "104317F3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, -@@ -358,6 +359,7 @@ - { "CSC3551", "10431533", generic_dsd_config }, - { "CSC3551", "10431573", generic_dsd_config }, - { "CSC3551", "10431663", generic_dsd_config }, -+ { "CSC3551", "10431683", generic_dsd_config }, - { "CSC3551", "104316D3", generic_dsd_config }, - { "CSC3551", "104316F3", generic_dsd_config }, - { "CSC3551", "104317F3", generic_dsd_config }, diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index c6f501c..dd40119 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.7.0"; - kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; - kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; + version = "6.9.3"; + kernelHash = "0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4"; + kernelPatchHash = "1lzkpyp41175kf672s92bz7wzx0favy5xdmxpsgzl9s3z6hdyb7q"; mm = lib.versions.majorMinor version; tkgPatches = [ @@ -11,6 +11,7 @@ let "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" + "0007-v${mm}-ntsync" # "0007-v${mm}-winesync" fails to patch "0012-misc-additions" ]; @@ -35,13 +36,11 @@ in { }; kernelPatches = [ - #kernelPatchSrc - (patch ./dsd_um3402yar.patch) + kernelPatchSrc ] ++ builtins.map (name: { inherit name; patch = "${inputs.linux-tkg}/linux-tkg-patches/${mm}/${name}.patch"; }) tkgPatches - ++ [ - ]; + ++ [ ]; } From 8a598f86f59415183c3ff326aae1872088c61b48 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 25 Jun 2024 15:54:38 +1000 Subject: [PATCH 059/584] hosts/{anemone,hyacinth}: fix neovim nightly overlay --- hosts/anemone/default.nix | 2 +- hosts/hyacinth/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index 8a8f995..9bdb7ae 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -3,7 +3,7 @@ system.stateVersion = "23.11"; time.timeZone = "Australia/Melbourne"; - nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; + nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ]; age.secrets = { passwd.file = ../../secrets/passwd.age; }; diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index db176e3..d9a32ba 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -4,7 +4,7 @@ time.timeZone = "Asia/Phnom_Penh"; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; + nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ]; age.secrets = { passwd.file = ../../secrets/passwd.age; wg_hyacinth.file = ../../secrets/wg_blossom.age; From 54f0700ef719947608c127197acc9b8476f924a5 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 25 Jun 2024 15:58:07 +1000 Subject: [PATCH 060/584] system/nix: fix new nix package name --- modules/system/nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/nix.nix b/modules/system/nix.nix index be8c472..b3ebc41 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: { nix = { - package = pkgs.nixUnstable; + package = pkgs.nixVersions.git; settings = rec { extra-sandbox-paths = [ config.programs.ccache.cacheDir ]; From 47656632951af0f788dffea5f08fc63ef8f70198 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 7 Jul 2024 12:12:06 +1000 Subject: [PATCH 061/584] system/audio: fix pipewire config --- modules/system/audio.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/audio.nix b/modules/system/audio.nix index 1339b51..de59723 100644 --- a/modules/system/audio.nix +++ b/modules/system/audio.nix @@ -26,7 +26,7 @@ in { pulse.enable = true; jack.enable = true; }; - environment.etc."pipewire/pipewire.conf.d/99-config.conf".text = builtins.toJSON { + services.pipewire.extraConfig.pipewire = { "context.properties" = { "default.clock.rate" = int.rate; "default.clock.quantum" = int.quantum.def; @@ -50,7 +50,7 @@ in { "resample.quality" = 1; }; }; - environment.etc."pipewire/pipewire-pulse.conf.d/99-config.conf".text = builtins.toJSON { + services.pipewire.extraConfig.pipewire-pulse = { "context.modules" = [ { name = "libpipewire-module-rtkit"; From d9e8c2bd34309b9f1a5f2607f7d5d5f488a0a976 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 7 Jul 2024 12:12:32 +1000 Subject: [PATCH 062/584] user/gpg: fix pinentry --- modules/user/gpg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/user/gpg.nix b/modules/user/gpg.nix index a8ab12f..768c5d9 100644 --- a/modules/user/gpg.nix +++ b/modules/user/gpg.nix @@ -1,10 +1,10 @@ -{ config, enableGUI, ... }: { +{ config, pkgs, ... }: { programs.gpg = { enable = true; homedir = "${config.xdg.dataHome}/gnupg"; }; services.gpg-agent = { enable = true; - pinentryFlavor = if enableGUI then "gnome3" else "tty"; + pinentryPackage = pkgs.pinentry-gnome3; }; } From 9bd61c9b6ad2629f4895d0c0f4a8c58414866a9f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 25 Jun 2024 16:08:43 +1000 Subject: [PATCH 063/584] user/neovim: switch from rnix-lsp to nil --- res/config.lua | 2 +- users/rin/packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/config.lua b/res/config.lua index a8cda44..a1bb8e2 100644 --- a/res/config.lua +++ b/res/config.lua @@ -141,7 +141,7 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) -local servers = { 'cssls', 'html', 'prismals', 'rnix', 'tsserver', 'yamlls' } +local servers = { 'cssls', 'html', 'nil_ls', 'prismals', 'tsserver', 'yamlls' } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { capabilities = capabilities, diff --git a/users/rin/packages.nix b/users/rin/packages.nix index be0c0bb..bc20e01 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -10,11 +10,11 @@ ffmpeg gnupg kitty + nil nodejs-18_x pamixer qmk ripgrep - rnix-lsp unrar weechat yt-dlp From 9637bd72f64a7798d275305019b4f41b1642d414 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 25 Jun 2024 16:10:36 +1000 Subject: [PATCH 064/584] overlays/eww: remove withWayland --- overlays/eww.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/eww.nix b/overlays/eww.nix index bea0aec..8d89aa1 100644 --- a/overlays/eww.nix +++ b/overlays/eww.nix @@ -1,5 +1,5 @@ self: super: { - eww = (super.eww.override { withWayland = true; }).overrideAttrs (old: rec { + eww = super.eww.overrideAttrs (old: rec { patches = old.patches ++ [ # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 ) ./patches/eww.patch From 2c6a7690a470df81ac49e582958ea39780d27041 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 26 Jun 2024 12:18:41 +1000 Subject: [PATCH 065/584] user/mpv: use new mpv wrapper --- modules/user/mpv.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/user/mpv.nix b/modules/user/mpv.nix index c740392..1b1899c 100644 --- a/modules/user/mpv.nix +++ b/modules/user/mpv.nix @@ -1,7 +1,8 @@ { config, pkgs, ... }: { programs.mpv = { enable = true; - package = pkgs.wrapMpv pkgs.mpv-unwrapped { + package = pkgs.mpv-unwrapped.wrapper { + mpv = pkgs.mpv-unwrapped; youtubeSupport = true; scripts = [ pkgs.mpvScripts.mpris ]; }; From 1015dbdb315649849664de647684364ad0f1ca76 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 26 Jun 2024 13:15:55 +1000 Subject: [PATCH 066/584] anemone/kernel: remove removed firmware --- hosts/anemone/kernel.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix index a8d8cad..1386118 100644 --- a/hosts/anemone/kernel.nix +++ b/hosts/anemone/kernel.nix @@ -30,17 +30,12 @@ pkgs.runCommandNoCC "cs35l41-10431683" { } '' mkdir -p $out/lib/firmware/cirrus cd $out/lib/firmware/cirrus - cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin - cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin - cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin - cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin - cp ${fw}/cs35l41-dsp1-spk-cali-10431e12.wmfw cs35l41-dsp1-spk-cali-10431683.wmfw cp ${fw}/cs35l41-dsp1-spk-prot-10431e12.wmfw cs35l41-dsp1-spk-prot-10431683.wmfw '' )]; From 7445e1486521483d3ce9dafbe4f10c323595c13e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 26 Jun 2024 13:18:37 +1000 Subject: [PATCH 067/584] rin/packages: remove tetrio --- users/rin/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index bc20e01..b9c858d 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -38,7 +38,7 @@ insomnia maim mangohud - me.tetrio-desktop-plus + #me.tetrio-desktop-plus inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin #inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol From 49acaadbf7bb0ddff2642e79f60b3d46f4f3ee7d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 2 Jul 2024 09:46:05 +1000 Subject: [PATCH 068/584] user/git: set safe directory --- modules/user/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/user/git.nix b/modules/user/git.nix index beea776..b64492e 100644 --- a/modules/user/git.nix +++ b/modules/user/git.nix @@ -1,4 +1,4 @@ -{ config, ... }: { +{ ... }: { programs.git = { enable = true; userName = "LavaDesu"; @@ -9,6 +9,7 @@ }; extraConfig = { core.abbrev = 11; + safe.directory = "/home/rin/Projects/flakes"; }; }; } From 1c6ac8c8343227497c50e84bf542c30810d220be Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 2 Jul 2024 09:51:04 +1000 Subject: [PATCH 069/584] anemone/networking: disable wg-quick --- hosts/anemone/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix index 0e9f115..8b6bdf9 100644 --- a/hosts/anemone/networking.nix +++ b/hosts/anemone/networking.nix @@ -2,7 +2,7 @@ networking = { #nameservers = [ "8.8.8.8" "8.8.4.4" ]; - wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf"; + #wg-quick.interfaces.wg0.configFile = "/persist/vpn.conf"; networkmanager = { enable = true; From 602a475e7d2718accecec7644e99a33ce02c6511 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 2 Jul 2024 09:51:31 +1000 Subject: [PATCH 070/584] user/eww-wayland: fix hypr socket paths --- res/eww-wayland/scripts/active-workspace.sh | 2 +- res/eww-wayland/scripts/title.sh | 2 +- res/eww-wayland/scripts/workspaces.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/eww-wayland/scripts/active-workspace.sh b/res/eww-wayland/scripts/active-workspace.sh index cbdf971..d4e6b87 100755 --- a/res/eww-wayland/scripts/active-workspace.sh +++ b/res/eww-wayland/scripts/active-workspace.sh @@ -2,5 +2,5 @@ hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' -socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | +socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' diff --git a/res/eww-wayland/scripts/title.sh b/res/eww-wayland/scripts/title.sh index 9b19289..fd7b798 100755 --- a/res/eww-wayland/scripts/title.sh +++ b/res/eww-wayland/scripts/title.sh @@ -11,7 +11,7 @@ out () { init=$(hyprctl activewindow -j | jq --raw-output .title) out "$init" -socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do +socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do trunc=$(echo $line | cut -c-85) out "$trunc" done diff --git a/res/eww-wayland/scripts/workspaces.sh b/res/eww-wayland/scripts/workspaces.sh index a496f8f..963dbe8 100755 --- a/res/eww-wayland/scripts/workspaces.sh +++ b/res/eww-wayland/scripts/workspaces.sh @@ -6,6 +6,6 @@ spaces (){ } spaces -socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do +socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do spaces done From da89b77f681a28f544f78040125a1ae710fc5f06 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 7 Jul 2024 12:34:07 +1000 Subject: [PATCH 071/584] dandelion/filesystem: fix missing lib --- hosts/dandelion/filesystem.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix index 55c9c2a..d37cb1f 100644 --- a/hosts/dandelion/filesystem.nix +++ b/hosts/dandelion/filesystem.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, lib, ... }: let bind = src: { depends = [ "/nix" ]; From b3a285c3d501b0814d68238039712a3e0a5cee34 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 7 Jul 2024 12:35:06 +1000 Subject: [PATCH 072/584] users/hana: change hashed password and enable zsh --- users/hana/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/hana/default.nix b/users/hana/default.nix index 0e9276f..482323f 100644 --- a/users/hana/default.nix +++ b/users/hana/default.nix @@ -1,10 +1,11 @@ { config, lib, modules, pkgs, ... }: { + programs.zsh.enable = true; users.users.hana = { isNormalUser = true; extraGroups = [ "wheel" ]; shell = pkgs.zsh; uid = 1002; - hashedPassword = "$y$j9T$BxnsFaGwBfSKe4jAJaaxI.$cpFtu8fzFhKalIV3WGuA2jz4//KJBwhiybpnlmoZPy."; + hashedPassword = "$y$j9T$3xCNDudmfrIu5VfQQoDkj/$ugzJWq0gORN9jnhDsREu31CkL3zwniQu6KoLbmg6Wr/"; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15 rin@blossom" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5l9t8dc6mPsKKYqZlPKvhOdyqz+DS5UOcvHuh3uVGt @strawberry" From 2da3206a933c3486d05a72b87a5786e0a4eace09 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 7 Jul 2024 12:38:23 +1000 Subject: [PATCH 073/584] hosts/dandelion: add postgres, and lock to v13 --- hosts/dandelion/default.nix | 2 ++ modules/services/postgres.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix index c3fd0a1..735cd03 100644 --- a/hosts/dandelion/default.nix +++ b/hosts/dandelion/default.nix @@ -14,6 +14,8 @@ security #wireguard + modules.services.postgres + ./filesystem.nix ./kernel.nix ./networking.nix diff --git a/modules/services/postgres.nix b/modules/services/postgres.nix index 8be69ea..bffdcee 100644 --- a/modules/services/postgres.nix +++ b/modules/services/postgres.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let dir = "/persist/postgresql/${config.services.postgresql.package.psqlSchema}"; uid = toString config.ids.uids.postgres; @@ -8,6 +8,7 @@ in { services.postgresql = { enable = true; dataDir = dir; + package = pkgs.postgresql_13; authentication = lib.mkOverride 10 '' #type database DBuser origin-address auth-method local all all trust From 217ef21de87dbf40793527567ae05ec70437399c Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 2 Jul 2024 12:31:41 +1000 Subject: [PATCH 074/584] system/security: don't log refused connections --- modules/system/security.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/system/security.nix b/modules/system/security.nix index 6e44eae..602f108 100644 --- a/modules/system/security.nix +++ b/modules/system/security.nix @@ -11,6 +11,7 @@ allowedUDPPortRanges = [ { from = 20000; to = 20100; } ]; allowedTCPPortRanges = [ { from = 20000; to = 20100; } ]; trustedInterfaces = [ "wg0" ]; + logRefusedConnections = false; extraCommands = genCmds "I"; extraStopCommands = genCmds "D"; From 361aa3cddd63c614dde9a0439ecc78ea13f2fbca Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 24 Mar 2024 14:18:13 +1100 Subject: [PATCH 075/584] hosts/hyacinth: set timezone to Melbourne --- hosts/hyacinth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index d9a32ba..a7e4157 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -1,7 +1,7 @@ { config, inputs, modules, overlays, pkgs, ... }: { networking.hostName = "hyacinth"; system.stateVersion = "21.11"; - time.timeZone = "Asia/Phnom_Penh"; + time.timeZone = "Australia/Melbourne"; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nixpkgs.overlays = [ inputs.neovim-nightly.overlays.default ]; From 1cf9f6e564c37b04516a58c642100b0a1711ec18 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 24 Mar 2024 14:19:49 +1100 Subject: [PATCH 076/584] hyacinth/networking: configure for new ethernet --- hosts/hyacinth/networking.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hosts/hyacinth/networking.nix b/hosts/hyacinth/networking.nix index 5abc656..7796639 100644 --- a/hosts/hyacinth/networking.nix +++ b/hosts/hyacinth/networking.nix @@ -1,20 +1,17 @@ { config, ... }: { environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path; networking = { - useDHCP = false; + useDHCP = true; interfaces.enp5s0.useDHCP = false; interfaces.enp5s0.ipv4.addresses = [{ - address = "192.168.100.16"; + address = "192.168.0.151"; prefixLength = 24; }]; - defaultGateway = "192.168.100.1"; - nameservers = [ "1.1.1.1" ]; + defaultGateway = "192.168.0.1"; + nameservers = [ "8.8.8.8" "8.8.4.4" ]; extraHosts = '' - 192.168.100.12 strawberry - 192.168.100.15 caramel - 10.100.0.1 sugarcane ''; }; From 8c54c332c324287152e6fd039ccbefef6eaf6565 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 24 Mar 2024 14:23:20 +1100 Subject: [PATCH 077/584] hosts/hyacinth: remove wireguard and enable hyprland --- hosts/hyacinth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index a7e4157..a84373a 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -29,7 +29,6 @@ security snapper virtualisation - wireguard modules.services.postgres @@ -40,6 +39,7 @@ ../../users/rin ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; + programs.hyprland.enable = true; # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ From 11847ae18075c2c4d7ccb2d9d2b7328265e32ebb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 11 Jun 2024 21:15:56 +1000 Subject: [PATCH 078/584] hosts/hyacinth: set tmpdir --- hosts/hyacinth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index a84373a..33e98ee 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -40,6 +40,7 @@ ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; programs.hyprland.enable = true; + systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp"; # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ From 0df212398ffe8524913ead8431eee6b87850c3dc Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 8 Jul 2024 18:16:56 +1000 Subject: [PATCH 079/584] system/greetd,users/rin: split into xorg and wayland --- hosts/anemone/default.nix | 2 +- hosts/hyacinth/default.nix | 2 +- .../system/{greetd.nix => greetd_wayland.nix} | 0 modules/system/greetd_xorg.nix | 16 ++++++ users/rin/{default.nix => wayland.nix} | 0 users/rin/xorg.nix | 57 +++++++++++++++++++ 6 files changed, 75 insertions(+), 2 deletions(-) rename modules/system/{greetd.nix => greetd_wayland.nix} (100%) create mode 100644 modules/system/greetd_xorg.nix rename users/rin/{default.nix => wayland.nix} (100%) create mode 100644 users/rin/xorg.nix diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index 9bdb7ae..a813f3f 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -32,7 +32,7 @@ ./kernel.nix ./networking.nix - ../../users/rin + ../../users/rin/wayland.nix ]; programs.hyprland.enable = true; diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 33e98ee..d88e2fe 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -36,7 +36,7 @@ ./kernel.nix ./networking.nix - ../../users/rin + ../../users/rin/xorg.nix ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; programs.hyprland.enable = true; diff --git a/modules/system/greetd.nix b/modules/system/greetd_wayland.nix similarity index 100% rename from modules/system/greetd.nix rename to modules/system/greetd_wayland.nix diff --git a/modules/system/greetd_xorg.nix b/modules/system/greetd_xorg.nix new file mode 100644 index 0000000..2958926 --- /dev/null +++ b/modules/system/greetd_xorg.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, ... }: { + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'"; + user = "greeter"; + }; + }; + }; + + services.xserver = { + autorun = false; + displayManager.startx.enable = true; + }; +} diff --git a/users/rin/default.nix b/users/rin/wayland.nix similarity index 100% rename from users/rin/default.nix rename to users/rin/wayland.nix diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix new file mode 100644 index 0000000..d940f7b --- /dev/null +++ b/users/rin/xorg.nix @@ -0,0 +1,57 @@ +{ config, lib, modules, pkgs, ... }: { + programs.zsh.enable = true; + users.users.rin = { + isNormalUser = true; + extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ]; + shell = pkgs.zsh; + uid = 1001; + passwordFile = config.age.secrets.passwd.path; + }; + home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { + home = { + username = "rin"; + homeDirectory = "/home/rin"; + stateVersion = "21.05"; + keyboard = null; # see https://github.com/nix-community/home-manager/issues/2219 + }; + + imports = with modules.user; [ + ./packages.nix + sessionVariables + + direnv + git + gpg + neovim + npm + pass + zsh + ] ++ lib.optionals enableGUI [ + theming + xdg + + kitty + mpv + obs + rofi + + picom + bspwm + sxhkd + xorg + dunst + eww + ]; + + services.mpris-proxy.enable = true; + + home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { + url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe"; + sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns"; + }; + home.file.".local/bin/osu" = { + executable = true; + source = ../../scripts/osu; + }; + }; +} From f191d4bb1e6271e137c2c2d9cb4fbbaa745f4050 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 8 Jul 2024 18:17:17 +1000 Subject: [PATCH 080/584] hyacinth/kernel: use 1440p modeline --- hosts/hyacinth/kernel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/hyacinth/kernel.nix b/hosts/hyacinth/kernel.nix index 0fc0862..7ce4a16 100644 --- a/hosts/hyacinth/kernel.nix +++ b/hosts/hyacinth/kernel.nix @@ -17,8 +17,8 @@ output = "DP-1"; primary = true; monitorConfig = '' - Modeline "1920x1080_165.00" 525.00 1920 2088 2296 2672 1080 1083 1088 1192 -hsync +vsync - Option "PreferredMode" "1920x1080_165.00" + Modeline "2560x1440_144.00" 808.75 2560 2792 3072 3584 1440 1443 1448 1568 -hsync +vsync + Option "PreferredMode" "2560x1440_144.00" ''; }]; } From ed4062b85ba2ac753ed295399a213535a596f5d8 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 8 Jul 2024 18:21:48 +1000 Subject: [PATCH 081/584] hosts/{blossom,sugarcane}: decommission --- hosts/blossom/default.nix | 36 ----------------------------- hosts/blossom/filesystem.nix | 41 ---------------------------------- hosts/blossom/kernel.nix | 25 --------------------- hosts/blossom/networking.nix | 31 ------------------------- hosts/sugarcane/default.nix | 28 ----------------------- hosts/sugarcane/filesystem.nix | 29 ------------------------ hosts/sugarcane/kernel.nix | 17 -------------- hosts/sugarcane/networking.nix | 11 --------- hosts/sugarcane/packages.nix | 14 ------------ 9 files changed, 232 deletions(-) delete mode 100644 hosts/blossom/default.nix delete mode 100644 hosts/blossom/filesystem.nix delete mode 100644 hosts/blossom/kernel.nix delete mode 100644 hosts/blossom/networking.nix delete mode 100644 hosts/sugarcane/default.nix delete mode 100644 hosts/sugarcane/filesystem.nix delete mode 100644 hosts/sugarcane/kernel.nix delete mode 100644 hosts/sugarcane/networking.nix delete mode 100644 hosts/sugarcane/packages.nix diff --git a/hosts/blossom/default.nix b/hosts/blossom/default.nix deleted file mode 100644 index 4c13361..0000000 --- a/hosts/blossom/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, inputs, modules, overlays, pkgs, ... }: { - networking.hostName = "blossom"; - system.stateVersion = "21.11"; - time.timeZone = "Asia/Phnom_Penh"; - - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; - age.secrets = { - passwd.file = ../../secrets/passwd.age; - wg_blossom.file = ../../secrets/wg_blossom.age; - wpa_conf.file = ../../secrets/wpa_conf.age; - }; - imports = with modules.system; [ - inputs.home-manager.nixosModule - home-manager - - audio - base - greetd - gui - input - kernel - nix - packages - security - snapper - wireguard - - ./filesystem.nix - ./kernel.nix - ./networking.nix - - ../../users/rin - ]; -} - diff --git a/hosts/blossom/filesystem.nix b/hosts/blossom/filesystem.nix deleted file mode 100644 index 9f6bf1c..0000000 --- a/hosts/blossom/filesystem.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, ... }: -let - mkMount = uuid: type: { - device = "/dev/disk/by-uuid/${uuid}"; - fsType = type; - options = [ "defaults" "relatime" ]; - }; - mkBtrfsMount = subvolid: atime: mkMount "cf0f4302-f006-46a5-afc7-ada04d17f6f2" "btrfs" // { - options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvolid=${builtins.toString subvolid}" (if atime then "relatime" else "noatime") ]; - }; -in -{ - fileSystems = { - "/" = { - device = "rootfs"; - fsType = "tmpfs"; - options = [ "defaults" "size=4G" "mode=755" ]; - }; - "/boot" = mkMount "186A-A42E" "vfat"; - - "/mnt/butter" = mkBtrfsMount 5 true; - "/nix" = mkBtrfsMount 257 false; - "/home" = mkBtrfsMount 259 true; - "/home/.snapshots" = mkBtrfsMount 262 false; - "/root" = mkBtrfsMount 260 false; - "/var" = mkBtrfsMount 258 false; - "/persist" = { - depends = [ "/var" ]; - device = "/var/persist"; - fsType = "none"; - options = [ "bind" ]; - neededForBoot = true; - }; - - # "/mnt/nfs" = { - # device = "192.168.100.11:/srv/nfs"; - # fsType = "nfs"; - # options = [ "defaults" ]; - # }; - }; -} diff --git a/hosts/blossom/kernel.nix b/hosts/blossom/kernel.nix deleted file mode 100644 index 935d709..0000000 --- a/hosts/blossom/kernel.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, pkgs, ... }: { - boot = { - loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - efiSupport = true; - device = "nodev"; - useOSProber = lib.mkForce false; - }; - }; - initrd.kernelModules = [ "i915" ]; - kernelParams = [ - "amdgpu.gpu_recovery=1" - "amdgpu.si_support=1" - "radeon.si_support=0" - "intel_pstate=passive" - "msr.allow_writes=on" - ]; - kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); - - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out ]; - kernelModules = [ "v4l2loopback" ]; - }; -} diff --git a/hosts/blossom/networking.nix b/hosts/blossom/networking.nix deleted file mode 100644 index 2e0f6a6..0000000 --- a/hosts/blossom/networking.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, ... }: { - environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path; - networking = { - wireless = { - enable = true; - interfaces = [ "wlp3s0" ]; - }; - - useDHCP = false; - interfaces.eno1.useDHCP = false; - interfaces.wlp3s0.useDHCP = false; - - interfaces.eno1.ipv4.addresses = [{ - address = "10.0.0.2"; - prefixLength = 24; - }]; - interfaces.wlp3s0.ipv4.addresses = [{ - address = "192.168.100.13"; - prefixLength = 24; - }]; - defaultGateway = "192.168.100.1"; - nameservers = [ "192.168.100.15" ]; - - extraHosts = '' - 192.168.100.12 strawberry - 192.168.100.15 caramel - - 10.100.0.1 sugarcane - ''; - }; -} diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix deleted file mode 100644 index fb2a276..0000000 --- a/hosts/sugarcane/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: { - networking.hostName = "sugarcane"; - system.stateVersion = "21.11"; - time.timeZone = "Asia/Singapore"; - - age.secrets = { - passwd.file = ../../secrets/passwd.age; - wg_sugarcane.file = ../../secrets/wg_sugarcane.age; - }; - imports = with modules.system; [ - (modulesPath + "/profiles/qemu-guest.nix") - inputs.home-manager-raccoon.nixosModule - - base - home-manager - input - nix-stable - security - wireguard - - ./filesystem.nix - ./kernel.nix - ./networking.nix - ./packages.nix - - ../../users/hana - ]; -} diff --git a/hosts/sugarcane/filesystem.nix b/hosts/sugarcane/filesystem.nix deleted file mode 100644 index cc3db8e..0000000 --- a/hosts/sugarcane/filesystem.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, ... }: -let - bind = src: { - depends = [ "/nix" ]; - device = src; - fsType = "none"; - neededForBoot = true; - options = [ "bind" ]; - }; -in { - fileSystems = { - "/" = { - device = "rootfs"; - fsType = "tmpfs"; - options = [ "defaults" "size=1G" "mode=755" ]; - }; - - "/nix" = { - device = "/dev/disk/by-uuid/19d572a8-1cf6-4b9c-94c6-3ce6be54f719"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - neededForBoot = true; - }; - - "/persist" = bind "/nix/persist"; - "/var/log/journal" = bind "/nix/persist/journal"; - "/boot" = bind "/nix/persist/boot"; - }; -} diff --git a/hosts/sugarcane/kernel.nix b/hosts/sugarcane/kernel.nix deleted file mode 100644 index 35c4452..0000000 --- a/hosts/sugarcane/kernel.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, inputs, pkgs, ... }: { - boot = { - loader = { - systemd-boot.enable = false; - efi.canTouchEfiVariables = true; - grub = { - enable = true; - device = "/dev/sda"; - }; - }; - initrd.kernelModules = [ "nvme" ]; - kernel.sysctl = { - "kernel.core_pattern" = "|/bin/false"; - "kernel.sysrq" = 1; - }; - }; -} diff --git a/hosts/sugarcane/networking.nix b/hosts/sugarcane/networking.nix deleted file mode 100644 index 5218f0d..0000000 --- a/hosts/sugarcane/networking.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: { - networking = { - useDHCP = false; - interfaces.ens3.useDHCP = true; - - extraHosts = '' - 10.100.0.3 blossom - 10.100.0.4 strawberry - ''; - }; -} diff --git a/hosts/sugarcane/packages.nix b/hosts/sugarcane/packages.nix deleted file mode 100644 index e3e3f15..0000000 --- a/hosts/sugarcane/packages.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - git - htop - jq - neovim - rsync - sshfs - wget - - kitty.terminfo - ]; - environment.variables.EDITOR = "nvim"; -} From 1d051e34ede5708a88605ee52b0760b73a3d3f4f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 8 Jul 2024 18:26:00 +1000 Subject: [PATCH 082/584] readme: update --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c932782..daec2a6 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,18 @@ to your liking. Open up `flake.nix`, add your new host config at the bottom, and ## Hosts | Name | Description | | ------- | ----------- | -| blossom | Laptop and main PC | +| hyacinth | Main Desktop PC | +| anemone | Main Laptop | | caramel | Raspberry Pi 400, stateless | -| sugarcane | OVHCloud VPS, stateless | +| dandelion | ARM OCI VPS, stateless | ## Users | Name | Description | | ---- | ----------- | -| rin | Main user for usage | +| rin | Main user for general usage | | hana | Lightweight user intended for inspecting stateless hosts | ## License -Licensed under CC0; basically you can fork, modify, redistribute, or do whatever you want I don't really care. +Licensed under CC0 Credit is appreciated but not necessary From ef9c4f3a08979a32bdaaac2178e23b8580ae4d38 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 24 Jul 2024 13:15:10 +1000 Subject: [PATCH 083/584] system/greetd: fix module paths --- hosts/anemone/default.nix | 2 +- hosts/hyacinth/default.nix | 2 +- modules/default.nix | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index a813f3f..f7a47ae 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -18,7 +18,7 @@ ccache corectrl flatpak - greetd + greetd_wayland gui input kernel diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index d88e2fe..c59ca43 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -19,7 +19,7 @@ ccache corectrl flatpak - greetd + greetd_xorg gui input kernel diff --git a/modules/default.nix b/modules/default.nix index 60cea74..0ad17ac 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -31,7 +31,8 @@ in { ./system/ccache.nix ./system/corectrl.nix ./system/flatpak.nix - ./system/greetd.nix + ./system/greetd_wayland.nix + ./system/greetd_xorg.nix ./system/gui.nix ./system/home-manager.nix ./system/input.nix From d4b9c485b66816f88b8ff1aa46f235ac1235999b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 24 Jul 2024 13:23:12 +1000 Subject: [PATCH 084/584] services/nginx: enable for dandelion --- hosts/dandelion/default.nix | 1 + modules/services/nginx.nix | 6 ++++++ secrets.nix | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix index 735cd03..01eb6ab 100644 --- a/hosts/dandelion/default.nix +++ b/hosts/dandelion/default.nix @@ -14,6 +14,7 @@ security #wireguard + modules.services.nginx modules.services.postgres ./filesystem.nix diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index 4b01c80..c58f2ee 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -1,4 +1,5 @@ { config, inputs, ... }: { + networking.firewall.allowedTCPPorts = [ 80 443 ]; security.acme = { acceptTerms = true; email = "me@lava.moe"; @@ -27,6 +28,11 @@ forceSSL = true; root = inputs.website.outPath; }; + "cdn.lava.moe" = { + useACMEHost = "lava.moe"; + forceSSL = true; + root = "/persist/cdn"; + }; "_" = { default = true; addSSL = true; diff --git a/secrets.nix b/secrets.nix index f83332a..7a1ea24 100644 --- a/secrets.nix +++ b/secrets.nix @@ -3,13 +3,14 @@ let blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj"; caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80"; sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ"; + dandelion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUk99ku7+eiIO7Q9sIPlPx3GiUljLv7W404W/zwrtzI"; rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15"; in { "secrets/passwd.age".publicKeys = [ anemone blossom caramel sugarcane rin ]; "secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ]; - "secrets/acme_dns.age".publicKeys = [ caramel rin ]; + "secrets/acme_dns.age".publicKeys = [ dandelion rin ]; "secrets/warden_admin.age".publicKeys = [ caramel rin ]; "secrets/wg_blossom.age".publicKeys = [ blossom rin ]; "secrets/wg_caramel.age".publicKeys = [ caramel rin ]; From ac2b215ad6904f492e535af2f684e7aed9c8d026 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 24 Jul 2024 13:26:54 +1000 Subject: [PATCH 085/584] secrets: rekey acme_dns --- secrets/acme_dns.age | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/secrets/acme_dns.age b/secrets/acme_dns.age index 17f90a8..96eb63c 100644 --- a/secrets/acme_dns.age +++ b/secrets/acme_dns.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 krYeuQ SBY9moNFVc8mdntk13DRWSIyoJfSuzsBrhzmaH8u51c -5QU1vtRllrmYsArw6LSktuRLQ7QbrtNBKVrOG8d2pyk --> ssh-ed25519 U9FXlg HR/A429gFyLaUq6QSyTYv8yK5syfJbLDFzmhGGTZt1M -jCXRzzzp8vfB4n8pM6BAZr/IC9E+vBeeOm0AYGYBOe0 ---- /vlh5vuiRyVyiQpn4PZ5zBeUNaQclSW5Y5z1mR43fFg -,S=;9}J|5UjB{j-v(T7l^kɀQx^?`/N|aqxI \ No newline at end of file +-> ssh-ed25519 bRFqeQ KWUiFdB5Lpd1BYGdmO/IcX0Cj9SUowY5sfwWH/FVyAU +hJKgLSMy/yLfoRtIDVmK71cDoHALXp2rgmJuagpqJ1I +-> ssh-ed25519 U9FXlg bgY7WWmCyMWJzLSAnyZwCN5Lm29WVUILVkOUDFKgryo +AZzW/A/rQEmSiy89ixBZHH9TbuLKlyAlWKLNDZj69+k +--- EoGAYXy1ggHHKrcZqHz4ugM2Biil4BCpFzVjEClsoKY +Iz淣ZAvXwh|ݧOXduҠ(nk , >5tu(ܸwlp[\/srpkۧFR \ No newline at end of file From ef15c4ca20ebbed15739a8afd9b3b29cc44c0ec4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 24 Jul 2024 13:28:29 +1000 Subject: [PATCH 086/584] hosts/dandelion: add acme_dns secret --- hosts/dandelion/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix index 01eb6ab..a4832b8 100644 --- a/hosts/dandelion/default.nix +++ b/hosts/dandelion/default.nix @@ -3,6 +3,10 @@ system.stateVersion = "23.11"; time.timeZone = "Australia/Melbourne"; + age.secrets = { + acme_dns.file = ../../secrets/acme_dns.age; + }; + imports = with modules.system; [ (modulesPath + "/profiles/qemu-guest.nix") inputs.home-manager-stable.nixosModule From 2b3d6fb3d7c5a0bb31abdf8bda957e6db7fd24dc Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 24 Jul 2024 13:35:59 +1000 Subject: [PATCH 087/584] hosts/dandelion: store esp in boot/efi to allow for kernel files --- hosts/dandelion/filesystem.nix | 2 +- hosts/dandelion/kernel.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix index d37cb1f..b191949 100644 --- a/hosts/dandelion/filesystem.nix +++ b/hosts/dandelion/filesystem.nix @@ -25,7 +25,7 @@ in { options = [ "defaults" "size=12G" "mode=755" ]; }; - "/boot" = mkLabelMount "UEFI" "vfat" true; + "/boot/efi" = mkLabelMount "UEFI" "vfat" true; "/nix" = submount "/@/nix" false; "/persist" = (submount "/@/persist" true) // { neededForBoot = true; }; "/persist/.snapshots" = submount "/snap/persist" false; diff --git a/hosts/dandelion/kernel.nix b/hosts/dandelion/kernel.nix index 76629f3..f6ed9ad 100644 --- a/hosts/dandelion/kernel.nix +++ b/hosts/dandelion/kernel.nix @@ -3,8 +3,10 @@ loader = { systemd-boot.enable = false; efi.canTouchEfiVariables = true; + efi.efiSysMountPoint = "/boot/efi"; grub = { enable = true; + efiSupport = true; device = "/dev/sda"; }; }; From d14c02bb836ab3fd70007c9220e82a3314e78ff2 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 24 Jul 2024 13:58:26 +1000 Subject: [PATCH 088/584] dandelion/filesystem: persist /boot in subvol --- hosts/dandelion/filesystem.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix index b191949..3165da7 100644 --- a/hosts/dandelion/filesystem.nix +++ b/hosts/dandelion/filesystem.nix @@ -25,6 +25,7 @@ in { options = [ "defaults" "size=12G" "mode=755" ]; }; + "/boot" = submount "/@/boot" false; "/boot/efi" = mkLabelMount "UEFI" "vfat" true; "/nix" = submount "/@/nix" false; "/persist" = (submount "/@/persist" true) // { neededForBoot = true; }; From b4f8e18398c0c202ffbf3882a58907ac354d3395 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 20:26:32 +1100 Subject: [PATCH 089/584] flake: bump inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Warbler! • Updated input 'agenix': 'github:ryantm/agenix/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9' (2024-05-24) → 'github:ryantm/agenix/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41' (2024-08-10) • Updated input 'discover': 'github:trigg/Discover/bbd1a08d54c37db48970d1c7312f1fc3a893e728' (2024-06-10) → 'github:trigg/Discover/c083f0b38309a0989a9562864110195a91933eb4' (2024-08-16) • Updated input 'home-manager': 'github:nix-community/home-manager/3d65009effd77cb0d6e7520b68b039836a7606cf' (2024-06-09) → 'github:nix-community/home-manager/d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a' (2024-12-06) • Updated input 'home-manager-stable': 'github:nix-community/home-manager/095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a' (2024-06-04) → 'github:nix-community/home-manager/f2e3c19867262dbe84fdfab42467fc8dd83a2005' (2024-07-01) • Updated input 'linux-tkg': 'github:Frogging-Family/linux-tkg/9c28c505bffe42093e4b4b6385a1b1ff16c0d7a2' (2024-06-11) → 'github:Frogging-Family/linux-tkg/bab5159471a507bfe9842149e80f4929f6be5dd4' (2024-12-05) • Updated input 'neovim-nightly': 'github:nix-community/neovim-nightly-overlay/60a8a1b221308566c51aa9a66e11145a3f141fc8' (2024-06-11) → 'github:nix-community/neovim-nightly-overlay/3930a71f90bacc656e8bdf19cc0faa9ebf10353a' (2024-12-07) • Updated input 'neovim-nightly/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04) • Updated input 'neovim-nightly/flake-parts': 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) → 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9' (2024-12-04) • Updated input 'neovim-nightly/git-hooks': 'github:cachix/git-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1' (2024-06-06) → 'github:cachix/git-hooks.nix/6f4e2a2112050951a314d2733a994fbab94864c6' (2024-12-04) • Updated input 'neovim-nightly/hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414' (2024-06-10) → 'github:hercules-ci/hercules-ci-effects/56f8ea8d502c87cf62444bec4ee04512e8ea24ea' (2024-12-04) • Updated input 'neovim-nightly/hercules-ci-effects/flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) → 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9' (2024-12-04) • Updated input 'neovim-nightly/neovim-src': 'github:neovim/neovim/37bf4c572a8fa20dc4a8433524ecc8c8d68fe53c' (2024-06-10) → 'github:neovim/neovim/517ecb85f58ed6ac8b4d5443931612e75e7c7dc2' (2024-12-06) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/58f43669b808e4a2679ce0e5ff12665e7082cc85' (2024-06-11) → 'github:fufexan/nix-gaming/094b2c4ee459dd5d3d1611c919d59f26110053b0' (2024-12-02) • Updated input 'nix-gaming/flake-parts': 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01) • Updated input 'nix-gaming/flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz?narHash=sha256-lIbdfCsf8LMFloheeE6N31%2BBMIeixqyQWbSr2vk79EQ%3D' (2024-06-01) → 'https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz?narHash=sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s%3D' (2024-11-01) • Updated input 'nix-gaming/nixpkgs': 'github:NixOS/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288' (2024-06-07) → 'github:NixOS/nixpkgs/33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9' (2024-11-30) • Added input 'nix-gaming/umu': 'git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&ref=refs/heads/main&rev=562e3900eebde0fb276dd2f425c097c8b44ccb92' (2024-12-06) • Added input 'nix-gaming/umu/nixpkgs': follows 'nix-gaming/nixpkgs' • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/35c20ba421dfa5059e20e0ef2343c875372bdcf3' (2024-06-10) → 'github:nix-community/nixos-generators/8cdaf8885c9c85d9d27b594dbe882406aadfe00e' (2024-12-05) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/3c62b6a12571c9a7f65ab037173ee153d539905f' (2024-04-07) → 'github:nix-community/nixpkgs.lib/0e4fdd4a0ab733276b6d2274ff84ae353f17129e' (2024-12-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/58b52b0dd191af70f538c707c66c682331cfdffc' (2024-06-10) → 'github:NixOS/nixos-hardware/e563803af3526852b6b1d77107a81908c66a9fcf' (2024-12-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3' (2024-06-09) → 'github:NixOS/nixpkgs/d0797a04b81caeae77bcff10a9dde78bc17f5661' (2024-12-05) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c' (2024-06-08) → 'github:NixOS/nixpkgs/205fd4226592cc83fd4c0885a3e4c9c400efabb5' (2024-07-09) • Updated input 'nvim-treesitter': 'github:nvim-treesitter/nvim-treesitter/9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421' (2024-06-11) → 'github:nvim-treesitter/nvim-treesitter/894cb3cebbad0535fb4e319ada5d875dbc48d8b9' (2024-12-07) • Updated input 'packwiz': 'github:comp500/packwiz/7b4be47578151c36e784306b36d251ec2590e50c' (2024-05-27) → 'github:comp500/packwiz/0626c00149a8d9a5e9f76e5640e7b8b95c064350' (2024-10-14) • Updated input 'pure': 'github:sindresorhus/pure/da1a722238febb9a4b97c77628fae753d1817490' (2024-04-29) → 'github:sindresorhus/pure/92b8e9057988566b37ff695e70e2e9bbeb7196c8' (2024-08-07) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/bedc47af18fc41bb7d2edc2b212d59ca36253f59' (2024-06-11) → 'github:oxalica/rust-overlay/66526479b295ad238843a8a7367d2da7ec102757' (2024-12-07) • Removed input 'rust-overlay/flake-utils' • Removed input 'rust-overlay/flake-utils/systems' • Updated input 'spicetify-nix': 'github:the-argus/spicetify-nix/1325416f951d6a82cfddb1289864ad782e2b87c4' (2024-01-02) → 'github:the-argus/spicetify-nix/6cce28acab7d9ec26188ed71295f6b4306e0a7f5' (2024-09-27) • Updated input 'spicetify-themes': 'github:spicetify/spicetify-themes/dfdd89ad84d5c68915c65e4a83580047349c49b4' (2024-05-17) → 'github:spicetify/spicetify-themes/ca4264263a51800a119fa0bea231f25f58857d5f' (2024-12-03) • Updated input 'spotify-adblock': 'github:abba23/spotify-adblock/5a3281dee9f889afdeea7263558e7a715dcf5aab' (2023-07-21) → 'github:abba23/spotify-adblock/7391666109c8f9d0ccc8254dc0ff7e28139c663b' (2024-09-15) • Updated input 'tree-sitter-glimmer': 'github:alexlafroscia/tree-sitter-glimmer/6b25d265c990139353e1f7f97baf84987ebb7bf0' (2024-03-19) → 'github:alexlafroscia/tree-sitter-glimmer/da605af8c5999b43e6839b575eae5e6cafabb06f' (2024-08-20) • Updated input 'wine-discord-ipc-bridge': 'github:0e4ef622/wine-discord-ipc-bridge/f8198c9d52e708143301017a296f7557c4387127' (2023-08-09) → 'github:0e4ef622/wine-discord-ipc-bridge/86fcbddaf654aec40c6fe6a8293f627340331b0c' (2024-10-28) • Updated input 'zsh-abbr': 'github:olets/zsh-abbr/84f18ab195547324c3addd735688f78909df61d4' (2024-06-05) → 'github:olets/zsh-abbr/510cf85ce7c1a3a0cf8e81aefe83b8c79c2ae09c' (2024-11-12) --- flake.lock | 252 ++++++++++++++++++++++++++--------------------------- 1 file changed, 122 insertions(+), 130 deletions(-) diff --git a/flake.lock b/flake.lock index 89454e4..27d6b85 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "discover": { "flake": false, "locked": { - "lastModified": 1718055168, - "narHash": "sha256-aQWn4lOWdbybI2PwWLhhDhImIdqhufr0dRpJwWv9684=", + "lastModified": 1723801648, + "narHash": "sha256-0b0uZDa9Q3pQ6X65C+E31dMpdTPt4vvHDEqFEtRoedg=", "owner": "trigg", "repo": "Discover", - "rev": "bbd1a08d54c37db48970d1c7312f1fc3a893e728", + "rev": "c083f0b38309a0989a9562864110195a91933eb4", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -189,24 +189,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -235,11 +217,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -279,11 +261,11 @@ ] }, "locked": { - "lastModified": 1718018037, - "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -342,11 +324,11 @@ ] }, "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", + "lastModified": 1719827415, + "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "owner": "nix-community", "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", + "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "type": "github" }, "original": { @@ -363,11 +345,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -395,11 +377,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1718071891, - "narHash": "sha256-l0eB8nIiLmx+k0U+/v3TkxBr6LV/ByqnBd9vTAqniE8=", + "lastModified": 1733441277, + "narHash": "sha256-G375M+kgIE+wqYI8sZkfEtgOXP7RKzX2CU3HaN3IM+A=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "9c28c505bffe42093e4b4b6385a1b1ff16c0d7a2", + "rev": "bab5159471a507bfe9842149e80f4929f6be5dd4", "type": "github" }, "original": { @@ -420,11 +402,11 @@ ] }, "locked": { - "lastModified": 1718090902, - "narHash": "sha256-XlFgIhunVheMVT5hv+Ov7wkjFldqqOWsRleYQHrgWQY=", + "lastModified": 1733530506, + "narHash": "sha256-x8slAzUe1gopASFNhnHO9DmWXvnF7u27YMSwTmIY8bU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "60a8a1b221308566c51aa9a66e11145a3f141fc8", + "rev": "3930a71f90bacc656e8bdf19cc0faa9ebf10353a", "type": "github" }, "original": { @@ -436,11 +418,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718038388, - "narHash": "sha256-npcA3yWucHF5uKKqcrSLJAy0hk3tTxfVCo/Da/Z4OOM=", + "lastModified": 1733517821, + "narHash": "sha256-QjFVx/zMyutuW1TWzOKEe5cY7YGqvPkRhi9wQHY52Yo=", "owner": "neovim", "repo": "neovim", - "rev": "37bf4c572a8fa20dc4a8433524ecc8c8d68fe53c", + "rev": "517ecb85f58ed6ac8b4d5443931612e75e7c7dc2", "type": "github" }, "original": { @@ -452,14 +434,15 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "umu": "umu" }, "locked": { - "lastModified": 1718068951, - "narHash": "sha256-wt9iAsStd4ghkkxKgByOnRfQ+9VRQoCc06nQ+VvsH/E=", + "lastModified": 1733101372, + "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "58f43669b808e4a2679ce0e5ff12665e7082cc85", + "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", "type": "github" }, "original": { @@ -470,11 +453,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -491,11 +474,11 @@ ] }, "locked": { - "lastModified": 1718025593, - "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", + "lastModified": 1733360821, + "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", + "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", "type": "github" }, "original": { @@ -506,11 +489,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717995329, - "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -521,11 +504,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717774105, - "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d226935fd75012939397c83f6c385e4d6d832288", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -537,14 +520,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-raccoon": { @@ -565,11 +548,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717880976, - "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -581,11 +564,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -598,11 +581,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1718071668, - "narHash": "sha256-7QLrIu3bN6vjEUZsdP6+DyciF7N/BWtPDcU8rISMVwo=", + "lastModified": 1733562844, + "narHash": "sha256-ehWBEM7OAEsUPmIf2dNfiALh+X9hSABqw7xU8SBaSBY=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421", + "rev": "894cb3cebbad0535fb4e319ada5d875dbc48d8b9", "type": "github" }, "original": { @@ -614,11 +597,11 @@ "packwiz": { "flake": false, "locked": { - "lastModified": 1716839662, - "narHash": "sha256-XBp8Xv55R8rhhsQiWnOPH8c3fCpV/yq41ozJDcGdWfs=", + "lastModified": 1728924593, + "narHash": "sha256-eAGfLUcyjDR2oJjLK3+DiuICTqoOcIwO5wL350w6vGw=", "owner": "comp500", "repo": "packwiz", - "rev": "7b4be47578151c36e784306b36d251ec2590e50c", + "rev": "0626c00149a8d9a5e9f76e5640e7b8b95c064350", "type": "github" }, "original": { @@ -630,11 +613,11 @@ "pure": { "flake": false, "locked": { - "lastModified": 1714417298, - "narHash": "sha256-Hdb5wGVkNrmmVWZaKf3xUnNYsTX/8Bb7AhgLNJxNAUc=", + "lastModified": 1723068801, + "narHash": "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=", "owner": "sindresorhus", "repo": "pure", - "rev": "da1a722238febb9a4b97c77628fae753d1817490", + "rev": "92b8e9057988566b37ff695e70e2e9bbeb7196c8", "type": "github" }, "original": { @@ -678,17 +661,16 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718072316, - "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=", + "lastModified": 1733538766, + "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59", + "rev": "66526479b295ad238843a8a7367d2da7ec102757", "type": "github" }, "original": { @@ -699,17 +681,17 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1704167711, - "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", + "lastModified": 1727460820, + "narHash": "sha256-j54SjpQVoIOblTzyGRWnQnJz63eUCPb1sI/oyDm+eO0=", "owner": "the-argus", "repo": "spicetify-nix", - "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", + "rev": "6cce28acab7d9ec26188ed71295f6b4306e0a7f5", "type": "github" }, "original": { @@ -721,11 +703,11 @@ "spicetify-themes": { "flake": false, "locked": { - "lastModified": 1715934942, - "narHash": "sha256-8IF2Y7xJtzk92rl4bfjiMXCISzUMaxXxOaMZkLS5mww=", + "lastModified": 1733270013, + "narHash": "sha256-f1oqEKH594LTACGzw6ZUQpgZqyHLeMz8HBvAfY5ub00=", "owner": "spicetify", "repo": "spicetify-themes", - "rev": "dfdd89ad84d5c68915c65e4a83580047349c49b4", + "rev": "ca4264263a51800a119fa0bea231f25f58857d5f", "type": "github" }, "original": { @@ -737,11 +719,11 @@ "spotify-adblock": { "flake": false, "locked": { - "lastModified": 1689983571, - "narHash": "sha256-UzpHAHpQx2MlmBNKm2turjeVmgp5zXKWm3nZbEo0mYE=", + "lastModified": 1726391487, + "narHash": "sha256-OjbJAn/QWXxaARyiKDBLdxCRscC+ZdaCRoBhINkmfHM=", "owner": "abba23", "repo": "spotify-adblock", - "rev": "5a3281dee9f889afdeea7263558e7a715dcf5aab", + "rev": "7391666109c8f9d0ccc8254dc0ff7e28139c663b", "type": "github" }, "original": { @@ -780,29 +762,14 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tree-sitter-glimmer": { "flake": false, "locked": { - "lastModified": 1710886185, - "narHash": "sha256-azLagXPC659Ee0UwqtW0XgpxGLqMSrwmKZy8htsp4xU=", + "lastModified": 1724183464, + "narHash": "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4=", "owner": "alexlafroscia", "repo": "tree-sitter-glimmer", - "rev": "6b25d265c990139353e1f7f97baf84987ebb7bf0", + "rev": "da605af8c5999b43e6839b575eae5e6cafabb06f", "type": "github" }, "original": { @@ -827,6 +794,31 @@ "type": "gitlab" } }, + "umu": { + "inputs": { + "nixpkgs": [ + "nix-gaming", + "nixpkgs" + ] + }, + "locked": { + "dir": "packaging/nix", + "lastModified": 1733509971, + "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", + "ref": "refs/heads/main", + "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", + "revCount": 865, + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + }, + "original": { + "dir": "packaging/nix", + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -862,11 +854,11 @@ "wine-discord-ipc-bridge": { "flake": false, "locked": { - "lastModified": 1691582340, - "narHash": "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q=", + "lastModified": 1730092778, + "narHash": "sha256-jzsbOKMakNQ6RNMlioX088fGzFBDxOP45Atlsfm2RKg=", "owner": "0e4ef622", "repo": "wine-discord-ipc-bridge", - "rev": "f8198c9d52e708143301017a296f7557c4387127", + "rev": "86fcbddaf654aec40c6fe6a8293f627340331b0c", "type": "github" }, "original": { @@ -878,11 +870,11 @@ "zsh-abbr": { "flake": false, "locked": { - "lastModified": 1717607378, - "narHash": "sha256-uIJHQp5Lrtxm2SWd56nctl5HOClgRzfeEXVERvVk2Kg=", + "lastModified": 1731435944, + "narHash": "sha256-ehdp9uV1ojFSirbD1OD0eaU1XF8sTUhP9U9/0VkaEdM=", "owner": "olets", "repo": "zsh-abbr", - "rev": "84f18ab195547324c3addd735688f78909df61d4", + "rev": "510cf85ce7c1a3a0cf8e81aefe83b8c79c2ae09c", "type": "github" }, "original": { From c57a76dd03d01781315518f3ad54643b0df02f06 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 20:29:14 +1100 Subject: [PATCH 090/584] packages/linux-lava: bump to 6.12.3 --- packages/linux-lava/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index dd40119..7c6d178 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.9.3"; - kernelHash = "0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4"; - kernelPatchHash = "1lzkpyp41175kf672s92bz7wzx0favy5xdmxpsgzl9s3z6hdyb7q"; + version = "6.12.3"; + kernelHash = "1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi"; + kernelPatchHash = "1nb9zhvx5s701kl5kmfifw41si1wrg2iw9v7szz8z291prrf3s7i"; mm = lib.versions.majorMinor version; tkgPatches = [ @@ -10,7 +10,7 @@ let "0003-glitched-base" "0003-glitched-eevdf-additions" "0003-glitched-cfs" - "0007-v${mm}-fsync1_via_futex_waitv" + "0007-v${mm}-fsync_legacy_via_futex_waitv" "0007-v${mm}-ntsync" # "0007-v${mm}-winesync" fails to patch "0012-misc-additions" From 7b3b9354de273dd76a4ba06ac1b6fbb728d16ae1 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 13:53:49 +1100 Subject: [PATCH 091/584] system/audio: update after removal of sound.enable --- modules/system/audio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/audio.nix b/modules/system/audio.nix index de59723..cfe1b25 100644 --- a/modules/system/audio.nix +++ b/modules/system/audio.nix @@ -17,7 +17,6 @@ let rate = toString int.rate; }; in { - sound.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -26,6 +25,7 @@ in { pulse.enable = true; jack.enable = true; }; + hardware.alsa.enablePersistence = true; services.pipewire.extraConfig.pipewire = { "context.properties" = { "default.clock.rate" = int.rate; From a669c4519b9fc6c5d578207d870a66770a6f4d3d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:02:51 +1100 Subject: [PATCH 092/584] packages/psensor: bring back --- packages/default.nix | 1 + packages/psensor/default.nix | 53 ++++++++++++++++++++++++++++++++++++ users/rin/packages.nix | 2 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 packages/psensor/default.nix diff --git a/packages/default.nix b/packages/default.nix index da90b36..c8bc839 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -8,6 +8,7 @@ linux-lava = callPackage ./linux-lava { inherit inputs; }; nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; }; packwiz = callPackage ./packwiz { inherit inputs; }; + psensor = callPackage ./psensor { }; spotify-adblock = callPackage ./spotify-adblock { inherit inputs; }; tetrio-desktop = callPackage ./tetrio/base.nix { }; tetrio-desktop-plus = callPackage ./tetrio/plus.nix { inherit tetrio-desktop; }; diff --git a/packages/psensor/default.nix b/packages/psensor/default.nix new file mode 100644 index 0000000..165cc73 --- /dev/null +++ b/packages/psensor/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, lm_sensors +, libgtop +, libatasmart +, gtk3 +, libnotify +, udisks2 +, wrapGAppsHook3 +, libappindicator +, linuxPackages +}: +let + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; +in +stdenv.mkDerivation rec { + pname = "psensor"; + + version = "1.2.1"; + + src = fetchurl { + url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; + sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; + + buildInputs = [ + lm_sensors + libgtop + libatasmart + gtk3 + libnotify + udisks2 + libappindicator + ]; + + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error" + NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" + ''; + + meta = with lib; { + description = "Graphical hardware monitoring application for Linux"; + homepage = "https://wpitchoune.net/psensor/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ ]; + mainProgram = "psensor"; + }; +} diff --git a/users/rin/packages.nix b/users/rin/packages.nix index b9c858d..0cb3bd4 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -39,11 +39,11 @@ maim mangohud #me.tetrio-desktop-plus + me.psensor inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin #inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol prismlauncher - psensor qbittorrent rivalcfg screenkey From b72afdf8564761282dc4869a5be2e1f0193475ed Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:06:50 +1100 Subject: [PATCH 093/584] overlays/utillinux: init to alias --- overlays/default.nix | 1 + overlays/utillinux.nix | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 overlays/utillinux.nix diff --git a/overlays/default.nix b/overlays/default.nix index d6c9151..52e804d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,5 +8,6 @@ builtins.map (path: import path) [ ./picom.nix ./rofi.nix ./steam.nix + ./utillinux.nix ./xinit.nix ] diff --git a/overlays/utillinux.nix b/overlays/utillinux.nix new file mode 100644 index 0000000..20db08a --- /dev/null +++ b/overlays/utillinux.nix @@ -0,0 +1,4 @@ +self: super: { + # Waiting for nixpkgs#349783 + utillinux = self.util-linux; +} From b2b9c08d73381f984614637e14d282013081496e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:08:01 +1100 Subject: [PATCH 094/584] system/gui: rename changed font package name --- modules/system/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 5f951e3..a0b2a93 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -15,7 +15,7 @@ hanazono material-icons noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-extra open-sans twemoji-color-font From 7e8d0a59ee14a62b0eeee17f71f4e418506cd00f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:35:07 +1100 Subject: [PATCH 095/584] rin/packages: remove osu --- users/rin/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 0cb3bd4..70cb8cf 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -40,7 +40,7 @@ mangohud #me.tetrio-desktop-plus me.psensor - inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin + #inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin #inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol prismlauncher From 882e1455cd3daa42ea1b0cb751ca4b06672832ea Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:37:58 +1100 Subject: [PATCH 096/584] system/printing: remove epson driver --- modules/system/printing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/printing.nix b/modules/system/printing.nix index 9cb254b..f7ccb20 100644 --- a/modules/system/printing.nix +++ b/modules/system/printing.nix @@ -3,7 +3,7 @@ enable = true; drivers = with pkgs; [ epson-escpr - me.epson-201112j + #me.epson-201112j ]; }; } From 7cebea55354483bdf07545ec0c539f43cd5119cf Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:41:45 +1100 Subject: [PATCH 097/584] overlays/corectrl: remove --- overlays/corectrl.nix | 16 ---------------- overlays/default.nix | 1 - overlays/patches/corectrl.patch | 21 --------------------- 3 files changed, 38 deletions(-) delete mode 100644 overlays/corectrl.nix delete mode 100644 overlays/patches/corectrl.patch diff --git a/overlays/corectrl.nix b/overlays/corectrl.nix deleted file mode 100644 index 1629a7e..0000000 --- a/overlays/corectrl.nix +++ /dev/null @@ -1,16 +0,0 @@ -self: super: { - # copied from nixpkgs 94d828a5033b688af09b02983aad37ecf529bf3c to fix corectrl build failure on linux 6.6 - # awaiting merge into unstable - - corectrl = super.corectrl.overrideAttrs (old: rec { - version = "1.3.8"; - src = self.fetchFromGitLab { - owner = "corectrl"; - repo = "corectrl"; - rev = "v${version}"; - sha256 = "sha256-lc6yWzJiSzGKMzJIpgOtirJONsh49vXWDWrhLV/erwQ="; - }; - - patches = [ ./patches/corectrl.patch ]; - }); -} diff --git a/overlays/default.nix b/overlays/default.nix index 52e804d..0b46673 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,6 @@ builtins.map (path: import path) [ ./android-studio.nix ./ccache.nix - ./corectrl.nix ./discord.nix ./eww.nix ./material-icons.nix diff --git a/overlays/patches/corectrl.patch b/overlays/patches/corectrl.patch deleted file mode 100644 index beaef3b..0000000 --- a/overlays/patches/corectrl.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt -index 3fe2ace..2542ea1 100644 ---- a/src/helper/CMakeLists.txt -+++ b/src/helper/CMakeLists.txt -@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") - - # Find polkit - pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) --execute_process( -- COMMAND pkg-config --variable=policydir polkit-gobject-1 -- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT -- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR -- OUTPUT_STRIP_TRAILING_WHITESPACE --) --if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") -- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config") --endif() -+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") - - list(APPEND HELPER_COMPILE_DEFINITIONS - ELPP_THREAD_SAFE From 484ed2e926775f4c60f93d3de83be726eb5de6e6 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 20:35:30 +1100 Subject: [PATCH 098/584] rin/packages: update to new gnome package names --- modules/system/packages.nix | 2 +- users/rin/packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/system/packages.nix b/modules/system/packages.nix index bc0c1b4..0356be9 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -16,7 +16,7 @@ wget ] ++ lib.optionals enableGUI [ gparted - gnome.nautilus + nautilus ]; environment.variables.EDITOR = "nvim"; } diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 70cb8cf..7a29d86 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -26,10 +26,9 @@ element-desktop eww feh + file-roller gamescope gimp - gnome.file-roller - gnome.zenity grim #kotatogram-desktop krita @@ -61,5 +60,6 @@ }) xclip xorg.xgamma + zenity ]; } From cb168182b3ddd8e2b0455def9a8b73f59d15ee6d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 20:36:09 +1100 Subject: [PATCH 099/584] system/packages: remove rocm --- modules/system/packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 0356be9..33a4057 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -26,8 +26,6 @@ vaapiIntel vaapiVdpau libvdpau-va-gl - rocm-opencl-icd - rocm-opencl-runtime ]; programs.light.enable = true; hardware.opentabletdriver.enable = true; From 0785ab9bcd2607199ba4f3e20efaa92183b88975 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 21:09:59 +1100 Subject: [PATCH 100/584] overlays/{discord,picom}: remove --- overlays/default.nix | 2 -- overlays/discord.nix | 9 --------- overlays/picom.nix | 10 ---------- 3 files changed, 21 deletions(-) delete mode 100644 overlays/discord.nix delete mode 100644 overlays/picom.nix diff --git a/overlays/default.nix b/overlays/default.nix index 0b46673..98b0cc9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,10 +1,8 @@ builtins.map (path: import path) [ ./android-studio.nix ./ccache.nix - ./discord.nix ./eww.nix ./material-icons.nix - ./picom.nix ./rofi.nix ./steam.nix ./utillinux.nix diff --git a/overlays/discord.nix b/overlays/discord.nix deleted file mode 100644 index badb6d3..0000000 --- a/overlays/discord.nix +++ /dev/null @@ -1,9 +0,0 @@ -self: super: { - discord-canary = super.discord-canary.override rec { - version = "0.0.166"; - src = builtins.fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "02sa34jjwwpf82w492qpk9k2jjfg2lkh1f2z4w5l0zyll6jwjikd"; - }; - }; -} diff --git a/overlays/picom.nix b/overlays/picom.nix deleted file mode 100644 index d5b7ef4..0000000 --- a/overlays/picom.nix +++ /dev/null @@ -1,10 +0,0 @@ -self: super: { - picom = super.picom.overrideAttrs (old: { - src = super.fetchFromGitHub { - repo = "picom"; - owner = "yshui"; - rev = "31e58712ec11b198340ae217d33a73d8ac73b7fe"; - sha256 = "1hg5jfpknbcv9scaghpy2nbrg9cxwm8mkh6znpgbbzr05g7ch6al"; - }; - }); -} From 87b1632ae200199ec69031a390fd1a2eb32f70ed Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 22:39:40 +1100 Subject: [PATCH 101/584] flake: include submodules for zsh-abbr --- flake.lock | 16 +++++++++------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 27d6b85..932a7f0 100644 --- a/flake.lock +++ b/flake.lock @@ -871,16 +871,18 @@ "flake": false, "locked": { "lastModified": 1731435944, - "narHash": "sha256-ehdp9uV1ojFSirbD1OD0eaU1XF8sTUhP9U9/0VkaEdM=", - "owner": "olets", - "repo": "zsh-abbr", + "narHash": "sha256-BbCUYOrgAvLXydGbUqpSHgQIG5Y/F/vrslKSRKPniUQ=", + "ref": "refs/heads/main", "rev": "510cf85ce7c1a3a0cf8e81aefe83b8c79c2ae09c", - "type": "github" + "revCount": 985, + "submodules": true, + "type": "git", + "url": "https://github.com/olets/zsh-abbr" }, "original": { - "owner": "olets", - "repo": "zsh-abbr", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/olets/zsh-abbr" } }, "zsh-history-substring-search": { diff --git a/flake.nix b/flake.nix index 48dcb21..22e46ba 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ spicetify-themes = { url = "github:spicetify/spicetify-themes"; flake = false; }; # zsh plugins - zsh-abbr = { url = "github:olets/zsh-abbr"; flake = false; }; + zsh-abbr = { url = "git+https://github.com/olets/zsh-abbr?submodules=1"; flake = false; }; zsh-history-substring-search = { url = "github:zsh-users/zsh-history-substring-search"; flake = false; }; fast-syntax-highlighting = { url = "github:zdharma-continuum/fast-syntax-highlighting"; flake = false; }; pure = { url = "github:sindresorhus/pure"; flake = false; }; From 53541504ecd14a439c4c185640048a7d9963ee12 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 22:43:33 +1100 Subject: [PATCH 102/584] system/audio: remove alsa persistence --- modules/system/audio.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/system/audio.nix b/modules/system/audio.nix index cfe1b25..46d50c0 100644 --- a/modules/system/audio.nix +++ b/modules/system/audio.nix @@ -25,7 +25,6 @@ in { pulse.enable = true; jack.enable = true; }; - hardware.alsa.enablePersistence = true; services.pipewire.extraConfig.pipewire = { "context.properties" = { "default.clock.rate" = int.rate; From 367901821aadbb35e91b512815ff5791b5ea3fa2 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 22:44:36 +1100 Subject: [PATCH 103/584] user/neovim: rename tsserver to ts_ls --- res/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/config.lua b/res/config.lua index a1bb8e2..75b3a95 100644 --- a/res/config.lua +++ b/res/config.lua @@ -141,7 +141,7 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) -local servers = { 'cssls', 'html', 'nil_ls', 'prismals', 'tsserver', 'yamlls' } +local servers = { 'cssls', 'html', 'nil_ls', 'prismals', 'ts_ls', 'yamlls' } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { capabilities = capabilities, From df3866ba66b3bf172ccd94dc1f846b47360489ec Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 7 Dec 2024 22:58:14 +1100 Subject: [PATCH 104/584] hosts/hyacinth: enable bluetooth --- hosts/hyacinth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index c59ca43..9d1b697 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -16,6 +16,7 @@ audio base + bluetooth ccache corectrl flatpak From 2e2131257084efd920cf27147ec7c445d68c9f0a Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 19 Dec 2024 23:04:56 +1100 Subject: [PATCH 105/584] rin/packages: add osu-lazer and osu-wine --- users/rin/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 7a29d86..61de105 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -39,8 +39,8 @@ mangohud #me.tetrio-desktop-plus me.psensor - #inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin - #inputs.nix-gaming.packages.x86_64-linux.wine-osu + inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin + inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol prismlauncher qbittorrent From ec14782c77ecff3f85b0ba4007599a6cf65b5da7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 3 Jan 2025 18:38:36 +1100 Subject: [PATCH 106/584] workflow: add .gitignore to ignore result --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result From 7d79d605d386652f9454c923a664df23aa017368 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 3 Jan 2025 18:39:05 +1100 Subject: [PATCH 107/584] system/aagl: init, and enable on hyacinth --- flake.lock | 72 ++++++++++++++++++++++++++++++++------ flake.nix | 1 + hosts/hyacinth/default.nix | 1 + modules/default.nix | 1 + modules/system/aagl.nix | 6 ++++ 5 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 modules/system/aagl.nix diff --git a/flake.lock b/flake.lock index 932a7f0..5871a04 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "aagl": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1734540176, + "narHash": "sha256-msxbnOw/nh8GJ87YtBEDT1jhVldOBtxHRF2KgvYPeDA=", + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "rev": "00df3ad02364a6fb8f1105dc72ae770b748c62eb", + "type": "github" + }, + "original": { + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "type": "github" + } + }, "agenix": { "inputs": { "darwin": "darwin", @@ -110,6 +129,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -205,7 +240,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly", @@ -392,7 +427,7 @@ }, "neovim-nightly": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", @@ -434,7 +469,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "umu": "umu" }, "locked": { @@ -504,16 +539,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732997066, - "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", - "owner": "NixOS", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -563,6 +598,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1733392399, "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", @@ -628,6 +679,7 @@ }, "root": { "inputs": { + "aagl": "aagl", "agenix": "agenix", "discord-tokyonight": "discord-tokyonight", "discover": "discover", @@ -641,7 +693,7 @@ "nix-gaming": "nix-gaming", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-raccoon": "nixpkgs-raccoon", "nixpkgs-stable": "nixpkgs-stable", "nvim-treesitter": "nvim-treesitter", diff --git a/flake.nix b/flake.nix index 22e46ba..ec87a43 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ nixos-generators.url = "github:nix-community/nixos-generators"; spicetify-nix.url = "github:the-argus/spicetify-nix"; + aagl.url = "github:ezKEa/aagl-gtk-on-nix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 9d1b697..970a7ff 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -14,6 +14,7 @@ inputs.home-manager.nixosModule home-manager + aagl audio base bluetooth diff --git a/modules/default.nix b/modules/default.nix index 0ad17ac..8316340 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -25,6 +25,7 @@ in { ./services/vaultwarden.nix ]; system = mkAttrsFromPaths [ + ./system/aagl.nix ./system/audio.nix ./system/base.nix ./system/bluetooth.nix diff --git a/modules/system/aagl.nix b/modules/system/aagl.nix new file mode 100644 index 0000000..57826c4 --- /dev/null +++ b/modules/system/aagl.nix @@ -0,0 +1,6 @@ +{ inputs, ... }: { + imports = [ inputs.aagl.nixosModules.default ]; + nix.settings = inputs.aagl.nixConfig; + programs.anime-game-launcher.enable = true; + programs.sleepy-launcher.enable = true; +} From aeb5b7e9a0a0b9bd9433e288e11ee1c0499a4d29 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 3 Jan 2025 19:15:22 +1100 Subject: [PATCH 108/584] user/theming: use default gtk themes --- modules/user/theming.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/user/theming.nix b/modules/user/theming.nix index 3cfd758..cacb500 100644 --- a/modules/user/theming.nix +++ b/modules/user/theming.nix @@ -7,16 +7,26 @@ name = "Open Sans"; size = 11; }; - iconTheme = { - package = pkgs.yaru-theme; - name = "Yaru"; + # iconTheme = { + # package = pkgs.yaru-theme; + # name = "Yaru"; + # }; + # theme = { + # name = "Adwaita-dark"; + # package = pkgs.gnome-themes-extra; + # }; + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = 1; }; - theme = { - name = "Materia-dark"; - package = pkgs.materia-theme; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = 1; }; }; + dconf.settings = { + "org/gnome/desktop/interface".color-scheme = "prefer-dark"; + }; + home.pointerCursor = { package = pkgs.yaru-theme; name = "Yaru"; From 1e6f7a3676e458aea9fb49d128029189985287ca Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 12 Jan 2025 12:10:30 +1100 Subject: [PATCH 109/584] hosts/hyacinth: switch to wayland --- hosts/hyacinth/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 970a7ff..9c2b274 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -21,7 +21,8 @@ ccache corectrl flatpak - greetd_xorg + #greetd_xorg + greetd_wayland gui input kernel @@ -38,7 +39,8 @@ ./kernel.nix ./networking.nix - ../../users/rin/xorg.nix + #../../users/rin/xorg.nix + ../../users/rin/wayland.nix ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; programs.hyprland.enable = true; From bedb4544cc53253a6a4c705f890ec1ac4d850f02 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 12 Jan 2025 13:07:16 +1100 Subject: [PATCH 110/584] user/eww-wayland: add ext mainbar --- res/eww-wayland/eww.yuck | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index a5bb2d1..93d75eb 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -9,6 +9,17 @@ :focusable false (bar)) +(defwindow mainbar-ext :monitor 1 + :geometry (geometry :x "0%" + :y "0%" + :width "100%" + :height "30px" + :anchor "top center") + :stacking "fg" + :exclusive false + :focusable false + (bar)) + (defpoll ptime :interval "1s" `date +%H:%M`) (defpoll petimea :interval "1s" From a4e71dcbd36c0b86088167c45d5c9513e252f7eb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 15 Jan 2025 23:04:23 +1100 Subject: [PATCH 111/584] rin/wayland: add wl-clipboard --- users/rin/wayland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index 78bdd09..74354b8 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -40,6 +40,7 @@ ]; services.mpris-proxy.enable = true; + home.packages = [ pkgs.wl-clipboard ]; home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe"; From ee430bd7d0bb0870b07548aef845de5019b2afda Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 15 Jan 2025 23:21:25 +1100 Subject: [PATCH 112/584] user/neovim: setup latex --- modules/user/neovim.nix | 1 + res/config.lua | 3 +++ users/rin/packages.nix | 2 ++ 3 files changed, 6 insertions(+) diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix index c90448b..d679b5c 100644 --- a/modules/user/neovim.nix +++ b/modules/user/neovim.nix @@ -40,6 +40,7 @@ in { vim-repeat vim-signify vim-surround + vimtex lsp_signature-nvim nvim-cmp diff --git a/res/config.lua b/res/config.lua index 75b3a95..0df0f6a 100644 --- a/res/config.lua +++ b/res/config.lua @@ -45,6 +45,9 @@ vim.g.signify_sign_delete_first_line = '┏━' vim.g.signify_sign_change = vim.g.signify_sign_add vim.g.signify_sign_change_delete = vim.g.signify_sign_delete +-- VimTeX +vim.g.vimtex_view_method = "zathura" + -- Theming require("tokyonight").setup({ style = "night" diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 61de105..d88dded 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -48,6 +48,7 @@ screenkey slurp swaybg + texliveFull tor-browser-bundle-bin transmission-remote-gtk virt-manager @@ -60,6 +61,7 @@ }) xclip xorg.xgamma + zathura zenity ]; } From 9a85f906996cd917cfbaeeea5ffb68c90ac51508 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 24 Jan 2025 12:57:53 +1100 Subject: [PATCH 113/584] user/catppuccin: init --- flake.lock | 207 +++++++++++++++++++++++++++++++++++- flake.nix | 5 +- modules/default.nix | 1 + modules/user/catppuccin.nix | 12 +++ modules/user/kitty.nix | 10 +- res/config.lua | 29 ++--- users/rin/wayland.nix | 1 + users/rin/xorg.nix | 1 + 8 files changed, 243 insertions(+), 23 deletions(-) create mode 100644 modules/user/catppuccin.nix diff --git a/flake.lock b/flake.lock index 5871a04..eb41764 100644 --- a/flake.lock +++ b/flake.lock @@ -42,6 +42,61 @@ "type": "github" } }, + "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager_2", + "home-manager-stable": "home-manager-stable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, + "locked": { + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", + "owner": "catppuccin", + "repo": "nix", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "type": "github" + } + }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734734291, + "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", + "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", + "revCount": 344, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -224,6 +279,24 @@ "inputs": { "systems": "systems_2" }, + "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_3" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -353,6 +426,28 @@ } }, "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-stable_2": { "inputs": { "nixpkgs": [ "nixpkgs-stable" @@ -374,6 +469,27 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737669579, + "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -409,6 +525,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "linux-tkg": { "flake": false, "locked": { @@ -582,6 +726,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1720535198, "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", @@ -629,6 +789,29 @@ "type": "github" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737372689, + "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "owner": "NuschtOS", + "repo": "search", + "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nvim-treesitter": { "flake": false, "locked": { @@ -681,12 +864,13 @@ "inputs": { "aagl": "aagl", "agenix": "agenix", + "catppuccin": "catppuccin", "discord-tokyonight": "discord-tokyonight", "discover": "discover", "fast-syntax-highlighting": "fast-syntax-highlighting", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "home-manager-raccoon": "home-manager-raccoon", - "home-manager-stable": "home-manager-stable", + "home-manager-stable": "home-manager-stable_2", "hosts-blocklists": "hosts-blocklists", "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", @@ -695,7 +879,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-raccoon": "nixpkgs-raccoon", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "nvim-treesitter": "nvim-treesitter", "packwiz": "packwiz", "pure": "pure", @@ -733,7 +917,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -814,6 +998,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tree-sitter-glimmer": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ec87a43..fa17cc1 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,8 @@ aagl.url = "github:ezKEa/aagl-gtk-on-nix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; + catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e"; + catppuccin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; @@ -50,7 +52,7 @@ rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, agenix, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: + outputs = { self, agenix, catppuccin, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: let overlays = (import ./overlays) ++ [(final: prev: { @@ -64,6 +66,7 @@ modules = [ { nixpkgs.overlays = overlays; } agenix.nixosModules.age + catppuccin.nixosModules.catppuccin (./hosts + "/${name}") ] ++ extraModules; specialArgs = { diff --git a/modules/default.nix b/modules/default.nix index 8316340..92e7519 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -50,6 +50,7 @@ in { ]; user = mkAttrsFromPaths [ ./user/bspwm.nix + ./user/catppuccin.nix ./user/direnv.nix ./user/dunst.nix ./user/eww.nix diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix new file mode 100644 index 0000000..e99b0d7 --- /dev/null +++ b/modules/user/catppuccin.nix @@ -0,0 +1,12 @@ +{ inputs, ... }: { + imports = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + + catppuccin = { + accent = "maroon"; + flavor = "mocha"; + kitty.enable = true; + nvim.enable = true; + }; +} diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index a7a7601..893e74c 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -9,10 +9,12 @@ settings = { font_features = "-ss01 +ss19"; enable_audio_bell = false; + color5 = "#cba6f7"; + color13 = "#cba6f7"; }; - extraConfig = builtins.readFile (builtins.fetchurl { - url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf"; - sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6"; - }); + # extraConfig = builtins.readFile (builtins.fetchurl { + # url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf"; + # sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6"; + # }); }; } diff --git a/res/config.lua b/res/config.lua index 0df0f6a..e9f30a9 100644 --- a/res/config.lua +++ b/res/config.lua @@ -49,24 +49,25 @@ vim.g.signify_sign_change_delete = vim.g.signify_sign_delete vim.g.vimtex_view_method = "zathura" -- Theming -require("tokyonight").setup({ - style = "night" -}) -vim.cmd[[ - syntax enable - colorscheme tokyonight -]] -local colors = require("tokyonight.colors").setup {} -vim.cmd("highlight SignifySignAdd guifg="..colors.green) -vim.cmd("highlight SignifySignChange guifg="..colors.orange) -vim.cmd("highlight SignifySignDelete guifg="..colors.red) -vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red) -vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red) +vim.api.nvim_command("syntax enable") +-- require("tokyonight").setup({ +-- style = "night" +-- }) +-- vim.cmd[[ +-- syntax enable +-- colorscheme tokyonight +-- ]] +-- local colors = require("tokyonight.colors").setup {} +-- vim.cmd("highlight SignifySignAdd guifg="..colors.green) +-- vim.cmd("highlight SignifySignChange guifg="..colors.orange) +-- vim.cmd("highlight SignifySignDelete guifg="..colors.red) +-- vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red) +-- vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red) -- Set this specific highlight group in rust -- Shown when using #[cfg] directives, entire chunks of disabled code has squiggly lines and I don't want -- to see it -vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment) +-- vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment) -- Plugins require('nvim-treesitter.configs').setup { diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index 74354b8..1bfef8c 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -19,6 +19,7 @@ ./packages.nix sessionVariables + catppuccin direnv git gpg diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix index d940f7b..8668bb0 100644 --- a/users/rin/xorg.nix +++ b/users/rin/xorg.nix @@ -19,6 +19,7 @@ ./packages.nix sessionVariables + catppuccin direnv git gpg From c3e83989a72651cdc248f26a184b09501f857701 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 13 Feb 2025 19:27:46 +1100 Subject: [PATCH 114/584] rin/packages: add android-studio --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index d88dded..989c585 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -21,6 +21,7 @@ nodePackages_latest.pnpm ] ++ lib.optionals enableGUI [ + android-studio discord-canary drawio element-desktop From 2631a1fadceba774a0bed18652b9a57c834ea5a1 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Feb 2025 20:34:18 +1100 Subject: [PATCH 115/584] rin/packages: add jetbrains idea --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 989c585..17d2112 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -31,6 +31,7 @@ gamescope gimp grim + jetbrains.idea-community-bin #kotatogram-desktop krita lm_sensors From 496274c0a52742af06ff426e9660054416fa6127 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 6 Mar 2025 22:12:46 +1100 Subject: [PATCH 116/584] user/neovim: use correct colors for signify --- modules/user/neovim.nix | 4 ++-- res/config.lua | 21 +++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix index d679b5c..4c74919 100644 --- a/modules/user/neovim.nix +++ b/modules/user/neovim.nix @@ -2,8 +2,8 @@ let luaconf = pkgs.writeText "config.lua" (lib.replaceStrings - ["{{OMNISHARP_PATH}}" "{{DART_PATH}}"] - ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart"] + ["{{OMNISHARP_PATH}}" "{{DART_PATH}}" "{{CATPPUCCIN_FLAVOUR}}"] + ["${pkgs.omnisharp-roslyn}/bin/OmniSharp" "${pkgs.dart}/bin/dart" config.catppuccin.nvim.flavor] (builtins.readFile ../../res/config.lua)); in { systemd.user.tmpfiles.rules = [ diff --git a/res/config.lua b/res/config.lua index e9f30a9..349ed15 100644 --- a/res/config.lua +++ b/res/config.lua @@ -50,24 +50,17 @@ vim.g.vimtex_view_method = "zathura" -- Theming vim.api.nvim_command("syntax enable") --- require("tokyonight").setup({ --- style = "night" --- }) --- vim.cmd[[ --- syntax enable --- colorscheme tokyonight --- ]] --- local colors = require("tokyonight.colors").setup {} --- vim.cmd("highlight SignifySignAdd guifg="..colors.green) --- vim.cmd("highlight SignifySignChange guifg="..colors.orange) --- vim.cmd("highlight SignifySignDelete guifg="..colors.red) --- vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red) --- vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red) +local colors = require("catppuccin.palettes").get_palette "{{CATPPUCCIN_FLAVOUR}}" +vim.cmd("highlight SignifySignAdd guifg="..colors.green) +vim.cmd("highlight SignifySignChange guifg="..colors.peach) +vim.cmd("highlight SignifySignDelete guifg="..colors.red) +vim.cmd("highlight SignifySignDeleteFirstLine guifg="..colors.red) +vim.cmd("highlight SignifySignChangeDelete guifg="..colors.red) -- Set this specific highlight group in rust -- Shown when using #[cfg] directives, entire chunks of disabled code has squiggly lines and I don't want -- to see it --- vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.comment) +vim.cmd("au FileType rust highlight DiagnosticUnderlineHint ctermfg=14 gui=italic guifg="..colors.overlay2) -- Plugins require('nvim-treesitter.configs').setup { From 4c08dd9171baac0f864925034058665f02308e21 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 6 Mar 2025 22:38:08 +1100 Subject: [PATCH 117/584] user/catppuccin: add a palette attribute --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + modules/user/catppuccin.nix | 13 +++++++++++-- modules/user/kitty.nix | 8 ++------ 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index eb41764..25d93a2 100644 --- a/flake.lock +++ b/flake.lock @@ -69,6 +69,22 @@ "type": "github" } }, + "catppuccin-palette": { + "flake": false, + "locked": { + "lastModified": 1730938296, + "narHash": "sha256-8AZVLJq5fKbMd/YFbqwgpHB7p4iTPTIMmC39R+3ZZ80=", + "owner": "catppuccin", + "repo": "palette", + "rev": "b85d36adec22631684ae64ced0a5cdd15462de3b", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "palette", + "type": "github" + } + }, "catppuccin-v1_1": { "locked": { "lastModified": 1734055249, @@ -865,6 +881,7 @@ "aagl": "aagl", "agenix": "agenix", "catppuccin": "catppuccin", + "catppuccin-palette": "catppuccin-palette", "discord-tokyonight": "discord-tokyonight", "discover": "discover", "fast-syntax-highlighting": "fast-syntax-highlighting", diff --git a/flake.nix b/flake.nix index fa17cc1..14e2cbf 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; catppuccin.url = "github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e"; catppuccin.inputs.nixpkgs.follows = "nixpkgs"; + catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; }; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index e99b0d7..1311421 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -1,9 +1,18 @@ -{ inputs, ... }: { +{ config, inputs, lib, ... }: { imports = [ inputs.catppuccin.homeManagerModules.catppuccin ]; - catppuccin = { + options.catppuccin.colors = lib.mkOption { + type = lib.types.attrs; + default = (builtins.fromJSON (builtins.readFile "${inputs.catppuccin-palette}/palette.json"))."${config.catppuccin.flavor}".colors; + }; + options.catppuccin.hexcolors = lib.mkOption { + type = lib.types.attrs; + default = builtins.mapAttrs (name: value: value.hex) config.catppuccin.colors; + }; + + config.catppuccin = { accent = "maroon"; flavor = "mocha"; kitty.enable = true; diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index 893e74c..1ae7970 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -9,12 +9,8 @@ settings = { font_features = "-ss01 +ss19"; enable_audio_bell = false; - color5 = "#cba6f7"; - color13 = "#cba6f7"; + color5 = config.catppuccin.hexcolors.mauve; + color13 = config.catppuccin.hexcolors.mauve; }; - # extraConfig = builtins.readFile (builtins.fetchurl { - # url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/eede574f9ef57137e6d7e4bab37b09db636c5a56/extras/kitty_tokyonight_night.conf"; - # sha256 = "0l9yl3qmgf7b10x7hy7q5hma0hsyamq3n14lfbw31cimm6snwim6"; - # }); }; } From 4423adbd616b17cc449e337396eb2cbe952b21eb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 8 Mar 2025 23:25:08 +1100 Subject: [PATCH 118/584] system/packages: add comma --- modules/system/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 33a4057..d012af0 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -1,5 +1,6 @@ { config, enableGUI, lib, pkgs, ... }: { environment.systemPackages = with pkgs; [ + comma efibootmgr git htop From c464b40e6a35b6f69eae104ca36de5aa07be227f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 5 Mar 2025 15:15:16 +1100 Subject: [PATCH 119/584] rin/packages: add obsidian --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 17d2112..9164b83 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -43,6 +43,7 @@ me.psensor inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin inputs.nix-gaming.packages.x86_64-linux.wine-osu + obsidian pavucontrol prismlauncher qbittorrent From 228123e2c70e44988c7059335d269bc1a3c2e7a1 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 8 Mar 2025 23:41:14 +1100 Subject: [PATCH 120/584] flake: bump inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'aagl': 'github:ezKEa/aagl-gtk-on-nix/00df3ad02364a6fb8f1105dc72ae770b748c62eb?narHash=sha256-msxbnOw/nh8GJ87YtBEDT1jhVldOBtxHRF2KgvYPeDA%3D' (2024-12-18) → 'github:ezKEa/aagl-gtk-on-nix/5505af25160f16ad26f9107aebee9ea7713b59d9?narHash=sha256-u695YUS3R5HI1VQp7feCifWYOn3Gh6yGde1vp5rKqTg%3D' (2025-03-02) • Updated input 'aagl/nixpkgs': 'github:nixos/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33?narHash=sha256-cHar1vqHOOyC7f1%2BtVycPoWTfKIaqkoe1Q6TnKzuti4%3D' (2024-12-17) → 'github:nixos/nixpkgs/5135c59491985879812717f4c9fea69604e7f26f?narHash=sha256-Vr3Qi346M%2B8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic%3D' (2025-02-26) • Updated input 'agenix': 'github:ryantm/agenix/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41?narHash=sha256-b%2Buqzj%2BWa6xgMS9aNbX4I%2BsXeb5biPDi39VgvSFqFvU%3D' (2024-08-10) → 'github:ryantm/agenix/e600439ec4c273cf11e06fe4d9d906fb98fa097c?narHash=sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA%3D' (2025-01-15) • Updated input 'catppuccin/catppuccin-v1_2': 'https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz?narHash=sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek%3D' (2024-12-20) → 'https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz?narHash=sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA%3D' (2024-12-20) • Updated input 'catppuccin/home-manager': 'github:nix-community/home-manager/7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9?narHash=sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E%3D' (2025-01-23) → 'github:nix-community/home-manager/1395379a7a36e40f2a76e7b9936cc52950baa1be?narHash=sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI%3D' (2024-12-19) • Updated input 'catppuccin/home-manager-stable': 'github:nix-community/home-manager/bd65bc3cde04c16755955630b344bc9e35272c56?narHash=sha256-dinzAqCjenWDxuy%2BMqUQq0I4zUSfaCvN9rzuCmgMZJY%3D' (2025-01-08) → 'github:nix-community/home-manager/80b0fdf483c5d1cb75aaad909bd390d48673857f?narHash=sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw%3D' (2024-12-16) • Updated input 'catppuccin/nixpkgs-stable': 'github:NixOS/nixpkgs/47addd76727f42d351590c905d9d1905ca895b82?narHash=sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB%2Bf3M%3D' (2025-01-22) → 'github:NixOS/nixpkgs/b47fd6fa00c6afca88b8ee46cfdb00e104f50bca?narHash=sha256-nbG9TijTMcfr%2Bau7ZVbKpAhMJzzE2nQBYmRvSdXUD8g%3D' (2024-12-19) • Updated input 'catppuccin/nuscht-search': 'github:NuschtOS/search/570cc17bbc25650eb7d69e4fcda8cfd2f1656922?narHash=sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE%3D' (2025-01-20) → 'github:NuschtOS/search/3051be7f403bff1d1d380e4612f0c70675b44fc9?narHash=sha256-Y47y%2BLesOCkJaLvj%2BdI/Oa6FAKj/T9sKVKDXLNsViPw%3D' (2024-12-09) • Updated input 'catppuccin-palette': 'github:catppuccin/palette/b85d36adec22631684ae64ced0a5cdd15462de3b?narHash=sha256-8AZVLJq5fKbMd/YFbqwgpHB7p4iTPTIMmC39R%2B3ZZ80%3D' (2024-11-07) → 'github:catppuccin/palette/5bb0420add3b61e4c7e32549e014f06e03dfbc42?narHash=sha256-aIIwnSRJPQGaAwprYIRQ7Bp5MtpAhJS8Y007cBi0UsI%3D' (2025-03-07) • Updated input 'discover': 'github:trigg/Discover/c083f0b38309a0989a9562864110195a91933eb4?narHash=sha256-0b0uZDa9Q3pQ6X65C%2BE31dMpdTPt4vvHDEqFEtRoedg%3D' (2024-08-16) → 'github:trigg/Discover/e7992e015212bdaaf36c9800cfcba1000cea0f65?narHash=sha256-GMbkCB70Rp18fk3mUIfYEQlqibDWtMg74ejxecT75mA%3D' (2024-12-16) • Updated input 'home-manager': 'github:nix-community/home-manager/d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a?narHash=sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc%3D' (2024-12-06) → 'github:nix-community/home-manager/26f6b862645ff281f3bada5d406e8c20de8d837c?narHash=sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4%3D' (2025-03-08) • Updated input 'linux-tkg': 'github:Frogging-Family/linux-tkg/bab5159471a507bfe9842149e80f4929f6be5dd4?narHash=sha256-G375M%2BkgIE%2BwqYI8sZkfEtgOXP7RKzX2CU3HaN3IM%2BA%3D' (2024-12-05) → 'github:Frogging-Family/linux-tkg/1146bf0623e06befb70e2905f42f033351fbd19f?narHash=sha256-39zEl8F5HUOHdVaMeo%2B0jYs056w3vDmjdPhK/GzbqBU%3D' (2025-03-08) • Updated input 'neovim-nightly': 'github:nix-community/neovim-nightly-overlay/3930a71f90bacc656e8bdf19cc0faa9ebf10353a?narHash=sha256-x8slAzUe1gopASFNhnHO9DmWXvnF7u27YMSwTmIY8bU%3D' (2024-12-07) → 'github:nix-community/neovim-nightly-overlay/c1855b306b8eeb70118b3ba70471188a65e694e7?narHash=sha256-qaDw0TyUceZBLntPBOdd1642T/mBGMNtK5NBuv2gWiY%3D' (2025-03-07) • Updated input 'neovim-nightly/flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764?narHash=sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo%3D' (2025-03-01) • Updated input 'neovim-nightly/git-hooks': 'github:cachix/git-hooks.nix/6f4e2a2112050951a314d2733a994fbab94864c6?narHash=sha256-SVQVsbafSM1dJ4fpgyBqLZ%2BLft%2BjcQuMtEL3lQWx2Sk%3D' (2024-12-04) → 'github:cachix/git-hooks.nix/42b1ba089d2034d910566bf6b40830af6b8ec732?narHash=sha256-JvQvtaphZNmeeV%2BIpHgNdiNePsIpHD5U/7QN5AeY44A%3D' (2025-03-02) • Removed input 'neovim-nightly/git-hooks/nixpkgs-stable' • Updated input 'neovim-nightly/hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/56f8ea8d502c87cf62444bec4ee04512e8ea24ea?narHash=sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w%3D' (2024-12-04) → 'github:hercules-ci/hercules-ci-effects/06519cec8fb32d219006da6eacd255504a9996af?narHash=sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI%3D' (2025-02-15) • Updated input 'neovim-nightly/hercules-ci-effects/flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) → 'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd?narHash=sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm%2BzmZ7vxbJdo%3D' (2025-02-01) • Updated input 'neovim-nightly/neovim-src': 'github:neovim/neovim/517ecb85f58ed6ac8b4d5443931612e75e7c7dc2?narHash=sha256-QjFVx/zMyutuW1TWzOKEe5cY7YGqvPkRhi9wQHY52Yo%3D' (2024-12-06) → 'github:neovim/neovim/e46f07b1d2942c7b5c08fca9a4cac735ee2c0c71?narHash=sha256-zcgucpL/rgEC/IIii6R4NvmtJsYT%2B/F0ub1FQOWVv0Q%3D' (2025-03-06) • Added input 'neovim-nightly/treefmt-nix': 'github:numtide/treefmt-nix/3d0579f5cc93436052d94b73925b48973a104204?narHash=sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU%3D' (2025-02-17) • Added input 'neovim-nightly/treefmt-nix/nixpkgs': follows 'neovim-nightly/nixpkgs' • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/094b2c4ee459dd5d3d1611c919d59f26110053b0?narHash=sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo%3D' (2024-12-02) → 'github:fufexan/nix-gaming/0e78e723bdf5a13dc45f3a6b994715b871c3f650?narHash=sha256-M/ppn20it9Ru2hoYoWIYzEWyTfBVxQiAQ7SvRws%2BluY%3D' (2025-03-07) • Updated input 'nix-gaming/flake-parts': 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764?narHash=sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo%3D' (2025-03-01) • Updated input 'nix-gaming/flake-parts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz?narHash=sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s%3D' (2024-11-01) → 'https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz?narHash=sha256-3wHafybyRfpUCLoE8M%2BuPVZinImg3xX%2BNm6gEfN3G8I%3D' (2025-03-01) • Updated input 'nix-gaming/nixpkgs': 'github:NixOS/nixpkgs/33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9?narHash=sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q%3D' (2024-11-30) → 'github:NixOS/nixpkgs/199169a2135e6b864a888e89a2ace345703c025d?narHash=sha256-igS2Z4tVw5W/x3lCZeeadt0vcU9fxtetZ/RyrqsCRQ0%3D' (2025-03-01) • Removed input 'nix-gaming/umu' • Removed input 'nix-gaming/umu/nixpkgs' • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/8cdaf8885c9c85d9d27b594dbe882406aadfe00e?narHash=sha256-bNXO%2BOGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8%3D' (2024-12-05) → 'github:nix-community/nixos-generators/507911df8c35939050ae324caccc7cf4ffb76565?narHash=sha256-Co2kAD2SZalOm%2B5zoxmzEVZNvZ17TyafuFsD46BwSdY%3D' (2025-03-02) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/0e4fdd4a0ab733276b6d2274ff84ae353f17129e?narHash=sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8%3D' (2024-12-01) → 'github:nix-community/nixpkgs.lib/1418bc28a52126761c02dd3d89b2d8ca0f521181?narHash=sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s%3D' (2025-01-12) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e563803af3526852b6b1d77107a81908c66a9fcf?narHash=sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is%3D' (2024-12-06) → 'github:NixOS/nixos-hardware/b48cc4dab0f9711af296fc367b6108cf7b8ccb16?narHash=sha256-RUAdT8dZ6k/486vnu3tiNRrNW6%2BQ8uSD2Mq7gTX4jlo%3D' (2025-03-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d0797a04b81caeae77bcff10a9dde78bc17f5661?narHash=sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG%2BcBns%3D' (2024-12-05) → 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06) • Updated input 'nvim-treesitter': 'github:nvim-treesitter/nvim-treesitter/894cb3cebbad0535fb4e319ada5d875dbc48d8b9?narHash=sha256-ehWBEM7OAEsUPmIf2dNfiALh%2BX9hSABqw7xU8SBaSBY%3D' (2024-12-07) → 'github:nvim-treesitter/nvim-treesitter/ee8e149a4ff75ebd5f1b065831746ddaf0e480ec?narHash=sha256-nnnCrsOFm82/Oa6/ipbRQiy7K4f5o9bw4G6qGaYNGIU%3D' (2025-03-08) • Updated input 'packwiz': 'github:comp500/packwiz/0626c00149a8d9a5e9f76e5640e7b8b95c064350?narHash=sha256-eAGfLUcyjDR2oJjLK3%2BDiuICTqoOcIwO5wL350w6vGw%3D' (2024-10-14) → 'github:comp500/packwiz/241f24b550f6fe838913a56bdd58bac2fc53254a?narHash=sha256-VmNsWzsFVNRciNIPUXUVos4cBdpawgN1/nPwMjNpx%2B0%3D' (2025-01-19) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/66526479b295ad238843a8a7367d2da7ec102757?narHash=sha256-FEDfBpM82XGdHDbLDJC4lV%2BQXSVN1rERt1MqtBGJZds%3D' (2024-12-07) → 'github:oxalica/rust-overlay/16b6045a232fea0e9e4c69e55a6e269607dd8e3f?narHash=sha256-tEpgT%2Bq5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g%3D' (2025-03-08) • Updated input 'spicetify-themes': 'github:spicetify/spicetify-themes/ca4264263a51800a119fa0bea231f25f58857d5f?narHash=sha256-f1oqEKH594LTACGzw6ZUQpgZqyHLeMz8HBvAfY5ub00%3D' (2024-12-03) → 'github:spicetify/spicetify-themes/10431678bd682547a2afdff855e8d26a3007f2c8?narHash=sha256-%2BlcRYilVK3cp5Ii6Q3/d00udTsq%2BUGqD%2ByKv2e2e6eA%3D' (2025-03-03) • Updated input 'spotify-adblock': 'github:abba23/spotify-adblock/7391666109c8f9d0ccc8254dc0ff7e28139c663b?narHash=sha256-OjbJAn/QWXxaARyiKDBLdxCRscC%2BZdaCRoBhINkmfHM%3D' (2024-09-15) → 'github:abba23/spotify-adblock/8e0312d6085a6e4f9afeb7c2457517a75e8b8f9d?narHash=sha256-nwiX2wCZBKRTNPhmrurWQWISQdxgomdNwcIKG2kSQsE%3D' (2025-02-10) • Updated input 'zsh-abbr': 'git+https://github.com/olets/zsh-abbr?ref=refs/heads/main&rev=510cf85ce7c1a3a0cf8e81aefe83b8c79c2ae09c&submodules=1' (2024-11-12) → 'git+https://github.com/olets/zsh-abbr?ref=refs/heads/main&rev=f9e43d78110db0a8bf8ec75ca5b101a06b1d5ce8&submodules=1' (2025-02-21) --- flake.lock | 236 ++++++++++++++++++++++++++--------------------------- 1 file changed, 114 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 25d93a2..83b6f7d 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1734540176, - "narHash": "sha256-msxbnOw/nh8GJ87YtBEDT1jhVldOBtxHRF2KgvYPeDA=", + "lastModified": 1740876632, + "narHash": "sha256-u695YUS3R5HI1VQp7feCifWYOn3Gh6yGde1vp5rKqTg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "00df3ad02364a6fb8f1105dc72ae770b748c62eb", + "rev": "5505af25160f16ad26f9107aebee9ea7713b59d9", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "catppuccin-palette": { "flake": false, "locked": { - "lastModified": 1730938296, - "narHash": "sha256-8AZVLJq5fKbMd/YFbqwgpHB7p4iTPTIMmC39R+3ZZ80=", + "lastModified": 1741384489, + "narHash": "sha256-aIIwnSRJPQGaAwprYIRQ7Bp5MtpAhJS8Y007cBi0UsI=", "owner": "catppuccin", "repo": "palette", - "rev": "b85d36adec22631684ae64ced0a5cdd15462de3b", + "rev": "5bb0420add3b61e4c7e32549e014f06e03dfbc42", "type": "github" }, "original": { @@ -101,12 +101,12 @@ }, "catppuccin-v1_2": { "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", - "revCount": 344, + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" }, "original": { "type": "tarball", @@ -154,11 +154,11 @@ "discover": { "flake": false, "locked": { - "lastModified": 1723801648, - "narHash": "sha256-0b0uZDa9Q3pQ6X65C+E31dMpdTPt4vvHDEqFEtRoedg=", + "lastModified": 1734385014, + "narHash": "sha256-GMbkCB70Rp18fk3mUIfYEQlqibDWtMg74ejxecT75mA=", "owner": "trigg", "repo": "Discover", - "rev": "c083f0b38309a0989a9562864110195a91933eb4", + "rev": "e7992e015212bdaaf36c9800cfcba1000cea0f65", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -334,18 +334,14 @@ "nixpkgs": [ "neovim-nightly", "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly", - "nixpkgs" ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -385,11 +381,11 @@ ] }, "locked": { - "lastModified": 1733333617, - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "lastModified": 1739595404, + "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "rev": "06519cec8fb32d219006da6eacd255504a9996af", "type": "github" }, "original": { @@ -449,11 +445,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -492,11 +488,11 @@ ] }, "locked": { - "lastModified": 1737669579, - "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -512,11 +508,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1741416850, + "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", "type": "github" }, "original": { @@ -572,11 +568,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1733441277, - "narHash": "sha256-G375M+kgIE+wqYI8sZkfEtgOXP7RKzX2CU3HaN3IM+A=", + "lastModified": 1741397765, + "narHash": "sha256-39zEl8F5HUOHdVaMeo+0jYs056w3vDmjdPhK/GzbqBU=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "bab5159471a507bfe9842149e80f4929f6be5dd4", + "rev": "1146bf0623e06befb70e2905f42f033351fbd19f", "type": "github" }, "original": { @@ -594,14 +590,15 @@ "neovim-src": "neovim-src", "nixpkgs": [ "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733530506, - "narHash": "sha256-x8slAzUe1gopASFNhnHO9DmWXvnF7u27YMSwTmIY8bU=", + "lastModified": 1741306000, + "narHash": "sha256-qaDw0TyUceZBLntPBOdd1642T/mBGMNtK5NBuv2gWiY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3930a71f90bacc656e8bdf19cc0faa9ebf10353a", + "rev": "c1855b306b8eeb70118b3ba70471188a65e694e7", "type": "github" }, "original": { @@ -613,11 +610,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1733517821, - "narHash": "sha256-QjFVx/zMyutuW1TWzOKEe5cY7YGqvPkRhi9wQHY52Yo=", + "lastModified": 1741302428, + "narHash": "sha256-zcgucpL/rgEC/IIii6R4NvmtJsYT+/F0ub1FQOWVv0Q=", "owner": "neovim", "repo": "neovim", - "rev": "517ecb85f58ed6ac8b4d5443931612e75e7c7dc2", + "rev": "e46f07b1d2942c7b5c08fca9a4cac735ee2c0c71", "type": "github" }, "original": { @@ -629,15 +626,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_2", - "umu": "umu" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733101372, - "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", + "lastModified": 1741311896, + "narHash": "sha256-M/ppn20it9Ru2hoYoWIYzEWyTfBVxQiAQ7SvRws+luY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", + "rev": "0e78e723bdf5a13dc45f3a6b994715b871c3f650", "type": "github" }, "original": { @@ -648,11 +644,11 @@ }, "nixlib": { "locked": { - "lastModified": 1733015484, - "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { @@ -669,11 +665,11 @@ ] }, "locked": { - "lastModified": 1733360821, - "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -684,11 +680,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1741325094, + "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "type": "github" }, "original": { @@ -699,11 +695,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -715,14 +711,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1740872140, + "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, "nixpkgs-raccoon": { @@ -743,11 +739,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { @@ -775,11 +771,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732997066, - "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", + "lastModified": 1740791350, + "narHash": "sha256-igS2Z4tVw5W/x3lCZeeadt0vcU9fxtetZ/RyrqsCRQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "rev": "199169a2135e6b864a888e89a2ace345703c025d", "type": "github" }, "original": { @@ -791,11 +787,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -815,11 +811,11 @@ ] }, "locked": { - "lastModified": 1737372689, - "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -831,11 +827,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1733562844, - "narHash": "sha256-ehWBEM7OAEsUPmIf2dNfiALh+X9hSABqw7xU8SBaSBY=", + "lastModified": 1741416594, + "narHash": "sha256-nnnCrsOFm82/Oa6/ipbRQiy7K4f5o9bw4G6qGaYNGIU=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "894cb3cebbad0535fb4e319ada5d875dbc48d8b9", + "rev": "ee8e149a4ff75ebd5f1b065831746ddaf0e480ec", "type": "github" }, "original": { @@ -847,11 +843,11 @@ "packwiz": { "flake": false, "locked": { - "lastModified": 1728924593, - "narHash": "sha256-eAGfLUcyjDR2oJjLK3+DiuICTqoOcIwO5wL350w6vGw=", + "lastModified": 1737328283, + "narHash": "sha256-VmNsWzsFVNRciNIPUXUVos4cBdpawgN1/nPwMjNpx+0=", "owner": "comp500", "repo": "packwiz", - "rev": "0626c00149a8d9a5e9f76e5640e7b8b95c064350", + "rev": "241f24b550f6fe838913a56bdd58bac2fc53254a", "type": "github" }, "original": { @@ -919,11 +915,11 @@ ] }, "locked": { - "lastModified": 1733538766, - "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", + "lastModified": 1741400194, + "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "66526479b295ad238843a8a7367d2da7ec102757", + "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", "type": "github" }, "original": { @@ -956,11 +952,11 @@ "spicetify-themes": { "flake": false, "locked": { - "lastModified": 1733270013, - "narHash": "sha256-f1oqEKH594LTACGzw6ZUQpgZqyHLeMz8HBvAfY5ub00=", + "lastModified": 1740994554, + "narHash": "sha256-+lcRYilVK3cp5Ii6Q3/d00udTsq+UGqD+yKv2e2e6eA=", "owner": "spicetify", "repo": "spicetify-themes", - "rev": "ca4264263a51800a119fa0bea231f25f58857d5f", + "rev": "10431678bd682547a2afdff855e8d26a3007f2c8", "type": "github" }, "original": { @@ -972,11 +968,11 @@ "spotify-adblock": { "flake": false, "locked": { - "lastModified": 1726391487, - "narHash": "sha256-OjbJAn/QWXxaARyiKDBLdxCRscC+ZdaCRoBhINkmfHM=", + "lastModified": 1739206126, + "narHash": "sha256-nwiX2wCZBKRTNPhmrurWQWISQdxgomdNwcIKG2kSQsE=", "owner": "abba23", "repo": "spotify-adblock", - "rev": "7391666109c8f9d0ccc8254dc0ff7e28139c663b", + "rev": "8e0312d6085a6e4f9afeb7c2457517a75e8b8f9d", "type": "github" }, "original": { @@ -1062,29 +1058,25 @@ "type": "gitlab" } }, - "umu": { + "treefmt-nix": { "inputs": { "nixpkgs": [ - "nix-gaming", + "neovim-nightly", "nixpkgs" ] }, "locked": { - "dir": "packaging/nix", - "lastModified": 1733509971, - "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", - "ref": "refs/heads/main", - "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", - "revCount": 865, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "type": "github" }, "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" } }, "utils": { @@ -1138,11 +1130,11 @@ "zsh-abbr": { "flake": false, "locked": { - "lastModified": 1731435944, - "narHash": "sha256-BbCUYOrgAvLXydGbUqpSHgQIG5Y/F/vrslKSRKPniUQ=", + "lastModified": 1740172038, + "narHash": "sha256-idwCtAwXa7qNZlKE8KdS9cUgEOCSdf6tec0YuXINcl8=", "ref": "refs/heads/main", - "rev": "510cf85ce7c1a3a0cf8e81aefe83b8c79c2ae09c", - "revCount": 985, + "rev": "f9e43d78110db0a8bf8ec75ca5b101a06b1d5ce8", + "revCount": 1041, "submodules": true, "type": "git", "url": "https://github.com/olets/zsh-abbr" From 80be3da7fceaed045a6e8f3c6c1139e463db7869 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 8 Mar 2025 23:44:45 +1100 Subject: [PATCH 121/584] packages/linux-lava: bump to 6.13.6 --- packages/linux-lava/sources.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 7c6d178..f084b98 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.12.3"; - kernelHash = "1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi"; - kernelPatchHash = "1nb9zhvx5s701kl5kmfifw41si1wrg2iw9v7szz8z291prrf3s7i"; + version = "6.13.6"; + kernelHash = "0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7"; + kernelPatchHash = "11jbq6j7kz47p1291ys9b7v7jh7skaw1n4rj10ahl5m701lsk0vz"; mm = lib.versions.majorMinor version; tkgPatches = [ @@ -12,7 +12,6 @@ let "0003-glitched-cfs" "0007-v${mm}-fsync_legacy_via_futex_waitv" "0007-v${mm}-ntsync" -# "0007-v${mm}-winesync" fails to patch "0012-misc-additions" ]; From 24aa8d01748e1ea0b381ec8c73168411d2fe9704 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 14 Mar 2025 20:41:19 +1100 Subject: [PATCH 122/584] packages/linux-lava: fix clang build issues after nixpkgs changes --- overlays/default.nix | 1 + overlays/linux-lava.nix | 23 +++++++++++++++++++++++ packages/linux-lava/default.nix | 15 ++------------- 3 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 overlays/linux-lava.nix diff --git a/overlays/default.nix b/overlays/default.nix index 98b0cc9..4d8552f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,6 +2,7 @@ builtins.map (path: import path) [ ./android-studio.nix ./ccache.nix ./eww.nix + ./linux-lava.nix ./material-icons.nix ./rofi.nix ./steam.nix diff --git a/overlays/linux-lava.nix b/overlays/linux-lava.nix new file mode 100644 index 0000000..d83fb98 --- /dev/null +++ b/overlays/linux-lava.nix @@ -0,0 +1,23 @@ +self: super: let + llvmPackages = super.llvmPackages_19; + clangVersion = super.lib.versions.major llvmPackages.libclang.version; + cc = llvmPackages.stdenv.cc.override { + # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 + bintools = llvmPackages.bintools; + extraBuildCommands = '' + substituteInPlace "$out/nix-support/cc-cflags" --replace " -nostdlibinc" "" + substituteInPlace "$out/nix-support/add-local-cc-cflags-before.sh" --replace 'echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2' "" + echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags + ''; + }; + stdenv = super.ccacheStdenv.override { + stdenv = super.overrideCC llvmPackages.stdenv cc; + }; +in { + linuxLavaEnv = { + inherit llvmPackages clangVersion cc stdenv; + }; + rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override { + clang = cc; + }; +} diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index 17b15ef..a4623d9 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -1,27 +1,16 @@ { buildLinux , callPackage -, ccacheStdenv , inputs -, kernelPatches , lib -, llvmPackages_16 -, overrideCC +, linuxLavaEnv , ... } @ args: let sources = callPackage ./sources.nix { inherit inputs; }; - llvmPackages = llvmPackages_16; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - stdenv = ccacheStdenv.override { - # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 - stdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { - bintools = llvmPackages.bintools.override { - sharedLibraryLoader = null; - }; - }); - }; + inherit (linuxLavaEnv) stdenv; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; From 82839373bf3e2d353f50e5aa6fb51eb65fa1bd61 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 01:39:55 +1100 Subject: [PATCH 123/584] packages/linux-lava: hack further to only overlay for linux-lava specifically wowie wowzers, this is a terrible hack. All this is needed only because I couldn't for the life of me find a way to override rust-bindgen from buildLinux. Simply including the overlay would require rebuilding a crapton of things that depend on rust-bindgen, so well, this'll have to do for now. --- flake.nix | 15 ++++++++++++--- overlays/default.nix | 1 - packages/default.nix | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 14e2cbf..e606c5d 100644 --- a/flake.nix +++ b/flake.nix @@ -60,12 +60,21 @@ me = prev.callPackage ./packages { inherit inputs; } // { inherit inputs; }; })]; + patchOverlaysWithLinuxLava = nixpkgs: arch: ([(self: super: { + linuxLavaNixpkgs = import nixpkgs { + overlays = [ (import ./overlays/linux-lava.nix) ] ++ overlays; + system = arch; + }; + })] ++ overlays); + mkSystem = if !(self ? rev) then throw "Dirty git tree detected." else nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem { system = arch; modules = [ - { nixpkgs.overlays = overlays; } + ({ + nixpkgs.overlays = patchOverlaysWithLinuxLava nixpkgs arch; + }) agenix.nixosModules.age catppuccin.nixosModules.catppuccin (./hosts + "/${name}") @@ -93,8 +102,8 @@ packages."x86_64-linux" = let - pkgs = import nixpkgs { - inherit overlays; + pkgs = import nixpkgs rec { + overlays = patchOverlaysWithLinuxLava nixpkgs system; system = "x86_64-linux"; }; in diff --git a/overlays/default.nix b/overlays/default.nix index 4d8552f..98b0cc9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,6 @@ builtins.map (path: import path) [ ./android-studio.nix ./ccache.nix ./eww.nix - ./linux-lava.nix ./material-icons.nix ./rofi.nix ./steam.nix diff --git a/packages/default.nix b/packages/default.nix index c8bc839..dc903b8 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,11 +1,12 @@ { callPackage, + linuxLavaNixpkgs, inputs }: rec { discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; }; discover-overlay = callPackage ./discover { inherit inputs; }; epson-201112j = callPackage ./epson-201112j { }; - linux-lava = callPackage ./linux-lava { inherit inputs; }; + linux-lava = linuxLavaNixpkgs.callPackage ./linux-lava { inherit inputs; }; nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; }; packwiz = callPackage ./packwiz { inherit inputs; }; psensor = callPackage ./psensor { }; From f071579f58fad70b8346ddcebc70ca8c72b70647 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 9 Mar 2025 19:12:25 +1100 Subject: [PATCH 124/584] rin/packages: remove firefox messaging hosts mfw I don't pay attention to the deprecation notice pass was never quite used anyway --- users/rin/packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 9164b83..ff020e1 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -1,8 +1,5 @@ { config, enableGUI, inputs, pkgs, ... }: { - programs.firefox = { - enable = true; - package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.passff-host ]; }; - }; + programs.firefox.enable = true; home.packages = with pkgs; [ dconf From c5079d79091b0006905c465df75f47166671fe06 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 9 Mar 2025 19:11:34 +1100 Subject: [PATCH 125/584] system/home-manager: move imports into module and follow new name --- hosts/anemone/default.nix | 1 - hosts/hyacinth/default.nix | 1 - modules/system/home-manager.nix | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index f7a47ae..e55e20d 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -9,7 +9,6 @@ }; imports = with modules.system; [ - inputs.home-manager.nixosModule home-manager audio diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 9c2b274..9d1cddb 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -11,7 +11,6 @@ wpa_conf.file = ../../secrets/wpa_conf.age; }; imports = with modules.system; [ - inputs.home-manager.nixosModule home-manager aagl diff --git a/modules/system/home-manager.nix b/modules/system/home-manager.nix index 43bc0ac..3255e4d 100644 --- a/modules/system/home-manager.nix +++ b/modules/system/home-manager.nix @@ -1,4 +1,7 @@ { config, enableGUI, inputs, modules, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; home-manager = { useGlobalPkgs = true; useUserPackages = true; From b362462905ef78b59ee99116588a9b863321bb0d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 13 Mar 2025 01:20:30 +1100 Subject: [PATCH 126/584] system/packages: add ecryptfs --- modules/system/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/system/packages.nix b/modules/system/packages.nix index d012af0..3e34299 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -1,6 +1,7 @@ { config, enableGUI, lib, pkgs, ... }: { environment.systemPackages = with pkgs; [ comma + ecryptfs efibootmgr git htop From c1c6c0102fc3fec36a35c00db927034fcb31538b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 13 Mar 2025 22:56:26 +1100 Subject: [PATCH 127/584] user/eww-wayland: bring back shortened time --- res/eww-wayland/eww.yuck | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 93d75eb..67a06c7 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -20,13 +20,16 @@ :focusable false (bar)) -(defpoll ptime :interval "1s" + +(defvar time-extended false) +(defpoll ptime :interval "1s" `date +%H:%M`) -(defpoll petimea :interval "1s" +(defpoll petimea :interval "1s" :run-while time-extended `date "+%A, %d %B %Y "`) -(defpoll petimeb :interval "1s" +(defpoll petimeb :interval "1s" :run-while time-extended `date "+:%S"`) + (deflisten ltitle :initial "" "./scripts/title.sh") (deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh") (deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh") @@ -59,11 +62,14 @@ :class "extension")) (defwidget time [] - (box :orientation "horizontal" - :space-evenly false - :halign "end" - :class "widget time" - (time_extension :text petimea) - (label :text ptime - :class "base") - (time_extension :text petimeb))) + (button :onclick `eww update time-extended=${time-extended ? "false" : "true"}` + (box :orientation "horizontal" + :space-evenly false + :halign "end" + :class "widget time" + (time_extension :text {time-extended ? petimea : ""}) + (label :text ptime + :class "base") + (time_extension :text {time-extended ? petimeb : ""}) + ))) + From 920fb1971ab05f9010f7f127231a41476e30e9ac Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 10 Mar 2025 12:33:59 +1100 Subject: [PATCH 128/584] hosts/anemone: add wireshark --- hosts/anemone/default.nix | 5 +++++ users/rin/wayland.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index e55e20d..5b8e534 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -40,4 +40,9 @@ nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; + + programs.wireshark = { + enable = true; + package = pkgs.wireshark; + }; } diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index 1bfef8c..edbcfda 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -2,7 +2,7 @@ programs.zsh.enable = true; users.users.rin = { isNormalUser = true; - extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ]; + extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" "wireshark" ]; shell = pkgs.zsh; uid = 1001; passwordFile = config.age.secrets.passwd.path; From 4b1ea1f5719bd3a8017effa295dd75a49abb5c71 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 01:20:55 +1100 Subject: [PATCH 129/584] rin/packages: move some heavy packages to hyacinth only --- hosts/hyacinth/default.nix | 1 + hosts/hyacinth/packages.nix | 7 +++++++ users/rin/packages.nix | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 hosts/hyacinth/packages.nix diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 9d1cddb..9584f3a 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -37,6 +37,7 @@ ./filesystem.nix ./kernel.nix ./networking.nix + ./packages.nix #../../users/rin/xorg.nix ../../users/rin/wayland.nix diff --git a/hosts/hyacinth/packages.nix b/hosts/hyacinth/packages.nix new file mode 100644 index 0000000..555a414 --- /dev/null +++ b/hosts/hyacinth/packages.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + android-studio + jetbrains.idea-community-bin + texliveFull + ]; +} diff --git a/users/rin/packages.nix b/users/rin/packages.nix index ff020e1..4a3a674 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -18,7 +18,6 @@ nodePackages_latest.pnpm ] ++ lib.optionals enableGUI [ - android-studio discord-canary drawio element-desktop @@ -28,7 +27,6 @@ gamescope gimp grim - jetbrains.idea-community-bin #kotatogram-desktop krita lm_sensors @@ -48,7 +46,6 @@ screenkey slurp swaybg - texliveFull tor-browser-bundle-bin transmission-remote-gtk virt-manager From 4a71a4cb79cec0343f877f359aa35951d8e00dd7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 01:56:09 +1100 Subject: [PATCH 130/584] rin/packages: use vscode.fhs, and include dotnet --- users/rin/packages.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 4a3a674..bcbc510 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -1,4 +1,12 @@ -{ config, enableGUI, inputs, pkgs, ... }: { +{ enableGUI, inputs, pkgs, ... }: +let + dotnet-combined = (with pkgs.dotnetCorePackages; combinePackages [ + dotnet_8.sdk + dotnet_9.sdk + aspnetcore_8_0-bin + aspnetcore_9_0-bin + ]); +in { programs.firefox.enable = true; home.packages = with pkgs; [ @@ -50,15 +58,12 @@ transmission-remote-gtk virt-manager winetricks - (vscode-with-extensions.override { - vscodeExtensions = with vscode-extensions; [ - ms-vsliveshare.vsliveshare - vscodevim.vim - ]; - }) xclip xorg.xgamma zathura zenity + + (vscode.fhsWithPackages (_: [ dotnet-combined ])) + dotnet-combined ]; } From bebaa0c14faeb91233a3efa36ad70a856c072019 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 22:50:44 +1100 Subject: [PATCH 131/584] hosts/{caramel,dandelion}: decommission --- flake.nix | 12 -------- hosts/caramel/default.nix | 43 ----------------------------- hosts/caramel/filesystem.nix | 50 ---------------------------------- hosts/caramel/image.nix | 29 -------------------- hosts/caramel/kernel.nix | 15 ---------- hosts/caramel/networking.nix | 35 ------------------------ hosts/caramel/packages.nix | 14 ---------- hosts/dandelion/default.nix | 31 --------------------- hosts/dandelion/filesystem.nix | 35 ------------------------ hosts/dandelion/kernel.nix | 20 -------------- hosts/dandelion/networking.nix | 10 ------- hosts/dandelion/packages.nix | 14 ---------- 12 files changed, 308 deletions(-) delete mode 100644 hosts/caramel/default.nix delete mode 100644 hosts/caramel/filesystem.nix delete mode 100644 hosts/caramel/image.nix delete mode 100644 hosts/caramel/kernel.nix delete mode 100644 hosts/caramel/networking.nix delete mode 100644 hosts/caramel/packages.nix delete mode 100644 hosts/dandelion/default.nix delete mode 100644 hosts/dandelion/filesystem.nix delete mode 100644 hosts/dandelion/kernel.nix delete mode 100644 hosts/dandelion/networking.nix delete mode 100644 hosts/dandelion/packages.nix diff --git a/flake.nix b/flake.nix index e606c5d..7f9280f 100644 --- a/flake.nix +++ b/flake.nix @@ -87,19 +87,8 @@ in { nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true []; - nixosConfigurations."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true []; - nixosConfigurations."caramel" = mkSystem nixpkgs-raccoon "caramel" "aarch64-linux" false [{ - nixpkgs.overlays = [ - (self: super: { - makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); - }) - ]; - }]; - nixosConfigurations."sugarcane" = mkSystem nixpkgs-raccoon "sugarcane" "x86_64-linux" false []; - nixosConfigurations."dandelion" = mkSystem nixpkgs-stable "dandelion" "aarch64-linux" false []; - packages."x86_64-linux" = let pkgs = import nixpkgs rec { @@ -119,7 +108,6 @@ }; in { - caramel-img = self.nixosConfigurations."caramel".config.system.build.sdImage; }; # TODO: currently broken diff --git a/hosts/caramel/default.nix b/hosts/caramel/default.nix deleted file mode 100644 index 1fc224d..0000000 --- a/hosts/caramel/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: { - networking.hostName = "caramel"; - system.stateVersion = "22.11"; - time.timeZone = "Asia/Phnom_Penh"; - - age.secrets = { - acme_dns.file = ../../secrets/acme_dns.age; - passwd.file = ../../secrets/passwd.age; - warden_admin.file = ../../secrets/warden_admin.age; - wpa_conf.file = ../../secrets/wpa_conf.age; - wg_caramel.file = ../../secrets/wg_caramel.age; - }; - imports = - (with modules.system; [ - "${builtins.toString modulesPath}/installer/sd-card/sd-image-aarch64.nix" - inputs.home-manager-raccoon.nixosModule - - base - home-manager - input - nix-stable - security - transmission - wireguard - - ./filesystem.nix - ./kernel.nix - ./image.nix - ./networking.nix - ./packages.nix - - ../../users/hana - ]) ++ - (with modules.services; [ -# nginx -# postgres -# synapse - jellyfin - sonarr - tmptsync - unbound - ]); -} diff --git a/hosts/caramel/filesystem.nix b/hosts/caramel/filesystem.nix deleted file mode 100644 index 5cc264c..0000000 --- a/hosts/caramel/filesystem.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, lib, ... }: -let - bind = src: { - depends = [ "/persist" ]; - device = src; - fsType = "none"; - neededForBoot = true; - options = [ "bind" ]; - }; -in { - fileSystems = { - "/" = lib.mkForce { - device = "rootfs"; - fsType = "tmpfs"; - options = [ "defaults" "size=1G" "mode=755" ]; - }; - - # "/nix" = { - # device = "overlayfs"; - # fsType = "overlay"; - # options = [ - # "lowerdir=/mnt/image/nix" - # "upperdir=/persist/nix-overlay" - # "workdir=/persist/.overlaytmp" - # ]; - # noCheck = true; - # depends = [ "/mnt/image" "/persist" ]; - # }; - - "/nix" = (bind "/mnt/image/nix") // { depends = [ "/mnt/image" ]; }; - - "/mnt/image" = { - device = "/dev/disk/by-label/NIXOS_SD"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - neededForBoot = true; - }; - - "/persist" = { - device = "/dev/disk/by-label/PI_HDD"; - fsType = "ext4"; - options = [ "defaults" "relatime" ]; - neededForBoot = true; - }; - - "/var/lib/acme" = bind "/persist/acme"; - "/var/log/journal" = bind "/persist/journal"; - "/boot" = (bind "/mnt/image/boot") // { depends = [ "/mnt/image" ]; }; - }; -} diff --git a/hosts/caramel/image.nix b/hosts/caramel/image.nix deleted file mode 100644 index a7e9975..0000000 --- a/hosts/caramel/image.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, pkgs, ... }: { - sdImage.expandOnBoot = false; - boot.postBootCommands = '' - # On the first boot do some maintenance tasks - if [ -f /mnt/image/nix-path-registration ]; then - set -euo pipefail - set -x - # Figure out device names for the boot device and root filesystem. - rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /mnt/image) - bootDevice=$(lsblk -npo PKNAME $rootPart) - partNum=$(lsblk -npo MAJ:MIN $rootPart | ${pkgs.gawk}/bin/awk -F: '{print $2}') - - # Resize the root partition and the filesystem to fit the disk - echo ",+," | sfdisk -N$partNum --no-reread $bootDevice - ${pkgs.parted}/bin/partprobe - ${pkgs.e2fsprogs}/bin/resize2fs $rootPart - - # Register the contents of the initial Nix store - ${config.nix.package.out}/bin/nix-store --load-db < /mnt/image/nix-path-registration - - # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag. - touch /etc/NIXOS - ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system - - # Prevents this from running on later boots. - rm -f /mnt/image/nix-path-registration - fi - ''; -} diff --git a/hosts/caramel/kernel.nix b/hosts/caramel/kernel.nix deleted file mode 100644 index 8c8e9a8..0000000 --- a/hosts/caramel/kernel.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, inputs, lib, pkgs, ... }: { - imports = [ - inputs.nixos-hardware.nixosModules.raspberry-pi-4 - ]; - hardware.raspberry-pi."4".fkms-3d.enable = true; - - boot = { - initrd.kernelModules = [ "overlay" ]; - supportedFilesystems = lib.mkForce [ "btrfs" "vfat" ]; - kernel.sysctl = { - "kernel.core_pattern" = "|/bin/false"; - "kernel.sysrq" = 1; - }; - }; -} diff --git a/hosts/caramel/networking.nix b/hosts/caramel/networking.nix deleted file mode 100644 index 33dd49c..0000000 --- a/hosts/caramel/networking.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, ... }: { - environment.etc."wpa_supplicant.conf".source = config.age.secrets.wpa_conf.path; - networking = { - firewall.allowedTCPPorts = [ 80 443 ]; - - wireless = { - enable = true; - interfaces = [ "wlan0" ]; - }; - - useDHCP = false; - interfaces.wlan0.useDHCP = false; - - interfaces.wlan0.ipv4.addresses = [{ - address = "192.168.100.15"; - prefixLength = 24; - }]; - defaultGateway = "192.168.100.1"; - nameservers = [ "8.8.8.8" ]; - - extraHosts = '' - 192.168.100.12 strawberry - 192.168.100.13 blossom - ''; - }; - - # wait for ntp before connecting to wireguard - systemd = { - additionalUpstreamSystemUnits = [ "systemd-time-wait-sync.service" ]; - services = { - "systemd-time-wait-sync".wantedBy = [ "multi-user.target" ]; - "wireguard-wg0".after = [ "time-sync.target" ]; - }; - }; -} diff --git a/hosts/caramel/packages.nix b/hosts/caramel/packages.nix deleted file mode 100644 index e3e3f15..0000000 --- a/hosts/caramel/packages.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - git - htop - jq - neovim - rsync - sshfs - wget - - kitty.terminfo - ]; - environment.variables.EDITOR = "nvim"; -} diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix deleted file mode 100644 index a4832b8..0000000 --- a/hosts/dandelion/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: { - networking.hostName = "dandelion"; - system.stateVersion = "23.11"; - time.timeZone = "Australia/Melbourne"; - - age.secrets = { - acme_dns.file = ../../secrets/acme_dns.age; - }; - - imports = with modules.system; [ - (modulesPath + "/profiles/qemu-guest.nix") - inputs.home-manager-stable.nixosModule - - base - home-manager - input - nix-stable - security - #wireguard - - modules.services.nginx - modules.services.postgres - - ./filesystem.nix - ./kernel.nix - ./networking.nix - ./packages.nix - - ../../users/hana - ]; -} diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix deleted file mode 100644 index 3165da7..0000000 --- a/hosts/dandelion/filesystem.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, lib, ... }: -let - bind = src: { - depends = [ "/nix" ]; - device = src; - fsType = "none"; - neededForBoot = true; - options = [ "bind" ]; - }; - - mkLabelMount = label: type: lazy: { - device = "/dev/disk/by-label/${label}"; - fsType = type; - options = [ "defaults" "relatime" ] ++ lib.optionals lazy [ "nofail" ]; - }; - mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" false // { - options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ]; - }; - submount = mkBtrfsMount "DANDELION"; -in { - fileSystems = { - "/" = { - device = "rootfs"; - fsType = "tmpfs"; - options = [ "defaults" "size=12G" "mode=755" ]; - }; - - "/boot" = submount "/@/boot" false; - "/boot/efi" = mkLabelMount "UEFI" "vfat" true; - "/nix" = submount "/@/nix" false; - "/persist" = (submount "/@/persist" true) // { neededForBoot = true; }; - "/persist/.snapshots" = submount "/snap/persist" false; - "/var/log/journal" = bind "/persist/journal"; - }; -} diff --git a/hosts/dandelion/kernel.nix b/hosts/dandelion/kernel.nix deleted file mode 100644 index f6ed9ad..0000000 --- a/hosts/dandelion/kernel.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, inputs, pkgs, ... }: { - boot = { - loader = { - systemd-boot.enable = false; - efi.canTouchEfiVariables = true; - efi.efiSysMountPoint = "/boot/efi"; - grub = { - enable = true; - efiSupport = true; - device = "/dev/sda"; - }; - }; - initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ]; - initrd.kernelModules = [ "nvme" ]; - kernel.sysctl = { - "kernel.core_pattern" = "|/bin/false"; - "kernel.sysrq" = 1; - }; - }; -} diff --git a/hosts/dandelion/networking.nix b/hosts/dandelion/networking.nix deleted file mode 100644 index 555dcdd..0000000 --- a/hosts/dandelion/networking.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, ... }: { - networking = { - useDHCP = true; - - # extraHosts = '' - # 10.100.0.3 blossom - # 10.100.0.4 strawberry - # ''; - }; -} diff --git a/hosts/dandelion/packages.nix b/hosts/dandelion/packages.nix deleted file mode 100644 index e3e3f15..0000000 --- a/hosts/dandelion/packages.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - git - htop - jq - neovim - rsync - sshfs - wget - - kitty.terminfo - ]; - environment.variables.EDITOR = "nvim"; -} From 27d1c31e355620215d7f3ee05f95938e9f99e1f1 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 23:07:42 +1100 Subject: [PATCH 132/584] treewide: prune packages and various unused fluff - removed shells, broken for like 2 years now - removed discord mods and spicetify - removed inputs for services - removed various unused inputs - removed various unused packages --- flake.lock | 343 ------------------ flake.nix | 39 +- packages/default.nix | 11 +- packages/discord-tokyonight/default.nix | 14 - .../powercord_manifest.json | 8 - packages/discover/default.nix | 26 -- packages/epson-201112j/default.nix | 75 ---- packages/packwiz/default.nix | 9 - packages/tetrio/base.nix | 90 ----- packages/tetrio/plus.nix | 43 --- packages/tree-sitter-glimmer/default.nix | 9 - shells/cs/default.nix | 14 - shells/cs/osu.nix | 80 ---- shells/default.nix | 7 - shells/flutter/default.nix | 53 --- shells/js/default.nix | 19 - shells/php/default.nix | 16 - shells/php/osu-web.nix | 26 -- shells/rust/default.nix | 25 -- 19 files changed, 5 insertions(+), 902 deletions(-) delete mode 100644 packages/discord-tokyonight/default.nix delete mode 100644 packages/discord-tokyonight/powercord_manifest.json delete mode 100644 packages/discover/default.nix delete mode 100644 packages/epson-201112j/default.nix delete mode 100644 packages/packwiz/default.nix delete mode 100644 packages/tetrio/base.nix delete mode 100644 packages/tetrio/plus.nix delete mode 100644 packages/tree-sitter-glimmer/default.nix delete mode 100644 shells/cs/default.nix delete mode 100644 shells/cs/osu.nix delete mode 100644 shells/default.nix delete mode 100644 shells/flutter/default.nix delete mode 100644 shells/js/default.nix delete mode 100644 shells/php/default.nix delete mode 100644 shells/php/osu-web.nix delete mode 100644 shells/rust/default.nix diff --git a/flake.lock b/flake.lock index 83b6f7d..3af226e 100644 --- a/flake.lock +++ b/flake.lock @@ -135,38 +135,6 @@ "type": "github" } }, - "discord-tokyonight": { - "flake": false, - "locked": { - "lastModified": 1632310328, - "narHash": "sha256-LcxXTGdo6ZW5glECkH5vgLWAYMZ3ez/3USc059dR9cE=", - "owner": "DanisDGK", - "repo": "zelk-customizations", - "rev": "c5ed0be3f2dd4421c42a4c62d28fc52d18c68ef1", - "type": "github" - }, - "original": { - "owner": "DanisDGK", - "repo": "zelk-customizations", - "type": "github" - } - }, - "discover": { - "flake": false, - "locked": { - "lastModified": 1734385014, - "narHash": "sha256-GMbkCB70Rp18fk3mUIfYEQlqibDWtMg74ejxecT75mA=", - "owner": "trigg", - "repo": "Discover", - "rev": "e7992e015212bdaaf36c9800cfcba1000cea0f65", - "type": "github" - }, - "original": { - "owner": "trigg", - "repo": "Discover", - "type": "github" - } - }, "fast-syntax-highlighting": { "flake": false, "locked": { @@ -309,24 +277,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -415,28 +365,6 @@ "type": "github" } }, - "home-manager-raccoon": { - "inputs": { - "nixpkgs": [ - "nixpkgs-raccoon" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1685325875, - "narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b372d7f8d5518aaba8a4058a453957460481afbc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-22.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager-stable": { "inputs": { "nixpkgs": [ @@ -459,27 +387,6 @@ "type": "github" } }, - "home-manager-stable_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1719827415, - "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -521,22 +428,6 @@ "type": "github" } }, - "hosts-blocklists": { - "flake": false, - "locked": { - "lastModified": 1687788647, - "narHash": "sha256-nKNz9ux1FPxoL14VZtH/1tfnn67LeXmdVQJz7I9+Srk=", - "owner": "notracking", - "repo": "hosts-blocklists", - "rev": "2ab426e806985d0d3d1c3eb447d7e772a836e10d", - "type": "github" - }, - "original": { - "owner": "notracking", - "repo": "hosts-blocklists", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -642,57 +533,6 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1740560979, @@ -721,22 +561,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, - "nixpkgs-raccoon": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1734600368, @@ -753,22 +577,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1740791350, @@ -840,22 +648,6 @@ "type": "github" } }, - "packwiz": { - "flake": false, - "locked": { - "lastModified": 1737328283, - "narHash": "sha256-VmNsWzsFVNRciNIPUXUVos4cBdpawgN1/nPwMjNpx+0=", - "owner": "comp500", - "repo": "packwiz", - "rev": "241f24b550f6fe838913a56bdd58bac2fc53254a", - "type": "github" - }, - "original": { - "owner": "comp500", - "repo": "packwiz", - "type": "github" - } - }, "pure": { "flake": false, "locked": { @@ -878,93 +670,21 @@ "agenix": "agenix", "catppuccin": "catppuccin", "catppuccin-palette": "catppuccin-palette", - "discord-tokyonight": "discord-tokyonight", - "discover": "discover", "fast-syntax-highlighting": "fast-syntax-highlighting", "home-manager": "home-manager_3", - "home-manager-raccoon": "home-manager-raccoon", - "home-manager-stable": "home-manager-stable_2", - "hosts-blocklists": "hosts-blocklists", "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", - "nixos-generators": "nixos-generators", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-raccoon": "nixpkgs-raccoon", - "nixpkgs-stable": "nixpkgs-stable_2", "nvim-treesitter": "nvim-treesitter", - "packwiz": "packwiz", "pure": "pure", - "rust-overlay": "rust-overlay", - "spicetify-nix": "spicetify-nix", - "spicetify-themes": "spicetify-themes", "spotify-adblock": "spotify-adblock", - "tree-sitter-glimmer": "tree-sitter-glimmer", "tree-sitter-jsonc": "tree-sitter-jsonc", - "website": "website", "wine-discord-ipc-bridge": "wine-discord-ipc-bridge", "zsh-abbr": "zsh-abbr", "zsh-history-substring-search": "zsh-history-substring-search" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "spicetify-nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727460820, - "narHash": "sha256-j54SjpQVoIOblTzyGRWnQnJz63eUCPb1sI/oyDm+eO0=", - "owner": "the-argus", - "repo": "spicetify-nix", - "rev": "6cce28acab7d9ec26188ed71295f6b4306e0a7f5", - "type": "github" - }, - "original": { - "owner": "the-argus", - "repo": "spicetify-nix", - "type": "github" - } - }, - "spicetify-themes": { - "flake": false, - "locked": { - "lastModified": 1740994554, - "narHash": "sha256-+lcRYilVK3cp5Ii6Q3/d00udTsq+UGqD+yKv2e2e6eA=", - "owner": "spicetify", - "repo": "spicetify-themes", - "rev": "10431678bd682547a2afdff855e8d26a3007f2c8", - "type": "github" - }, - "original": { - "owner": "spicetify", - "repo": "spicetify-themes", - "type": "github" - } - }, "spotify-adblock": { "flake": false, "locked": { @@ -1011,37 +731,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tree-sitter-glimmer": { - "flake": false, - "locked": { - "lastModified": 1724183464, - "narHash": "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4=", - "owner": "alexlafroscia", - "repo": "tree-sitter-glimmer", - "rev": "da605af8c5999b43e6839b575eae5e6cafabb06f", - "type": "github" - }, - "original": { - "owner": "alexlafroscia", - "repo": "tree-sitter-glimmer", - "type": "github" - } - }, "tree-sitter-jsonc": { "flake": false, "locked": { @@ -1079,38 +768,6 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "website": { - "flake": false, - "locked": { - "lastModified": 1668017714, - "narHash": "sha256-ywy/7xeT6FHkF7lcs+stW1WPV+piE8ztSwcQ161iico=", - "owner": "LavaDesu", - "repo": "lavadesu.github.io", - "rev": "4e30c50be520a0a1bbecf408f056e6aaf135df67", - "type": "github" - }, - "original": { - "owner": "LavaDesu", - "ref": "master", - "repo": "lavadesu.github.io", - "type": "github" - } - }, "wine-discord-ipc-bridge": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 7f9280f..083448c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,9 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-raccoon.url = "github:NixOS/nixpkgs/nixos-22.11"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager.url = "github:nix-community/home-manager"; - home-manager-raccoon.url = "github:nix-community/home-manager/release-22.11"; - home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; - nixos-hardware.url = "github:NixOS/nixos-hardware"; agenix.url = "github:ryantm/agenix"; - nixos-generators.url = "github:nix-community/nixos-generators"; - spicetify-nix.url = "github:the-argus/spicetify-nix"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; @@ -18,18 +11,13 @@ catppuccin.inputs.nixpkgs.follows = "nixpkgs"; catppuccin-palette = { url = "github:catppuccin/palette"; flake = false; }; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager-raccoon.inputs.nixpkgs.follows = "nixpkgs-raccoon"; - home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; neovim-nightly.inputs.nixpkgs.follows = "nixpkgs"; - nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; - spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; # services - hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; }; - website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; }; - spicetify-themes = { url = "github:spicetify/spicetify-themes"; flake = false; }; + # hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; }; + # website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; }; # zsh plugins zsh-abbr = { url = "git+https://github.com/olets/zsh-abbr?submodules=1"; flake = false; }; @@ -38,22 +26,14 @@ pure = { url = "github:sindresorhus/pure"; flake = false; }; # overlays - discord-tokyonight = { url = "github:DanisDGK/zelk-customizations"; flake = false; }; - discover = { url = "github:trigg/Discover"; flake = false; }; linux-tkg = { url = "github:Frogging-Family/linux-tkg"; flake = false; }; nvim-treesitter = { url = "github:nvim-treesitter/nvim-treesitter"; flake = false; }; - packwiz = { url = "github:comp500/packwiz"; flake = false; }; spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; }; - tree-sitter-glimmer = { url = "github:alexlafroscia/tree-sitter-glimmer"; flake = false; }; tree-sitter-jsonc = { url = "gitlab:WhyNotHugo/tree-sitter-jsonc"; flake = false; }; wine-discord-ipc-bridge = { url = "github:0e4ef622/wine-discord-ipc-bridge"; flake = false; }; - - # shells - rust-overlay.url = "github:oxalica/rust-overlay"; - rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, agenix, catppuccin, nixos-generators, nixpkgs, nixpkgs-raccoon, nixpkgs-stable, ... } @ inputs: + outputs = { self, agenix, catppuccin, nixpkgs, ... } @ inputs: let overlays = (import ./overlays) ++ [(final: prev: { @@ -99,18 +79,5 @@ { inherit (pkgs.me) linux-lava spotify-adblock; }; - - packages."aarch64-linux" = - let - pkgs = import nixpkgs-raccoon { - inherit overlays; - system = "aarch64-linux"; - }; - in - { - }; - - # TODO: currently broken - # devShells.x86_64-linux = pkgs.callPackage ./shells { inherit inputs; }; }; } diff --git a/packages/default.nix b/packages/default.nix index dc903b8..4ae8658 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -2,18 +2,11 @@ callPackage, linuxLavaNixpkgs, inputs -}: rec { - discord-tokyonight = callPackage ./discord-tokyonight { inherit inputs; }; - discover-overlay = callPackage ./discover { inherit inputs; }; - epson-201112j = callPackage ./epson-201112j { }; +}: { linux-lava = linuxLavaNixpkgs.callPackage ./linux-lava { inherit inputs; }; nvim-treesitter-nightly = callPackage ./nvim-treesitter-nightly { inherit inputs; }; - packwiz = callPackage ./packwiz { inherit inputs; }; - psensor = callPackage ./psensor { }; + psensor = callPackage ./psensor { }; spotify-adblock = callPackage ./spotify-adblock { inherit inputs; }; - tetrio-desktop = callPackage ./tetrio/base.nix { }; - tetrio-desktop-plus = callPackage ./tetrio/plus.nix { inherit tetrio-desktop; }; - tree-sitter-glimmer = callPackage ./tree-sitter-glimmer { inherit inputs; }; tree-sitter-jsonc = callPackage ./tree-sitter-jsonc { inherit inputs; }; wine-discord-ipc-bridge = callPackage ./wine-discord-ipc-bridge { inherit inputs; }; } diff --git a/packages/discord-tokyonight/default.nix b/packages/discord-tokyonight/default.nix deleted file mode 100644 index d9a3832..0000000 --- a/packages/discord-tokyonight/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - inputs, - stdenvNoCC -}: -stdenvNoCC.mkDerivation { - pname = "discord-tokyonight"; - version = "1.0.0"; - dontUnpack = true; - installPhase = '' - cp -r ${inputs.discord-tokyonight} $out - chmod u+w $out - cp ${./powercord_manifest.json} $out/powercord_manifest.json - ''; -} diff --git a/packages/discord-tokyonight/powercord_manifest.json b/packages/discord-tokyonight/powercord_manifest.json deleted file mode 100644 index 16efa69..0000000 --- a/packages/discord-tokyonight/powercord_manifest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": "1.0", - "name": "Tokyo Night Colours", - "author": "DanisDGK", - "license": "MIT", - "theme": "colors/tokyonight_night.css", - "description": "Tokyonight colourscheme" -} diff --git a/packages/discover/default.nix b/packages/discover/default.nix deleted file mode 100644 index 883fdf6..0000000 --- a/packages/discover/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ inputs -, python3Packages -, gtk3 -, gobject-introspection -, wrapGAppsHook -, ... -}: -python3Packages.buildPythonApplication { - pname = "discover-overlay"; - version = "1.0"; - src = inputs.discover; - - nativeBuildInputs = [ - wrapGAppsHook - ]; - propagatedBuildInputs = with python3Packages; [ - gtk3 - gobject-introspection - pygobject3 - websocket-client - pyxdg - requests - python-pidfile - pillow - ]; -} diff --git a/packages/epson-201112j/default.nix b/packages/epson-201112j/default.nix deleted file mode 100644 index 6424a46..0000000 --- a/packages/epson-201112j/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: - -let - version = "1.0.0"; - filterVersion = "1.0.0"; -in - stdenv.mkDerivation { - pname = "epson-201112j"; - inherit version; - - src = fetchurl { - # NOTE: Don't forget to update the webarchive link too! - urls = [ - "http://download.ebz.epson.net/dsc/f/01/00/01/68/36/cbf6cf36263b5a6c4f370266f2479556cd665d7c/epson-inkjet-printer-201112j-${version}-1lsb3.2.src.rpm" - ]; - - sha256 = "sha256-+n5QQDMgEjKYFlH62bVAZRtr0GjyG8yDahPquOjIZWA="; - }; - - nativeBuildInputs = [ rpmextract autoreconfHook file ]; - - buildInputs = [ libjpeg cups ]; - - unpackPhase = '' - rpmextract $src - tar -zxf epson-inkjet-printer-201112j-${version}.tar.gz - tar -zxf epson-inkjet-printer-filter-${filterVersion}.tar.gz - for ppd in epson-inkjet-printer-201112j-${version}/ppds/*; do - substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-201112j" "$out" - substituteInPlace $ppd --replace "/cups/lib" "/lib/cups" - done - cd epson-inkjet-printer-filter-${filterVersion} - ''; - - preConfigure = '' - chmod +x configure - export LDFLAGS="$LDFLAGS -Wl,--no-as-needed" - ''; - - postInstall = '' - cd ../epson-inkjet-printer-201112j-${version} - cp -a lib64 resource watermark $out - mkdir -p $out/share/cups/model/epson-inkjet-printer-201112j - cp -a ppds $out/share/cups/model/epson-inkjet-printer-201112j/ - cp -a Manual.txt $out/doc/ - cp -a README $out/doc/README.driver - ''; - - meta = with lib; { - homepage = "https://www.openprinting.org/driver/epson-201112j"; - description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; - longDescription = '' - This software is a filter program used with the Common UNIX Printing - System (CUPS) under Linux. It supplies high quality printing with - Seiko Epson Color Ink Jet Printers. - List of printers supported by this package: - Epson BX535WD Series - Epson BX630FW Series - Epson BX635FWD Series - Epson ME940FW Series - Epson NX530 Series - Epson SX535WD Series - Epson WorkForce 545 Series - Epson WorkForce 645 Series - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson-201112j ]; - }; - ''; - license = with licenses; [ lgpl21 epson ]; - platforms = platforms.linux; - maintainers = []; - }; - } diff --git a/packages/packwiz/default.nix b/packages/packwiz/default.nix deleted file mode 100644 index 3a54208..0000000 --- a/packages/packwiz/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ inputs -, buildGoModule -}: -buildGoModule { - pname = "packwiz"; - version = inputs.packwiz.shortRev; - src = inputs.packwiz; - vendorSha256 = "1f2xh8czq8fh823dyp54rdv5mmb9gf62f5fimdah4wmghqw4wbzy"; -} diff --git a/packages/tetrio/base.nix b/packages/tetrio/base.nix deleted file mode 100644 index 27a42e6..0000000 --- a/packages/tetrio/base.nix +++ /dev/null @@ -1,90 +0,0 @@ -# Copied from https://github.com/NixOS/nixpkgs/pull/146940 - -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, alsa-lib -, cups -, dpkg -, gtk3 -, libpulseaudio -, libX11 -, libXScrnSaver -, libXtst -, mesa -, nss -, systemd -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "tetrio-desktop"; - version = "8.0.0"; - - src = fetchurl { - url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; - name = "${pname}.deb"; - sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf"; - }; - - nativeBuildInputs = [ - dpkg - autoPatchelfHook - wrapGAppsHook - ]; - - dontWrapGApps = true; - - buildInputs = [ - alsa-lib - cups - libX11 - libXScrnSaver - libXtst - mesa - nss - gtk3 - ]; - - libPath = lib.makeLibraryPath [ - libpulseaudio - systemd - ]; - - unpackCmd = "dpkg -x $curSrc src"; - - installPhase = '' - runHook preInstall - - mkdir $out - cp -r opt/ usr/share/ $out - - mkdir $out/bin - ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/ - - substituteInPlace $out/share/applications/tetrio-desktop.desktop \ - --replace "Exec=\"/opt/TETR.IO/tetrio-desktop\"" "Exec=\"$out/opt/TETR.IO/tetrio-desktop\"" - - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/opt/TETR.IO/tetrio-desktop \ - --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO \ - ''${gappsWrapperArgs[@]} - ''; - - meta = with lib; { - homepage = "https://tetr.io"; - downloadPage = "https://tetr.io/about/desktop/"; - description = "TETR.IO desktop client"; - longDescription = '' - TETR.IO is a modern yet familiar online stacker. - Play against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours! - ''; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - #maintainers = with maintainers; [ wackbyte ]; - }; -} diff --git a/packages/tetrio/plus.nix b/packages/tetrio/plus.nix deleted file mode 100644 index c6a0a07..0000000 --- a/packages/tetrio/plus.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - fetchzip, - lib, - symlinkJoin, - stdenvNoCC, - tetrio-desktop, - unzip -}: - -let - version = "0.23.7"; - - patchedAsar = stdenvNoCC.mkDerivation rec { - pname = "tetrio-plus"; - version = "0.25.3"; - - src = fetchzip { - url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/684477053451cd0819e2c84e145966eb/tetrio-plus_0.25.3_app.asar.zip"; - sha256 = "sha256-GQgt4GZNeKx/uzmVsuKppW2zg8AAiGqsk2JYJIkqfVE="; - }; - - installPhase = '' - runHook preInstall - install app.asar $out - runHook postInstall - ''; - - meta = with lib; { - description = "TETR.IO customization toolkit"; - homepage = "https://gitlab.com/UniQMG/tetrio-plus"; - license = licenses.mit; - maintainers = with maintainers; [ huantian ]; - platforms = [ "x86_64-linux" ]; - }; - }; -in tetrio-desktop.overrideAttrs(old: { - pname = "tetrio-desktop-plus"; - version = old.version + "+${version}"; - - postInstall = '' - cp ${patchedAsar} $out/opt/TETR.IO/resources/app.asar - ''; -}) diff --git a/packages/tree-sitter-glimmer/default.nix b/packages/tree-sitter-glimmer/default.nix deleted file mode 100644 index 5b0e426..0000000 --- a/packages/tree-sitter-glimmer/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - callPackage, - inputs -}: -callPackage (inputs.nixpkgs + "/pkgs/development/tools/parsing/tree-sitter/grammar.nix") {} { - language = "glimmer"; - version = "1.0.0"; - src = inputs.tree-sitter-glimmer; -} diff --git a/shells/cs/default.nix b/shells/cs/default.nix deleted file mode 100644 index 8f7e42a..0000000 --- a/shells/cs/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - callPackage, - lib, - mkShell, - dotnetCorePackages -}: -mkShell { - nativeBuildInputs = [ (with dotnetCorePackages; combinePackages [ sdk_6_0 runtime_6_0 ]) ]; - DOTNET_CLI_TELEMETRY_OPTOUT = 1; - - passthru = { - osu = callPackage ./osu.nix {}; - }; -} diff --git a/shells/cs/osu.nix b/shells/cs/osu.nix deleted file mode 100644 index cfaba27..0000000 --- a/shells/cs/osu.nix +++ /dev/null @@ -1,80 +0,0 @@ -# Flake for development on https://github.com/ppy/osu -{ - lib, - mkShell, - writeScript, - stdenv, - stdenvNoCC, - - dotnetCorePackages, - - alsa-lib, - ffmpeg_4, - icu, - lttng-ust, - numactl, - openssl, - SDL2 -}: -let - baseBuild = "-f net5.0 -v minimal osu.Desktop -- $@"; - - deps = [ - alsa-lib ffmpeg_4 icu lttng-ust numactl openssl SDL2 - ]; - - fixSdl = writeScript "osu-fixsdl" '' - ln -sft osu.Desktop/bin/Debug/net5.0/linux-x64/ ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary} - ln -sft osu.Desktop/bin/Release/net5.0/linux-x64/ ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary} - ''; - buildScript = writeScript "osu-build" '' - rm -f osu.Desktop/bin/Debug/net5.0/linux-x64/libSDL2.so - dotnet build -c Debug -r linux-x64 ${baseBuild} && ${fixSdl} - ''; - buildReleaseScript = writeScript "osu-build-rel" '' - rm -f osu.Desktop/bin/Release/net5.0/linux-x64/libSDL2.so - dotnet build -c Release -r linux-x64 /property:Version=$OSU_VERSION ${baseBuild} && ${fixSdl} - ''; - publishScript = writeScript "osu-publish" '' - rm -f osu.Desktop/bin/Release/net5.0/linux-x64/libSDL2.so - dotnet publish -c Release -r linux-x64 --self-contained false ${baseBuild} && ${fixSdl} - ''; - publishWinScript = writeScript "osu-publish-win" '' - dotnet publish -c Release -r win-x64 --self-contained false -o build-win ${baseBuild} - ''; - runScript = writeScript "osu-run" '' - ${buildScript} && dotnet run --no-build -c Debug -f net5.0 -r linux-x64 -p osu.Desktop -v minimal -- $@ - ''; - runReleaseScript = writeScript "osu-run-rel" '' - ${buildReleaseScript} && dotnet run --no-build -c Release -f net5.0 -r linux-x64 -p osu.Desktop -v minimal -- $@ - ''; - - scripts = stdenvNoCC.mkDerivation { - pname = "osu-scripts"; - version = "1.0.0"; - dontUnpack = true; - installPhase = '' - mkdir $out - cp ${fixSdl} $out/osu-fixsdl - cp ${buildScript} $out/osu-build - cp ${buildReleaseScript} $out/osu-build-rel - cp ${publishScript} $out/osu-publish - cp ${publishWinScript} $out/osu-publish-win - cp ${runScript} $out/osu-run - cp ${runReleaseScript} $out/osu-run-rel - ''; - }; -in mkShell { - nativeBuildInputs = [ - icu - - (with dotnetCorePackages; combinePackages [ sdk_5_0 runtime_5_0 ]) - ]; - - DOTNET_CLI_TELEMETRY_OPTOUT = 1; - DRI_PRIME = 1; - LD_LIBRARY_PATH = lib.makeLibraryPath deps; - shellHook = '' - export PATH="${scripts}:$PATH" - ''; -} diff --git a/shells/default.nix b/shells/default.nix deleted file mode 100644 index d4a08da..0000000 --- a/shells/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, inputs }: { - cs = callPackage ./cs {}; - flutter = callPackage ./flutter {}; - js = callPackage ./js {}; - php = callPackage ./php {}; - rust = callPackage ./rust { inherit inputs; }; -} diff --git a/shells/flutter/default.nix b/shells/flutter/default.nix deleted file mode 100644 index 0f49c4d..0000000 --- a/shells/flutter/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - mkShell, - - flutter, - clang, - cmake, - ninja, - pkg-config, - - atk, - cairo, - gdk-pixbuf, - glib, - gtk3, - harfbuzz, - libGL, - pango, - wayland, - xorg, -}: -let - makeIncludePath = lib.makeSearchPathOutput "include" "include"; - - includePath = makeIncludePath [ - xorg.xorgproto - xorg.libX11.dev - ]; -in mkShell { - nativeBuildInputs = [ - flutter - clang - cmake - ninja - pkg-config - ]; - - C_INCLUDE_PATH = includePath; - CPLUS_INCLUDE_PATH = includePath; - - LD_LIBRARY_PATH = lib.makeLibraryPath "/lib" [ - atk - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - libGL - pango - wayland - xorg.libX11 - ]; -} diff --git a/shells/js/default.nix b/shells/js/default.nix deleted file mode 100644 index a8e7610..0000000 --- a/shells/js/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkShell, - - nodejs-18_x, - nodePackages, - watchman -}: -mkShell { - buildInputs = [ - nodejs-18_x - watchman - - nodePackages.pnpm - ]; - - shellHook = '' - export PATH="$(readlink -f ./node_modules/.bin):$PATH" - ''; -} diff --git a/shells/php/default.nix b/shells/php/default.nix deleted file mode 100644 index f0777dd..0000000 --- a/shells/php/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - callPackage, - mkShell, - php80, - php80Packages, -}: -mkShell { - buildInputs = [ - php80 - php80Packages.composer - ]; - - passthru = { - osu-web = callPackage ./osu-web.nix {}; - }; -} diff --git a/shells/php/osu-web.nix b/shells/php/osu-web.nix deleted file mode 100644 index 582979b..0000000 --- a/shells/php/osu-web.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Flake for development on https://github.com/ppy/osu-web -{ - mkShell, - nodejs-14_x, - nodePackages, - php80, - php80Packages, - python3 -}: -let - phpPkg = php80.withExtensions ({ enabled, all }: - enabled ++ [ all.intl all.redis ] - ); -in mkShell { - buildInputs = [ - nodejs-14_x - nodePackages.yarn - phpPkg - php80Packages.composer - python3 - ]; - - shellHook = '' - export PATH="$(readlink -f ./node_modules/.bin):$PATH" - ''; -} diff --git a/shells/rust/default.nix b/shells/rust/default.nix deleted file mode 100644 index 65f1877..0000000 --- a/shells/rust/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - inputs, - mkShell, - - pkg-config -}: -let - overlays = [ (import inputs.rust-overlay) ]; - pkgs = import inputs.nixpkgs { - inherit system overlays; - }; - - toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain; - - rustPlatform = pkgs.makeRustPlatform { - inherit (toolchain) cargo rustc; - }; -in mkShell { - nativeBuildInputs = [ - toolchain - pkg-config - ]; - - RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; -} From a66544d92f8a1735b703e6fbfc8797b57f14ceb7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 16:32:38 +1100 Subject: [PATCH 133/584] system/gui: add material-symbols --- modules/system/gui.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/system/gui.nix b/modules/system/gui.nix index a0b2a93..f8ffb02 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -14,6 +14,7 @@ font-awesome_4 hanazono material-icons + material-symbols noto-fonts noto-fonts-cjk-sans noto-fonts-extra From b0d7064ca35d86ff395c88a7614fdb28e754cf0b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 17:24:04 +1100 Subject: [PATCH 134/584] system/gui: prioritise material icons --- modules/system/gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/gui.nix b/modules/system/gui.nix index f8ffb02..bfe56b7 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -9,12 +9,12 @@ }; }; fonts = with pkgs; [ + material-symbols + material-icons cascadia-code font-awesome font-awesome_4 hanazono - material-icons - material-symbols noto-fonts noto-fonts-cjk-sans noto-fonts-extra From 9eb196ea3a2d6144846a1797b5ab3e09f42dc405 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 17:39:47 +1100 Subject: [PATCH 135/584] overlays/cascadia-code: init to remove NF icons --- overlays/cascadia-code.nix | 12 ++++++++++++ overlays/default.nix | 1 + 2 files changed, 13 insertions(+) create mode 100644 overlays/cascadia-code.nix diff --git a/overlays/cascadia-code.nix b/overlays/cascadia-code.nix new file mode 100644 index 0000000..59ce553 --- /dev/null +++ b/overlays/cascadia-code.nix @@ -0,0 +1,12 @@ +self: super: { + cascadia-code = super.cascadia-code.overrideAttrs(o: { + installPhase = (builtins.replaceStrings ["runHook postInstall"] [""] o.installPhase) + '' + install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype + install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype + rm $out/share/fonts/opentype/*NF* + rm $out/share/fonts/truetype/*NF* + runHook postInstall + ''; + + }); +} diff --git a/overlays/default.nix b/overlays/default.nix index 98b0cc9..ff5bad1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,6 @@ builtins.map (path: import path) [ ./android-studio.nix + ./cascadia-code.nix ./ccache.nix ./eww.nix ./material-icons.nix From 6d49e2b75d47de52e82e5e454cbfa5df1ff86cf9 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 19:43:09 +1100 Subject: [PATCH 136/584] system/gui: remove font-awesome --- modules/system/gui.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/system/gui.nix b/modules/system/gui.nix index bfe56b7..f2e277c 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -12,8 +12,6 @@ material-symbols material-icons cascadia-code - font-awesome - font-awesome_4 hanazono noto-fonts noto-fonts-cjk-sans From 88196824f658eaf422a3ba7fc3a1bdec93082d1a Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 20:20:13 +1100 Subject: [PATCH 137/584] user/eww-wayland: use catppuccin colours --- modules/user/eww-wayland.nix | 18 ++++++++++++++++-- res/eww-wayland/eww.scss | 6 +++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/modules/user/eww-wayland.nix b/modules/user/eww-wayland.nix index e939a1f..245fe55 100644 --- a/modules/user/eww-wayland.nix +++ b/modules/user/eww-wayland.nix @@ -1,7 +1,21 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: +let + res = pkgs.stdenvNoCC.mkDerivation { + pname = "eww-wayland-config"; + version = "1.0.0"; + dontUnpack = true; + installPhase = '' + cp -r ${../../res/eww-wayland} $out + substituteInPlace $out/eww.scss \ + --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.surface0}" \ + --replace-warn "EWW_TEXT" "${config.catppuccin.hexcolors.text}" \ + --replace-warn "EWW_ACCENT" "${config.catppuccin.hexcolors.pink}" + ''; + }; +in { home.packages = with pkgs; [ socat ]; programs.eww = { enable = true; - configDir = ../../res/eww-wayland; + configDir = res; }; } diff --git a/res/eww-wayland/eww.scss b/res/eww-wayland/eww.scss index 08b2270..abbfd3a 100644 --- a/res/eww-wayland/eww.scss +++ b/res/eww-wayland/eww.scss @@ -1,6 +1,6 @@ -$background: #1a1b26; -$accent: #9d7cd8; -$foreground: #c0caf5; +$background: EWW_BACKGROUND; +$accent: EWW_ACCENT; +$foreground: EWW_TEXT; * { all: unset; From 91a993a8f7ea7976c584cf3c753c807a599f4229 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 22:36:14 +1100 Subject: [PATCH 138/584] user/eww-wayland: fix title script to truncate properly --- res/eww-wayland/scripts/title.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/res/eww-wayland/scripts/title.sh b/res/eww-wayland/scripts/title.sh index fd7b798..108e0a5 100755 --- a/res/eww-wayland/scripts/title.sh +++ b/res/eww-wayland/scripts/title.sh @@ -9,9 +9,10 @@ out () { } init=$(hyprctl activewindow -j | jq --raw-output .title) -out "$init" +trunc=$(echo $init | cut -c-60) +out "$trunc" socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do - trunc=$(echo $line | cut -c-85) + trunc=$(echo $line | cut -c-60) out "$trunc" done From 70caf4cd4bdbec156050c16e37241933ea0400a5 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 22:37:47 +1100 Subject: [PATCH 139/584] user/eww-wayland: more widgets!! includes widgets for bluetooth, wifi, and battery also sets a margin for the title widget --- res/eww-wayland/eww.scss | 18 ++++++ res/eww-wayland/eww.yuck | 98 +++++++++++++++++++++++++++--- res/eww-wayland/scripts/network.sh | 19 ++++++ 3 files changed, 127 insertions(+), 8 deletions(-) create mode 100755 res/eww-wayland/scripts/network.sh diff --git a/res/eww-wayland/eww.scss b/res/eww-wayland/eww.scss index abbfd3a..fda0ae1 100644 --- a/res/eww-wayland/eww.scss +++ b/res/eww-wayland/eww.scss @@ -24,6 +24,19 @@ window { border-radius: 50px; } +.title { + margin: 0 5px; +} + +.pill { + margin-right: 5px; + padding: 5px 10px; +} + +.extended { + padding: 5px 15px; +} + .time { .base { font-weight: 700; @@ -70,3 +83,8 @@ window { } } +.pill-icon { + color: $accent; + font-family: Material Symbols Outlined; + font-size: 18px; +} diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 67a06c7..08cabde 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -21,6 +21,9 @@ (bar)) +(defvar bat-extended false) +(defvar bluetooth-extended false) +(defvar network-extended false) (defvar time-extended false) (defpoll ptime :interval "1s" `date +%H:%M`) @@ -28,8 +31,16 @@ `date "+%A, %d %B %Y "`) (defpoll petimeb :interval "1s" :run-while time-extended `date "+:%S"`) +(defpoll pbat_cap :interval "5s" + `cat /sys/class/power_supply/BATT/capacity`) +(defpoll pbat_status :interval "1s" + `cat /sys/class/power_supply/BATT/status`) +(defpoll network_strength :interval "1s" + `nmcli -f IN-USE,SIGNAL device wifi | grep '*' | tr -d -c 0-9`) +(defpoll bluetooth_device :interval "1s" + `bluetoothctl devices Connected | grep Device | cut -d" " -f3-`) - +(deflisten lnetwork :initial "" "./scripts/network.sh") (deflisten ltitle :initial "" "./scripts/title.sh") (deflisten lworkspaces :initial "[]" "./scripts/workspaces.sh") (deflisten lcurrent_workspace :initial "1" "./scripts/active-workspace.sh") @@ -40,7 +51,7 @@ :class "bar" (workspaces) (title) - (time)))) + (right_bar)))) (defwidget workspaces [] (box :class "widget workspaces" @@ -58,18 +69,89 @@ (literal :content ltitle)) (defwidget time_extension [text] - (label :text text - :class "extension")) + (revealer :transition "slideleft" + :reveal time-extended + :duration 150 + (label :text text + :class "extension"))) + +(defwidget right_bar [] + (box :orientation "horizontal" + :space-evenly false + :halign "end" + (bluetooth) + (network) + (battery) + (time))) + +(defwidget bluetooth [] + (button :onclick `eww update bluetooth-extended=${bluetooth-extended ? "false" : "true"}` + (box :orientation "horizontal" + :class {"widget pill" + ((bluetooth-extended && bluetooth_device != "") ? " extended" : "")} + :spacing {(bluetooth-extended && bluetooth_device != "") ? 5 : 0} + :space-evenly false + (label :text { bluetooth_device == "" ? "" : ""} + :class "base pill-icon") + (revealer :transition "slideleft" + :reveal {bluetooth-extended && bluetooth_device != ""} + :duration 150 + (label :text bluetooth_device + :class "base"))))) + +(defwidget network [] + (button :onclick `eww update network-extended=${network-extended ? "false" : "true"}` + (box :orientation "horizontal" + :class {"widget pill" + ((network-extended && lnetwork != "Disconnected") ? " extended" : "")} + :spacing {(network-extended && lnetwork != "Disconnected") ? 5 : 0} + :space-evenly false + (label :text { + (lnetwork == "Disconnected") ? "" + : (network_strength == "") ? "" + : (network_strength < 20) ? "" + : (network_strength < 30) ? "" + : (network_strength < 55) ? "" + : (network_strength < 80) ? "" + : ""} + :class "base pill-icon") + (revealer :transition "slideleft" + :reveal {network-extended && lnetwork != "Disconnected"} + :duration 150 + (label :text lnetwork + :class "base"))))) + +(defwidget battery [] + (button :onclick `eww update bat-extended=${bat-extended ? "false" : "true"}` + (box :orientation "horizontal" + :class {"widget pill" + (bat-extended ? " extended" : "")} + :spacing {bat-extended ? 3 : 0} + :space-evenly false + (label :text { + (pbat_status == "Charging" || pbat_status == "Full") ? + ( (pbat_cap < 20) ? "" + : (pbat_cap < 50) ? "" + : (pbat_cap < 100) ? "" + : "" ) + : (pbat_cap < 10) ? "" + : (pbat_cap < 20) ? "" + : (pbat_cap < 50) ? "" + : (pbat_cap < 80) ? "" + : ""} + :class "base pill-icon") + (revealer :transition "slideleft" + :reveal bat-extended + :duration 150 + (label :text {pbat_cap + "%"} + :class "base"))))) + (defwidget time [] (button :onclick `eww update time-extended=${time-extended ? "false" : "true"}` (box :orientation "horizontal" :space-evenly false - :halign "end" + :hexpand true :class "widget time" - (time_extension :text {time-extended ? petimea : ""}) + (time_extension :text petimea) (label :text ptime :class "base") - (time_extension :text {time-extended ? petimeb : ""}) - ))) + (time_extension :text petimeb)))) diff --git a/res/eww-wayland/scripts/network.sh b/res/eww-wayland/scripts/network.sh new file mode 100755 index 0000000..7d0c2c8 --- /dev/null +++ b/res/eww-wayland/scripts/network.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +init=$(nmcli -t -f name,device connection show --active | grep wlp1s0 | cut -d\: -f1) + +if [[ -z $init ]]; then + echo Disconnected +else + echo $init +fi + +nmcli monitor | while read -r line ; do + if [[ $line == *"is now the primary connection" ]]; then + conn=$(echo $line | cut -d\' -f2) + echo $conn + fi + if [[ $line == "There's no primary connection" ]]; then + echo Disconnected + fi +done From 43573ebf99709adc8c05a25733fcce0174625972 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sat, 15 Mar 2025 22:46:20 +1100 Subject: [PATCH 140/584] user/eww-wayland: use surface1 for background --- modules/user/eww-wayland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/eww-wayland.nix b/modules/user/eww-wayland.nix index 245fe55..47cddb6 100644 --- a/modules/user/eww-wayland.nix +++ b/modules/user/eww-wayland.nix @@ -7,7 +7,7 @@ let installPhase = '' cp -r ${../../res/eww-wayland} $out substituteInPlace $out/eww.scss \ - --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.surface0}" \ + --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.surface1}" \ --replace-warn "EWW_TEXT" "${config.catppuccin.hexcolors.text}" \ --replace-warn "EWW_ACCENT" "${config.catppuccin.hexcolors.pink}" ''; From 4326568b66111cf9f53c6e8021b4a83fbcdc1483 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 16 Mar 2025 00:29:48 +1100 Subject: [PATCH 141/584] rin/packages: add tetrio (plus) --- users/rin/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index bcbc510..106ec03 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -42,7 +42,6 @@ in { insomnia maim mangohud - #me.tetrio-desktop-plus me.psensor inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin inputs.nix-gaming.packages.x86_64-linux.wine-osu @@ -54,6 +53,7 @@ in { screenkey slurp swaybg + (tetrio-desktop.override { withTetrioPlus = true; }) tor-browser-bundle-bin transmission-remote-gtk virt-manager From 94a89fca4b9000164fa3290525f6fa8511ded751 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 16 Mar 2025 01:19:23 +1100 Subject: [PATCH 142/584] hosts/anemone: enable tlp --- hosts/anemone/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index 5b8e534..8f62938 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -45,4 +45,6 @@ enable = true; package = pkgs.wireshark; }; + + services.tlp.enable = true; } From 76197628bc71e87ac0e3fbc6420b0eeed11e7eed Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 16 Mar 2025 20:59:32 +1100 Subject: [PATCH 143/584] anemone/kernel: set min freq to 400MHz --- hosts/anemone/kernel.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix index 1386118..7db481f 100644 --- a/hosts/anemone/kernel.nix +++ b/hosts/anemone/kernel.nix @@ -22,6 +22,8 @@ ]; }; + powerManagement.cpufreq.min = 400000; + hardware.cpu.amd.updateMicrocode = true; hardware.firmware = let From 2f374716976520f12ae35a9096af2b3b4e6d9fcf Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 16 Mar 2025 23:59:45 +1100 Subject: [PATCH 144/584] user/catppuccin: enable gtk --- modules/user/catppuccin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 1311421..6d430bb 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -16,6 +16,7 @@ accent = "maroon"; flavor = "mocha"; kitty.enable = true; + gtk.enable = true; nvim.enable = true; }; } From 27f73340deda5c95ccccc71724b55d50ec14e002 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 00:06:11 +1100 Subject: [PATCH 145/584] user/dunst: theme with catppuccin --- modules/user/dunst.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/user/dunst.nix b/modules/user/dunst.nix index 08f4d62..35c65d4 100644 --- a/modules/user/dunst.nix +++ b/modules/user/dunst.nix @@ -49,21 +49,21 @@ in { }; urgency_low = { - background = "#12131b"; - foreground = "#d8dee8"; + background = config.catppuccin.hexcolors.surface1; + foreground = config.catppuccin.hexcolors.text; timeout = 3; }; urgency_normal = { - background = "#12131b"; - foreground = "#d8dee8"; + background = config.catppuccin.hexcolors.surface1; + foreground = config.catppuccin.hexcolors.text; timeout = 5; }; urgency_critical = { - background = "#12131b"; - foreground = "#d8dee8"; - # frame_color = "#bf616a"; + background = config.catppuccin.hexcolors.surface1; + foreground = config.catppuccin.hexcolors.text; + frame_color = config.catppuccin.hexcolors.red; timeout = 0; }; }; From 606dba7e08e62c11743f968329b61109e44159b6 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 00:10:45 +1100 Subject: [PATCH 146/584] user/eww-wayland: use accent colour --- modules/user/eww-wayland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/eww-wayland.nix b/modules/user/eww-wayland.nix index 47cddb6..7060037 100644 --- a/modules/user/eww-wayland.nix +++ b/modules/user/eww-wayland.nix @@ -9,7 +9,7 @@ let substituteInPlace $out/eww.scss \ --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.surface1}" \ --replace-warn "EWW_TEXT" "${config.catppuccin.hexcolors.text}" \ - --replace-warn "EWW_ACCENT" "${config.catppuccin.hexcolors.pink}" + --replace-warn "EWW_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}" ''; }; in { From 06c3f076a4e9fb3e89c7f3db8bdd837c8237651b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 00:22:43 +1100 Subject: [PATCH 147/584] user/dunst: minor tweaks to layout --- modules/user/dunst.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/user/dunst.nix b/modules/user/dunst.nix index 35c65d4..b8cfb07 100644 --- a/modules/user/dunst.nix +++ b/modules/user/dunst.nix @@ -12,9 +12,9 @@ in { global = { monitor = 0; follow = "mouse"; - width = 460; + width = "(100, 450)"; origin = "top-right"; - offset = "24x35"; + offset = "24x50"; notification_limit = 0; indicate_hidden = true; shrink = true; @@ -36,7 +36,7 @@ in { hide_duplicate_count = true; show_indicators = false; icon_position = "left"; - max_icon_size = 32; + max_icon_size = 40; sticky_history = true; history_length = 100; browser = "${pkgs.firefox}/bin/firefox -new-tab"; From db469ad58f02e43cad303c422fc3bd8f55522730 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 00:41:24 +1100 Subject: [PATCH 148/584] user/rofi-wayland: use catppuccin colours --- modules/user/rofi-wayland.nix | 19 +++++++++++++++++-- res/theme.rasi | 11 ++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/modules/user/rofi-wayland.nix b/modules/user/rofi-wayland.nix index 6bb85a0..19e569e 100644 --- a/modules/user/rofi-wayland.nix +++ b/modules/user/rofi-wayland.nix @@ -1,8 +1,23 @@ -{ config, pkgs, ... }: { +{ config, pkgs, ... }: +let + theme = pkgs.stdenvNoCC.mkDerivation { + pname = "rofi-theme"; + version = "1.0.0"; + dontUnpack = true; + installPhase = '' + cp ${../../res/theme.rasi} $out + substituteInPlace $out \ + --replace-fail "CAT_BACKGROUND" "${config.catppuccin.hexcolors.crust}" \ + --replace-fail "CAT_TEXT" "${config.catppuccin.hexcolors.text}" \ + --replace-fail "CAT_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}" \ + --replace-fail "CAT_PLACEHOLDER" "${config.catppuccin.hexcolors.overlay1}" + ''; + }; +in { programs.rofi = { enable = true; package = pkgs.rofi-wayland; theme = "theme"; }; - xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi; + xdg.configFile."rofi/theme.rasi".source = theme; } diff --git a/res/theme.rasi b/res/theme.rasi index fbf45e4..b7fd398 100644 --- a/res/theme.rasi +++ b/res/theme.rasi @@ -12,9 +12,9 @@ configuration { @theme "/dev/null" * { - bg: #12131b; - fg: #f3f6ff; - button: #ae58c8; + bg: CAT_BACKGROUND; + fg: CAT_TEXT; + button: CAT_ACCENT; background-color: @bg; text-color: @fg; @@ -30,7 +30,7 @@ prompt { enabled: false; } entry { placeholder: "Search"; - placeholder-color: #f3f6ff90; + placeholder-color: CAT_PLACEHOLDER; transparency: "real"; expand: true; font: "Noto Sans 32"; @@ -70,7 +70,7 @@ element-text { margin: 0% 3% 0.5% 3%; background-color: inherit; text-color: inherit; - font: "Noto Sans 12"; + font: "Noto Sans Medium 12"; } element-icon { @@ -85,4 +85,5 @@ element-icon { element selected { background-color: @button; border-radius: 8px; + text-color: @bg; } From 017e2bc812cba0c2763f58d9fa2977a0124a3086 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 00:41:58 +1100 Subject: [PATCH 149/584] user/{dunst,eww-wayland}: use crust instead of surface for cat. colours --- modules/user/dunst.nix | 6 +++--- modules/user/eww-wayland.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/user/dunst.nix b/modules/user/dunst.nix index b8cfb07..2ae1404 100644 --- a/modules/user/dunst.nix +++ b/modules/user/dunst.nix @@ -49,19 +49,19 @@ in { }; urgency_low = { - background = config.catppuccin.hexcolors.surface1; + background = config.catppuccin.hexcolors.crust; foreground = config.catppuccin.hexcolors.text; timeout = 3; }; urgency_normal = { - background = config.catppuccin.hexcolors.surface1; + background = config.catppuccin.hexcolors.crust; foreground = config.catppuccin.hexcolors.text; timeout = 5; }; urgency_critical = { - background = config.catppuccin.hexcolors.surface1; + background = config.catppuccin.hexcolors.crust; foreground = config.catppuccin.hexcolors.text; frame_color = config.catppuccin.hexcolors.red; timeout = 0; diff --git a/modules/user/eww-wayland.nix b/modules/user/eww-wayland.nix index 7060037..e82f5ac 100644 --- a/modules/user/eww-wayland.nix +++ b/modules/user/eww-wayland.nix @@ -7,7 +7,7 @@ let installPhase = '' cp -r ${../../res/eww-wayland} $out substituteInPlace $out/eww.scss \ - --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.surface1}" \ + --replace-warn "EWW_BACKGROUND" "${config.catppuccin.hexcolors.crust}" \ --replace-warn "EWW_TEXT" "${config.catppuccin.hexcolors.text}" \ --replace-warn "EWW_ACCENT" "${config.catppuccin.hexcolors.${config.catppuccin.accent}}" ''; From b9df2f3a0cba1027d4dd958958ab188a5de20cdb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 01:33:41 +1100 Subject: [PATCH 150/584] user/spicetify: bring back with updates --- flake.lock | 37 +++++++++++++++++++++++++++++++ flake.nix | 2 ++ modules/user/spicetify.nix | 45 ++++++++++++++++++++++---------------- users/rin/wayland.nix | 2 ++ 4 files changed, 67 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 3af226e..15c58b3 100644 --- a/flake.lock +++ b/flake.lock @@ -678,6 +678,7 @@ "nixpkgs": "nixpkgs_3", "nvim-treesitter": "nvim-treesitter", "pure": "pure", + "spicetify-nix": "spicetify-nix", "spotify-adblock": "spotify-adblock", "tree-sitter-jsonc": "tree-sitter-jsonc", "wine-discord-ipc-bridge": "wine-discord-ipc-bridge", @@ -685,6 +686,27 @@ "zsh-history-substring-search": "zsh-history-substring-search" } }, + "spicetify-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1742098581, + "narHash": "sha256-c8pnJi/Y8+whPi5aOs5qKshfh4vvRUqczaJIOc6Xdv8=", + "owner": "Gerg-L", + "repo": "spicetify-nix", + "rev": "4b285681a73e73c4f961fb69163c0daa36a18d30", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "spicetify-nix", + "type": "github" + } + }, "spotify-adblock": { "flake": false, "locked": { @@ -731,6 +753,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tree-sitter-jsonc": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 083448c..b728f33 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,8 @@ neovim-nightly.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; + spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; # services # hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; }; diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index 8158246..c8e0b53 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -1,34 +1,41 @@ { config, inputs, pkgs, ... }: let - spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; - #adblock = inputs.spotify-adblock.defaultPackage.x86_64-linux; - adblock = pkgs.me.spotify-adblock; + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; in { - imports = [ inputs.spicetify-nix.homeManagerModule ]; + imports = [ inputs.spicetify-nix.homeManagerModules.spicetify ]; programs.spicetify = { - spotifyPackage = pkgs.spotify-unwrapped.overrideAttrs(o: { - installPhase = pkgs.lib.replaceStrings ["--prefix PATH"] [ - ''--prefix SPOTIFY_ADBLOCK_CONFIG : ${adblock}/lib/config.toml \ - --prefix LD_PRELOAD : ${adblock}/lib/libspotifyadblock.so \ - --prefix PATH''] o.installPhase; - }); - enable = true; - theme = spicePkgs.themes.Dribbblish // { - #src = inputs.spicetify-themes; - extraCommands = "spicetify-cli --no-restart config experimental_features 1"; - #requiredExtensions = [((builtins.head spicePkgs.themes.Dribbblish.requiredExtensions) // { filename = "theme.js"; }) ]; + theme = spicePkgs.themes.dribbblish // rec { + src = pkgs.stdenvNoCC.mkDerivation { + pname = "spicetify-dribbblish-catppuccin-patch"; + version = "1.0.0"; + dontUnpack = true; + installPhase = let + color_prev1 = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.overlay1; + color_prev2 = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.overlay2; + color_next = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.${config.catppuccin.accent}; + color_sidebar_prev = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.mantle; + color_sidebar_next = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.crust; + in '' + cp -r ${spicePkgs.themes.dribbblish.src} $out + substituteInPlace $out/color.ini \ + --replace-fail "${color_prev1}" "${color_next}" \ + --replace-fail "${color_prev2}" "${color_next}" \ + --replace-fail "sidebar = ${color_sidebar_prev}" \ + "sidebar = ${color_sidebar_next}" + ''; + }; }; - colorScheme = "purple"; + colorScheme = "catppuccin-${config.catppuccin.flavor}"; enabledCustomApps = with spicePkgs.apps; [ - lyrics-plus + lyricsPlus ]; enabledExtensions = with spicePkgs.extensions; [ - fullAppDisplayMod - shuffle # shuffle+ (special characters are sanitized out of ext names) + fullAppDisplay + shuffle hidePodcasts skipStats diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index edbcfda..4301173 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -38,6 +38,8 @@ dunst eww-wayland + + spicetify ]; services.mpris-proxy.enable = true; From 716c28a30331826a8346727ccebdfe4b0e44bf0e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 01:48:55 +1100 Subject: [PATCH 151/584] user/neovim: disable mouse --- res/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/res/config.lua b/res/config.lua index 349ed15..4e02a70 100644 --- a/res/config.lua +++ b/res/config.lua @@ -12,6 +12,7 @@ vim.cmd('au BufEnter * set noro') vim.cmd('au CursorHold * lua vim.diagnostic.open_float(0, { scope = "line", focusable = false })') -- Settings +vim.opt.mouse = "" vim.opt.relativenumber = true vim.opt.number = true vim.opt.cursorline = true From ae557b287e8398b14af082f11032e6f54182caef Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 11:57:54 +1100 Subject: [PATCH 152/584] user/catppuccin: switch to latte --- modules/user/catppuccin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 6d430bb..d910a1d 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -14,7 +14,7 @@ config.catppuccin = { accent = "maroon"; - flavor = "mocha"; + flavor = "latte"; kitty.enable = true; gtk.enable = true; nvim.enable = true; From de92335ae540f7665ecbec4c8bef4bb4ef065a09 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 12:07:27 +1100 Subject: [PATCH 153/584] user/theming: follow catppuccin for dark/light gtk config --- modules/user/theming.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/user/theming.nix b/modules/user/theming.nix index cacb500..ff1b2f8 100644 --- a/modules/user/theming.nix +++ b/modules/user/theming.nix @@ -16,15 +16,15 @@ # package = pkgs.gnome-themes-extra; # }; gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; + gtk-application-prefer-dark-theme = if config.catppuccin.flavor == "latte" then "0" else "1"; }; gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; + gtk-application-prefer-dark-theme = if config.catppuccin.flavor == "latte" then "0" else "1"; }; }; dconf.settings = { - "org/gnome/desktop/interface".color-scheme = "prefer-dark"; + "org/gnome/desktop/interface".color-scheme = if config.catppuccin.flavor == "latte" then "prefer-light" else "prefer-dark"; }; home.pointerCursor = { From eadc1959d077f8d7838f0f8bbbaf316ffcabf66a Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 12:22:29 +1100 Subject: [PATCH 154/584] user/theming: set cursor size to 24 --- modules/user/theming.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/theming.nix b/modules/user/theming.nix index ff1b2f8..83084b0 100644 --- a/modules/user/theming.nix +++ b/modules/user/theming.nix @@ -30,7 +30,7 @@ home.pointerCursor = { package = pkgs.yaru-theme; name = "Yaru"; - size = 16; + size = 24; gtk.enable = true; x11.enable = true; }; From ae7ead030911ea5b835bad16ce92aea020a01a24 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 12:51:21 +1100 Subject: [PATCH 155/584] user/catppuccin: theme qt6 --- modules/user/catppuccin.nix | 20 ++++++++++++++------ modules/user/theming.nix | 8 -------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index d910a1d..bdb145d 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -12,11 +12,19 @@ default = builtins.mapAttrs (name: value: value.hex) config.catppuccin.colors; }; - config.catppuccin = { - accent = "maroon"; - flavor = "latte"; - kitty.enable = true; - gtk.enable = true; - nvim.enable = true; + config = { + catppuccin = { + accent = "maroon"; + flavor = "latte"; + kitty.enable = true; + gtk.enable = true; + kvantum.enable = true; + nvim.enable = true; + }; + qt = { + enable = true; + style.name = "kvantum"; + platformTheme.name = "kvantum"; + }; }; } diff --git a/modules/user/theming.nix b/modules/user/theming.nix index 83084b0..00ab88f 100644 --- a/modules/user/theming.nix +++ b/modules/user/theming.nix @@ -7,14 +7,6 @@ name = "Open Sans"; size = 11; }; - # iconTheme = { - # package = pkgs.yaru-theme; - # name = "Yaru"; - # }; - # theme = { - # name = "Adwaita-dark"; - # package = pkgs.gnome-themes-extra; - # }; gtk3.extraConfig = { gtk-application-prefer-dark-theme = if config.catppuccin.flavor == "latte" then "0" else "1"; }; From 0a6ee4cd3d2cf159346cdd25e435fb94ed205751 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 13:09:03 +1100 Subject: [PATCH 156/584] user/spicetify: change some colours --- modules/user/spicetify.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index c8e0b53..bc2a5e7 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -18,13 +18,18 @@ in color_next = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.${config.catppuccin.accent}; color_sidebar_prev = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.mantle; color_sidebar_next = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.crust; + + color_sidebar_text_prev = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.text; + color_sidebar_text_next = builtins.replaceStrings ["#"] [""] (config.catppuccin.hexcolors.base); in '' cp -r ${spicePkgs.themes.dribbblish.src} $out substituteInPlace $out/color.ini \ --replace-fail "${color_prev1}" "${color_next}" \ --replace-fail "${color_prev2}" "${color_next}" \ --replace-fail "sidebar = ${color_sidebar_prev}" \ - "sidebar = ${color_sidebar_next}" + "sidebar = ${color_sidebar_next}" \ + --replace-fail "sidebar-text = ${color_sidebar_text_prev}" \ + "sidebar-text = ${color_sidebar_text_next}" ''; }; }; From 7f300748afea1338fd61503cdfab36b1c45a7230 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 13:13:05 +1100 Subject: [PATCH 157/584] user/spicetify: enable devtools --- modules/user/spicetify.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index bc2a5e7..7083237 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -7,6 +7,7 @@ in programs.spicetify = { enable = true; + alwaysEnableDevTools = true; theme = spicePkgs.themes.dribbblish // rec { src = pkgs.stdenvNoCC.mkDerivation { pname = "spicetify-dribbblish-catppuccin-patch"; @@ -27,9 +28,7 @@ in --replace-fail "${color_prev1}" "${color_next}" \ --replace-fail "${color_prev2}" "${color_next}" \ --replace-fail "sidebar = ${color_sidebar_prev}" \ - "sidebar = ${color_sidebar_next}" \ - --replace-fail "sidebar-text = ${color_sidebar_text_prev}" \ - "sidebar-text = ${color_sidebar_text_next}" + "sidebar = ${color_sidebar_next}" ''; }; }; From 4b451909017d48f443356944e0a2e93bd0e90fda Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 13:30:40 +1100 Subject: [PATCH 158/584] user/spicetify: use custom colour scheme --- modules/user/spicetify.nix | 44 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index 7083237..95e30ba 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -1,6 +1,8 @@ { config, inputs, pkgs, ... }: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + colours = builtins.mapAttrs (_: colour: builtins.replaceStrings ["#"] [""] colour) config.catppuccin.hexcolors; + accentColour = colours.${config.catppuccin.accent}; in { imports = [ inputs.spicetify-nix.homeManagerModules.spicetify ]; @@ -8,31 +10,25 @@ in programs.spicetify = { enable = true; alwaysEnableDevTools = true; - theme = spicePkgs.themes.dribbblish // rec { - src = pkgs.stdenvNoCC.mkDerivation { - pname = "spicetify-dribbblish-catppuccin-patch"; - version = "1.0.0"; - dontUnpack = true; - installPhase = let - color_prev1 = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.overlay1; - color_prev2 = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.overlay2; - color_next = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.${config.catppuccin.accent}; - color_sidebar_prev = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.mantle; - color_sidebar_next = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.crust; - - color_sidebar_text_prev = builtins.replaceStrings ["#"] [""] config.catppuccin.hexcolors.text; - color_sidebar_text_next = builtins.replaceStrings ["#"] [""] (config.catppuccin.hexcolors.base); - in '' - cp -r ${spicePkgs.themes.dribbblish.src} $out - substituteInPlace $out/color.ini \ - --replace-fail "${color_prev1}" "${color_next}" \ - --replace-fail "${color_prev2}" "${color_next}" \ - --replace-fail "sidebar = ${color_sidebar_prev}" \ - "sidebar = ${color_sidebar_next}" - ''; - }; + theme = spicePkgs.themes.dribbblish; + customColorScheme = { + text = colours.text; + subtext = colours.subtext1; + sidebar-text = colours.text; + main = colours.base; + sidebar = colours.mantle; + player = colours.base; + card = colours.base; + shadow = colours.mantle; + selected-row = colours.overlay2; + button = colours.overlay1; + button-active = colours.overlay2; + button-disabled = colours.overlay0; + tab-active = colours.surface0; + notification = colours.surface0; + notification-error = colours.red; + misc = colours.surface1; }; - colorScheme = "catppuccin-${config.catppuccin.flavor}"; enabledCustomApps = with spicePkgs.apps; [ lyricsPlus From fa2e2c3ce663f34d0afc7894e97f908bdbdf0460 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 13:35:53 +1100 Subject: [PATCH 159/584] user/spicetify: switch to catppuccin theme i give up with dribbblish --- modules/user/spicetify.nix | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index 95e30ba..a1439a6 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -1,8 +1,6 @@ { config, inputs, pkgs, ... }: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; - colours = builtins.mapAttrs (_: colour: builtins.replaceStrings ["#"] [""] colour) config.catppuccin.hexcolors; - accentColour = colours.${config.catppuccin.accent}; in { imports = [ inputs.spicetify-nix.homeManagerModules.spicetify ]; @@ -10,25 +8,8 @@ in programs.spicetify = { enable = true; alwaysEnableDevTools = true; - theme = spicePkgs.themes.dribbblish; - customColorScheme = { - text = colours.text; - subtext = colours.subtext1; - sidebar-text = colours.text; - main = colours.base; - sidebar = colours.mantle; - player = colours.base; - card = colours.base; - shadow = colours.mantle; - selected-row = colours.overlay2; - button = colours.overlay1; - button-active = colours.overlay2; - button-disabled = colours.overlay0; - tab-active = colours.surface0; - notification = colours.surface0; - notification-error = colours.red; - misc = colours.surface1; - }; + theme = spicePkgs.themes.catppuccin; + colorScheme = config.catppuccin.flavor; enabledCustomApps = with spicePkgs.apps; [ lyricsPlus From 8dc54c356515bd8f6298fe6b554ef9adf9f2c5a8 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 14:02:06 +1100 Subject: [PATCH 160/584] user/spicetify: remove gradient --- modules/user/spicetify.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index a1439a6..998f9f6 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -11,6 +11,9 @@ in theme = spicePkgs.themes.catppuccin; colorScheme = config.catppuccin.flavor; + enabledSnippets = with spicePkgs.snippets; [ + removeGradient + ]; enabledCustomApps = with spicePkgs.apps; [ lyricsPlus ]; From aa339560b32c313c1204f9297394c17a79e53dbb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 15:16:11 +1100 Subject: [PATCH 161/584] user/hyprlock: init --- hosts/anemone/default.nix | 1 + modules/default.nix | 1 + modules/user/hyprlock.nix | 5 +++++ users/rin/wayland.nix | 1 + 4 files changed, 8 insertions(+) create mode 100644 modules/user/hyprlock.nix diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index 8f62938..e86347c 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -35,6 +35,7 @@ ]; programs.hyprland.enable = true; + security.pam.services.hyprlock = {}; # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ diff --git a/modules/default.nix b/modules/default.nix index 92e7519..5bbb8ed 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -57,6 +57,7 @@ in { ./user/eww-wayland.nix ./user/git.nix ./user/gpg.nix + ./user/hyprlock.nix ./user/kitty.nix ./user/mpv.nix ./user/neovim.nix diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix new file mode 100644 index 0000000..07e6292 --- /dev/null +++ b/modules/user/hyprlock.nix @@ -0,0 +1,5 @@ +{ ... }: { + programs.hyprlock = { + enable = true; + }; +} diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index 4301173..9ef02af 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -31,6 +31,7 @@ theming xdg + hyprlock kitty mpv obs From 210addb2a784d2facc19e6024213f7546303de22 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 15:19:33 +1100 Subject: [PATCH 162/584] user/zsh: disable execute --- modules/user/zsh.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/user/zsh.nix b/modules/user/zsh.nix index fec1e38..9f4b920 100644 --- a/modules/user/zsh.nix +++ b/modules/user/zsh.nix @@ -97,6 +97,9 @@ let bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'j' history-substring-search-down ''; + disableExecute = '' + bindkey -a -r ':' + ''; in { programs.command-not-found.enable = true; programs.zsh = { @@ -144,6 +147,7 @@ in { direnv genAbbrs viExtraNav + disableExecute ]; plugins = builtins.map (e: pluginFromInput e) [ From 0fed2f359937edc01871a05873d6b4d9826eb179 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 15:30:26 +1100 Subject: [PATCH 163/584] user/eww-wayland: extend battery by default --- res/eww-wayland/eww.yuck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 08cabde..288b89c 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -21,7 +21,7 @@ (bar)) -(defvar bat-extended false) +(defvar bat-extended true) (defvar bluetooth-extended false) (defvar network-extended false) (defvar time-extended false) From 38bcba47561e297747f20f177a6671683dce8eb5 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 15:52:18 +1100 Subject: [PATCH 164/584] user/hypridle: init --- modules/default.nix | 1 + modules/user/hypridle.nix | 42 +++++++++++++++++++++++++++++++++++++++ users/rin/wayland.nix | 1 + 3 files changed, 44 insertions(+) create mode 100644 modules/user/hypridle.nix diff --git a/modules/default.nix b/modules/default.nix index 5bbb8ed..295a8db 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -57,6 +57,7 @@ in { ./user/eww-wayland.nix ./user/git.nix ./user/gpg.nix + ./user/hypridle.nix ./user/hyprlock.nix ./user/kitty.nix ./user/mpv.nix diff --git a/modules/user/hypridle.nix b/modules/user/hypridle.nix new file mode 100644 index 0000000..1d28371 --- /dev/null +++ b/modules/user/hypridle.nix @@ -0,0 +1,42 @@ +{ ... }: +let + kblight = "light -s sysfs/leds/asus::kbd_backlight"; +in +{ + services.hypridle = { + enable = true; + settings = { + general = { + lock_cmd = "pidof hyprlock || hyprlock"; + before_sleep_cmd = "loginctl lock-session"; + after_sleep_cmd = "hyprctl dispatch dpms on"; + }; + + listener = [ + { + timeout = 120; + on-timeout = "${kblight} -O && ${kblight} -S 0"; + on-resume = "${kblight} -I"; + } + { + timeout = 150; + on-timeout = "light -O && light -T 0.5"; + on-resume = "light -I"; + } + { + timeout = 180; + on-timeout = "light -I && loginctl lock-session"; + } + { + timeout = 195; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + { + timeout = 600; + on-timeout = "systemctl suspend"; + } + ]; + }; + }; +} diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index 9ef02af..df32eea 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -31,6 +31,7 @@ theming xdg + hypridle hyprlock kitty mpv From 282a0ae22d2876528d0be505700666fd3b5fa5bb Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 15:56:47 +1100 Subject: [PATCH 165/584] system/greetd_wayland: setup auto-login --- modules/system/greetd_wayland.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index 4e2a41f..9295b27 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -6,6 +6,11 @@ command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && Hyprland > $XDG_RUNTIME_DIR/Hyprland.out\"'"; user = "greeter"; }; + + initial_session = { + command = "Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; + user = "rin"; + }; }; }; From b288e1c78c6d68f6df59ba4aeb9c310c27d2d8e3 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 16:07:33 +1100 Subject: [PATCH 166/584] user/hypridle: expose package --- modules/user/hypridle.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/user/hypridle.nix b/modules/user/hypridle.nix index 1d28371..5e22d8d 100644 --- a/modules/user/hypridle.nix +++ b/modules/user/hypridle.nix @@ -1,8 +1,9 @@ -{ ... }: +{ config, ... }: let kblight = "light -s sysfs/leds/asus::kbd_backlight"; in { + home.packages = [ config.services.hypridle.package ]; services.hypridle = { enable = true; settings = { From 9d6693a0aeb1c6e2786a60d4e60a98a2f99b8001 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 16:20:47 +1100 Subject: [PATCH 167/584] hosts/anemone: enable fprintd --- hosts/anemone/default.nix | 1 + modules/user/hyprlock.nix | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index e86347c..b29d535 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -47,5 +47,6 @@ package = pkgs.wireshark; }; + services.fprintd.enable = true; services.tlp.enable = true; } diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index 07e6292..632dbd3 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -1,5 +1,12 @@ { ... }: { programs.hyprlock = { enable = true; + settings = { + auth = { + fingerprint = { + enabled = true; + }; + }; + }; }; } From 77bfc31355671f991de37b9404e295be62495d41 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 16:27:44 +1100 Subject: [PATCH 168/584] user/catppuccin: theme hyprlock --- modules/user/catppuccin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index bdb145d..785701f 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -18,6 +18,7 @@ flavor = "latte"; kitty.enable = true; gtk.enable = true; + hyprlock.enable = true; kvantum.enable = true; nvim.enable = true; }; From cde9d8faecb45316e4b179130b5fbc0a8fa5b29e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 16:35:21 +1100 Subject: [PATCH 169/584] user/hyprlock: proper configuration --- modules/user/hyprlock.nix | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index 632dbd3..a90b2b9 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -2,11 +2,74 @@ programs.hyprlock = { enable = true; settings = { + general = { + disable_loading_bar = true; + hide_cursor = true; + }; auth = { fingerprint = { enabled = true; }; }; + background = { + monitor = ""; + path = "$HOME/Pictures/Wallpapers/current.png"; + blur_passes = 1; + color = "$base"; + }; + label = [ + { + monitor = ""; + text = "$TIME"; + color = "$text"; + font_size = 90; + font_family = "Open Sans"; + position = "-30, 0"; + halign = "right"; + valign = "top"; + } + { + monitor = ""; + text = "cmd[update:43200000] date +'%A, %d %B %Y'"; + color = "$text"; + font_size = 25; + font_family = "Open Sans"; + position = "-30, -150"; + halign = "right"; + valign = "top"; + } + { + monitor = ""; + text = "fprint"; + color = "$FPRINTPROMPT"; + font_size = 14; + font_family = "Open Sans"; + position = "0, -107"; + halign = "center"; + valign = "center"; + } + ]; + input-field = { + monitor = ""; + size = "300, 60"; + outline_thickness = 4; + dots_size = 0.2; + dots_spacing = 0.2; + dots_center = true; + outer_color = "$accent"; + inner_color = "$surface0"; + font_color = "$text"; + fade_on_empty = false; + placeholder_text = ''󰌾 Logged in as $USER''; + hide_input = false; + check_color = "$accent"; + fail_color = "$red"; + fail_text = "$FAIL ($ATTEMPTS)"; + capslock_color = "$yellow"; + position = "0, -47"; + halign = "center"; + valign = "center"; + }; }; }; } From ffc5a80849cc78daa9ab1431b00711a7782683b9 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 17:44:32 +1100 Subject: [PATCH 170/584] user/hyprlock: more theming! --- modules/user/hyprlock.nix | 64 ++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index a90b2b9..e28e6ad 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -13,58 +13,80 @@ }; background = { monitor = ""; - path = "$HOME/Pictures/Wallpapers/current.png"; - blur_passes = 1; color = "$base"; }; label = [ + # Fingerprint icon + { + monitor = ""; + color = "$text"; + font_family = "Material Symbols Outlined"; + font_size = 64; + halign = "center"; + valign = "top"; + position = "0, -100"; + text = ""; + } + # Fingerprint text + { + monitor = ""; + color = "$text"; + text = "$FPRINTPROMPT"; + font_size = 25; + font_family = "Open Sans"; + position = "0, -235"; + halign = "center"; + valign = "top"; + } + # Fail text under input + { + monitor = ""; + color = "$red"; + font_family = "Open Sans"; + font_size = 25; + text = "$FAIL $ATTEMPTS[]"; + position = "0, -200"; + halign = "center"; + valign = "center"; + } + # Time { monitor = ""; text = "$TIME"; color = "$text"; font_size = 90; font_family = "Open Sans"; - position = "-30, 0"; + position = "-50, 0"; halign = "right"; valign = "top"; } + # Date { monitor = ""; text = "cmd[update:43200000] date +'%A, %d %B %Y'"; color = "$text"; font_size = 25; font_family = "Open Sans"; - position = "-30, -150"; + position = "-40, -150"; halign = "right"; valign = "top"; } - { - monitor = ""; - text = "fprint"; - color = "$FPRINTPROMPT"; - font_size = 14; - font_family = "Open Sans"; - position = "0, -107"; - halign = "center"; - valign = "center"; - } ]; input-field = { monitor = ""; - size = "300, 60"; + size = "600, 120"; outline_thickness = 4; + check_color = "$peach"; dots_size = 0.2; dots_spacing = 0.2; dots_center = true; - outer_color = "$accent"; - inner_color = "$surface0"; + fail_text = ""; font_color = "$text"; + inner_color = "$crust"; + outer_color = "$base"; + placeholder_text = "Password"; fade_on_empty = false; - placeholder_text = ''󰌾 Logged in as $USER''; hide_input = false; - check_color = "$accent"; - fail_color = "$red"; - fail_text = "$FAIL ($ATTEMPTS)"; capslock_color = "$yellow"; position = "0, -47"; halign = "center"; From e02d908d582856516f3af70c744903b7ecb5d033 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 17:46:18 +1100 Subject: [PATCH 171/584] user/catppuccin: switch back to mocha --- modules/user/catppuccin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 785701f..e941fc0 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -15,7 +15,7 @@ config = { catppuccin = { accent = "maroon"; - flavor = "latte"; + flavor = "mocha"; kitty.enable = true; gtk.enable = true; hyprlock.enable = true; From 024a93baf813167c133d9db47f22602d3082cd62 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 18:02:16 +1100 Subject: [PATCH 172/584] user/hyprlock: move date to align with time --- modules/user/hyprlock.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index e28e6ad..362f4ba 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -67,7 +67,7 @@ color = "$text"; font_size = 25; font_family = "Open Sans"; - position = "-40, -150"; + position = "-50, -150"; halign = "right"; valign = "top"; } From 9efcffd0f6ed5235dca8407b010a7f006bfca227 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 18:17:59 +1100 Subject: [PATCH 173/584] system/base: set locale to en_AU --- modules/system/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/base.nix b/modules/system/base.nix index 0ca07dc..c7e3591 100644 --- a/modules/system/base.nix +++ b/modules/system/base.nix @@ -8,7 +8,7 @@ }; environment.pathsToLink = [ "/share/zsh" ]; - i18n.defaultLocale = "en_GB.UTF-8"; + i18n.defaultLocale = "en_AU.UTF-8"; users.mutableUsers = false; system = { From 5b98df2cee7fa199c445a7d23e2ce82ad69c11c2 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 18:22:47 +1100 Subject: [PATCH 174/584] rin/packages: add vesktop --- users/rin/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 106ec03..31454a5 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -56,6 +56,7 @@ in { (tetrio-desktop.override { withTetrioPlus = true; }) tor-browser-bundle-bin transmission-remote-gtk + vesktop virt-manager winetricks xclip From 5e5720a3f73e9f2cb760248d6fe612bd45a7beb6 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 20:24:01 +1100 Subject: [PATCH 175/584] user/hypridle: pause player on sleep --- modules/user/hypridle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/user/hypridle.nix b/modules/user/hypridle.nix index 5e22d8d..9ee5f26 100644 --- a/modules/user/hypridle.nix +++ b/modules/user/hypridle.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, lib, pkgs, ... }: let kblight = "light -s sysfs/leds/asus::kbd_backlight"; in @@ -9,7 +9,7 @@ in settings = { general = { lock_cmd = "pidof hyprlock || hyprlock"; - before_sleep_cmd = "loginctl lock-session"; + before_sleep_cmd = "${lib.getExe pkgs.playerctl} pause; loginctl lock-session"; after_sleep_cmd = "hyprctl dispatch dpms on"; }; From 23fc6fe63793b63a4289c56b26a6169dfa24f7a7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 20:25:21 +1100 Subject: [PATCH 176/584] user/hyprlock: custom fingerprint message (removes parantheses) --- modules/user/hyprlock.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index 362f4ba..2311d52 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -9,6 +9,7 @@ auth = { fingerprint = { enabled = true; + ready_message = "Scan fingerprint to unlock"; }; }; background = { From ef22d9e96c432f9fa2fa64ad308061b942493872 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 21:15:09 +1100 Subject: [PATCH 177/584] system/kernel: set zram priority to 100 --- modules/system/kernel.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix index e4c5b6b..c0a1bcf 100644 --- a/modules/system/kernel.nix +++ b/modules/system/kernel.nix @@ -11,5 +11,8 @@ }; }; hardware.enableRedistributableFirmware = true; - zramSwap.enable = true; + zramSwap = { + enable = true; + priority = 100; + }; } From 79a6b783bca2f0d2d7c2ea2d262f4f9ae569a0f7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 21:16:44 +1100 Subject: [PATCH 178/584] anemone/kernel: hibernation setup --- hosts/anemone/kernel.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix index 7db481f..d313709 100644 --- a/hosts/anemone/kernel.nix +++ b/hosts/anemone/kernel.nix @@ -7,6 +7,7 @@ }; initrd = { availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + systemd.enable = true; verbose = false; }; kernelModules = [ "kvm-amd" ]; @@ -22,6 +23,11 @@ ]; }; + swapDevices = [{ + device = "/persist/swapfile"; + size = 16 * 1024; + }]; + powerManagement.cpufreq.min = 400000; hardware.cpu.amd.updateMicrocode = true; From d99a56cd958bddfcdb10fc44a44c4288790cfe59 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 22:02:49 +1100 Subject: [PATCH 179/584] anemone/kernel: use suspend-then-hibernate on lid close --- hosts/anemone/kernel.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix index d313709..97d19be 100644 --- a/hosts/anemone/kernel.nix +++ b/hosts/anemone/kernel.nix @@ -28,6 +28,13 @@ size = 16 * 1024; }]; + services.logind.lidSwitch = "suspend-then-hibernate"; + systemd.sleep.extraConfig = '' + HibernateDelaySec=14400 + SuspendEstimationSec=3600 + HibernateOnACPower=false + ''; + powerManagement.cpufreq.min = 400000; hardware.cpu.amd.updateMicrocode = true; From cc835da43c811a75323cdd0330680d87f3bd7d97 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 22:13:11 +1100 Subject: [PATCH 180/584] treewide: rename deprecated options --- modules/system/gui.nix | 4 ++-- modules/system/input.nix | 16 ++++++++-------- modules/system/packages.nix | 2 +- users/rin/wayland.nix | 2 +- users/rin/xorg.nix | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/system/gui.nix b/modules/system/gui.nix index f2e277c..128e850 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: { fonts = { - enableDefaultFonts = true; + enableDefaultPackages = true; fontconfig = { defaultFonts = { serif = [ "NotoSerif" ]; @@ -8,7 +8,7 @@ monospace = [ "CascadiaCode" ]; }; }; - fonts = with pkgs; [ + packages = with pkgs; [ material-symbols material-icons cascadia-code diff --git a/modules/system/input.nix b/modules/system/input.nix index 17e5416..6eaf550 100644 --- a/modules/system/input.nix +++ b/modules/system/input.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ ... }: { services.xserver = { displayManager = { xserverArgs = [ @@ -6,14 +6,14 @@ "-arinterval 15" ]; }; - libinput = { - enable = true; - mouse = { - accelSpeed = "0"; - accelProfile = "flat"; - }; + xkb.options = "caps:escape"; + }; + services.libinput = { + enable = true; + mouse = { + accelSpeed = "0"; + accelProfile = "flat"; }; - xkbOptions = "caps:escape"; }; console.useXkbConfig = true; } diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 3e34299..2f545a2 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -24,7 +24,7 @@ } // (if !enableGUI then {} else { programs.adb.enable = true; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.extraPackages = with pkgs; [ vaapiIntel vaapiVdpau libvdpau-va-gl diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix index df32eea..8c877f2 100644 --- a/users/rin/wayland.nix +++ b/users/rin/wayland.nix @@ -5,7 +5,7 @@ extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" "wireshark" ]; shell = pkgs.zsh; uid = 1001; - passwordFile = config.age.secrets.passwd.path; + hashedPasswordFile = config.age.secrets.passwd.path; }; home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { home = { diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix index 8668bb0..8a6b604 100644 --- a/users/rin/xorg.nix +++ b/users/rin/xorg.nix @@ -5,7 +5,7 @@ extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ]; shell = pkgs.zsh; uid = 1001; - passwordFile = config.age.secrets.passwd.path; + hashedPasswordFile = config.age.secrets.passwd.path; }; home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { home = { From 09041e2ec8106390004fd2aefbbdaafe6d6aa850 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:16:12 +1100 Subject: [PATCH 181/584] workflow: update, and add update script --- .github/workflows/autoupdate.yml | 48 ++++++++++++++++++++++++++++++++ .github/workflows/cachix.yml | 19 +++++-------- update.sh | 32 +++++++++++++++++++++ 3 files changed, 87 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/autoupdate.yml create mode 100755 update.sh diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml new file mode 100644 index 0000000..67158bd --- /dev/null +++ b/.github/workflows/autoupdate.yml @@ -0,0 +1,48 @@ +name: Auto update +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * *" + +jobs: + update: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Check for updates + id: check + run: | + local=$(cat flake.lock | jq ".nodes.nixpkgs.locked.rev") + remote=$(curl "https://api.github.com/repos/NixOS/nixpkgs/branches/nixos-unstable/commits?per_page=1" | jq ".commit.sha") + if [[ $local == $remote ]]; then + echo "skip=1" >> "$GITHUB_OUTPUT" + else + echo "skip=0" >> "$GITHUB_OUTPUT" + branch=$(TZ='Australia/Melbourne' date '+staging_auto/%Y%m%d') + echo "branch_name=${branch}" >> "$GITHUB_OUTPUT" + fi + + - name: Install nix + if: steps.check.outputs.skip == 0 + uses: cachix/install-nix-action@v31 + + - name: Configure git + if: steps.check.outputs.skip == 0 + run: | + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + + - name: Update + if: steps.check.outputs.skip == 0 + run: ./update.sh + + - name: Push + if: steps.check.outputs.skip == 0 + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: ${{ steps.check.outputs.branch_name }} diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index ed8dee2..bdc63ba 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -1,6 +1,7 @@ name: CI on: + push: workflow_dispatch: jobs: @@ -8,14 +9,11 @@ jobs: name: Check flake runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: cachix/install-nix-action@v17 - with: - install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.12.0pre20220930_89ca75c/install - extra_nix_config: experimental-features = nix-command flakes - - uses: cachix/cachix-action@v10 + - uses: cachix/install-nix-action@v31 + - uses: cachix/cachix-action@v14 with: name: lava authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' @@ -25,14 +23,11 @@ jobs: name: Build linux-lava for x86_64-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: cachix/install-nix-action@v17 - with: - install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.12.0pre20220930_89ca75c/install - extra_nix_config: experimental-features = nix-command flakes - - uses: cachix/cachix-action@v10 + - uses: cachix/install-nix-action@v31 + - uses: cachix/cachix-action@v14 with: name: lava authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..c9ce776 --- /dev/null +++ b/update.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c sh + +update_kernel() { + previous_ver=$(cat packages/linux-lava/sources.nix | grep "version =" | sed --expression='s/[^0-9.]//g') + kernel_ver=$(curl -s https://www.kernel.org/finger_banner | grep -m1 stable | awk '{print $NF}') + + if [ "$previous_ver" = "$kernel_ver" ]; then + return + fi + + kernel_major=$(cut -d '.' -f 1 <<< "$kernel_ver") + kernel_mmver=$(cut -d '.' -f 1,2 <<< "$kernel_ver") + + hash_mm=$(nix-prefetch-url "https://cdn.kernel.org/pub/linux/kernel/v${kernel_major}.x/linux-${kernel_mmver}.tar.xz") + hash_patch=$(nix-prefetch-url "https://cdn.kernel.org/pub/linux/kernel/v${kernel_major}.x/patch-${kernel_ver}.xz") + + sed -i "/version =/c\ version = \"${kernel_ver}\";" packages/linux-lava/sources.nix + sed -i "/kernelHash =/c\ kernelHash = \"${hash_mm}\";" packages/linux-lava/sources.nix + sed -i "/kernelPatchHash =/c\ kernelPatchHash = \"${hash_patch}\";" packages/linux-lava/sources.nix + + git add packages/linux-lava/sources.nix + git commit -m "packages/linux-lava: bump to ${kernel_ver}" +} + +bump_inputs() { + nix flake update + git add flake.lock + git commit -m "flake: bump inputs" +} + +bump_inputs +update_kernel From 21f6b46021893a44d4329d5473a789ee5ee4ba65 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:23:26 +1100 Subject: [PATCH 182/584] packages/spotify-adblock: change to cargoHash --- packages/spotify-adblock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/spotify-adblock/default.nix b/packages/spotify-adblock/default.nix index d076e87..89161f0 100644 --- a/packages/spotify-adblock/default.nix +++ b/packages/spotify-adblock/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage { version = "1.0"; src = inputs.spotify-adblock; - cargoSha256 = "sha256-yxumYGAMObgl1u6GlbEQOKOn1DWxXN8bbT7BjiWT96o="; + cargoHash = "sha256-yxumYGAMObgl1u6GlbEQOKOn1DWxXN8bbT7BjiWT96o="; patches = [ ./0002-allow-setting-config-from-environment-variable.patch ]; From faad8ea374765bbf0f71e8a0e9086a92b34fb860 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:32:16 +1100 Subject: [PATCH 183/584] workflow: use bash for update.sh i tried... --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index c9ce776..6167e8c 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c sh +#!/usr/bin/env -S nix shell 'nixpkgs#git' 'nixpkgs#curl' -c bash update_kernel() { previous_ver=$(cat packages/linux-lava/sources.nix | grep "version =" | sed --expression='s/[^0-9.]//g') From b6c10e73256e6e464873e67ac9ed517bc5f35677 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:48:59 +1100 Subject: [PATCH 184/584] workflow: use pat token to allow for workflow chaining --- .github/workflows/autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml index 67158bd..aeaef9b 100644 --- a/.github/workflows/autoupdate.yml +++ b/.github/workflows/autoupdate.yml @@ -44,5 +44,5 @@ jobs: if: steps.check.outputs.skip == 0 uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.PAT_TOKEN }} branch: ${{ steps.check.outputs.branch_name }} From 6eda948d6e41b4778d4087c25bb924c333c9258e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 17 Mar 2025 23:53:47 +1100 Subject: [PATCH 185/584] workflow: fixup pat token --- .github/workflows/autoupdate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml index aeaef9b..6ab9707 100644 --- a/.github/workflows/autoupdate.yml +++ b/.github/workflows/autoupdate.yml @@ -12,6 +12,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + token: ${{ secrets.PAT_TOKEN }} - name: Check for updates id: check From 4ce28a177c210fd1b4a6858b64078e573bf4e675 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 00:09:46 +1100 Subject: [PATCH 186/584] packages/linux-lava: don't use ccache by default --- flake.nix | 1 + overlays/linux-lava.nix | 7 +++---- packages/linux-lava/default.nix | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index b728f33..d785db3 100644 --- a/flake.nix +++ b/flake.nix @@ -80,6 +80,7 @@ in { inherit (pkgs.me) linux-lava spotify-adblock; + linux-lava-ccache = pkgs.me.linux-lava.override { useCcache = true; }; }; }; } diff --git a/overlays/linux-lava.nix b/overlays/linux-lava.nix index d83fb98..4cfa1a4 100644 --- a/overlays/linux-lava.nix +++ b/overlays/linux-lava.nix @@ -10,12 +10,11 @@ self: super: let echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags ''; }; - stdenv = super.ccacheStdenv.override { - stdenv = super.overrideCC llvmPackages.stdenv cc; - }; + stdenv = super.overrideCC llvmPackages.stdenv cc; + ccacheStdenv = super.ccacheStdenv.override { inherit stdenv; }; in { linuxLavaEnv = { - inherit llvmPackages clangVersion cc stdenv; + inherit llvmPackages clangVersion cc stdenv ccacheStdenv; }; rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override { clang = cc; diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index a4623d9..0287a51 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -3,6 +3,7 @@ , inputs , lib , linuxLavaEnv +, useCcache ? false , ... } @ args: @@ -10,7 +11,7 @@ let sources = callPackage ./sources.nix { inherit inputs; }; kernel = buildLinux (args // { inherit (sources) src kernelPatches; - inherit (linuxLavaEnv) stdenv; + stdenv = if useCcache then linuxLavaEnv.ccacheStdenv else linuxLavaEnv.stdenv; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; From c0b65cd53bded27b47dc62a73395ad8f80f7a00c Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 11:22:01 +1100 Subject: [PATCH 187/584] workflows/cachix: remove packages for more free build space --- .github/workflows/cachix.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index bdc63ba..2112f8d 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -23,6 +23,14 @@ jobs: name: Build linux-lava for x86_64-linux runs-on: ubuntu-latest steps: + # credits to https://github.com/easimon/maximize-build-space/issues/45 + - name: Remove unneeded packages to maximise build space + shell: bash + run: | + df -h + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + df -h - uses: actions/checkout@v4 with: fetch-depth: 0 From 7d8dbaef0d273bdb66c52740bcb45dcc867fbc5c Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 17:29:53 +1100 Subject: [PATCH 188/584] user/catppuccin: create specialisations for more streamlined switching --- modules/user/catppuccin.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index e941fc0..cf22df4 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -15,7 +15,7 @@ config = { catppuccin = { accent = "maroon"; - flavor = "mocha"; + flavor = lib.mkDefault "mocha"; kitty.enable = true; gtk.enable = true; hyprlock.enable = true; @@ -27,5 +27,10 @@ style.name = "kvantum"; platformTheme.name = "kvantum"; }; + + specialisation = { + light.configuration.catppuccin.flavor = "latte"; + dark.configuration.catppuccin.flavor = "mocha"; + }; }; } From 8818d8a1aab5d3035f643f0e47d2bd242db505e3 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 18:01:59 +1100 Subject: [PATCH 189/584] user/catppuccin: create specialisation switcher --- modules/user/catppuccin.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index cf22df4..f16d161 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -1,4 +1,4 @@ -{ config, inputs, lib, ... }: { +{ config, inputs, lib, pkgs, ... }: { imports = [ inputs.catppuccin.homeManagerModules.catppuccin ]; @@ -32,5 +32,27 @@ light.configuration.catppuccin.flavor = "latte"; dark.configuration.catppuccin.flavor = "mocha"; }; + + home.packages = [(pkgs.writeShellScriptBin "theme" '' + if [ "$1" != "dark" ] && [ "$1" != "light" ]; then + echo "invalid theme, valid values: [dark, light]" + exit 1 + fi + current="$HOME/.local/state/nix/profiles/home-manager" + cached="$HOME/.local/state/last-parent-specialisation" + if [ -d "$current/specialisation" ]; then + if [ -d "$cached" ]; then + rm -f "$cached" + fi + ln -sf "$(readlink -f $current)" "$cached" + fi + + if [ ! -d "$cached/specialisation" ]; then + echo "no specialisations found" + exit 1 + fi + + "$cached/specialisation/$1/activate" + '')]; }; } From a9e3d8421e4ec2bbad1edb6a459d73b14d7ce7f0 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 18:59:47 +1100 Subject: [PATCH 190/584] user/eww-wayland: use 'bad wifi' icon for missing net strength --- res/eww-wayland/eww.yuck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/eww-wayland/eww.yuck b/res/eww-wayland/eww.yuck index 288b89c..08b41ce 100644 --- a/res/eww-wayland/eww.yuck +++ b/res/eww-wayland/eww.yuck @@ -106,7 +106,7 @@ :space-evenly false (label :text { (lnetwork == "Disconnected") ? "" - : (network_strength == "") ? "" + : (network_strength == "") ? "" : (network_strength < 20) ? "" : (network_strength < 30) ? "" : (network_strength < 55) ? "" From e447adb0ce5b28842b00d149107dd5f985c44428 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 00:37:15 +1100 Subject: [PATCH 191/584] system/greetd_wayland: fix and source zshrc --- modules/system/greetd_wayland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index 9295b27..b441dfa 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -8,7 +8,7 @@ }; initial_session = { - command = "Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; + command = "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; user = "rin"; }; }; From 9ef4231da07e861b54817bd40afec9db3f02890b Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 18 Mar 2025 19:41:03 +1100 Subject: [PATCH 192/584] user/hyprlock: styling to match eww --- modules/user/hyprlock.nix | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/modules/user/hyprlock.nix b/modules/user/hyprlock.nix index 2311d52..c99fd84 100644 --- a/modules/user/hyprlock.nix +++ b/modules/user/hyprlock.nix @@ -16,6 +16,28 @@ monitor = ""; color = "$base"; }; + shape = [ + # Battery pill + { + monitor = ""; + size = "165, 65"; + color = "$crust"; + rounding = -1; + halign = "right"; + valign = "top"; + position = "-595,-10"; + } + # Time pill + { + monitor = ""; + size = "545, 65"; + color = "$crust"; + rounding = -1; + halign = "right"; + valign = "top"; + position = "-40,-10"; + } + ]; label = [ # Fingerprint icon { @@ -50,28 +72,39 @@ halign = "center"; valign = "center"; } - # Time + # Battery icon { monitor = ""; - text = "$TIME"; - color = "$text"; - font_size = 90; - font_family = "Open Sans"; - position = "-50, 0"; + text = ""; + color = "$accent"; + font_family = "Material Symbols Outlined"; + font_size = 27; + position = "-695, -20"; halign = "right"; valign = "top"; } - # Date + # Battery percentage { monitor = ""; - text = "cmd[update:43200000] date +'%A, %d %B %Y'"; + text = ''cmd[update:60000] echo "$(cat /sys/class/power_supply/BATT/capacity)%"''; color = "$text"; - font_size = 25; + font_size = 23; font_family = "Open Sans"; - position = "-50, -150"; + position = "-625, -20"; halign = "right"; valign = "top"; } + # Time and Date + { + monitor = ""; + color = "$text"; + font_family = "Open Sans"; + font_size = 23; + halign = "right"; + valign = "top"; + position = "-70, -20"; + text = ''cmd[update:1000] echo "$(date '+%A, %d %B %Y') $(date +%H:%M)$(date +:%S)"''; + } ]; input-field = { monitor = ""; From cd1b1da2fcf53bc733187bc222004733813c40ba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 13:11:41 +0000 Subject: [PATCH 193/584] flake: bump inputs --- flake.lock | 99 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 15c58b3..9a7f278 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ "catppuccin-palette": { "flake": false, "locked": { - "lastModified": 1741384489, - "narHash": "sha256-aIIwnSRJPQGaAwprYIRQ7Bp5MtpAhJS8Y007cBi0UsI=", + "lastModified": 1741520281, + "narHash": "sha256-SVF1fNFdvWxZq5vZWiA5WL1VT2qFxuZ5l0ncCwGiy4E=", "owner": "catppuccin", "repo": "palette", - "rev": "5bb0420add3b61e4c7e32549e014f06e03dfbc42", + "rev": "1d13846d736bdd96ca84e8406209c834ed9f8fc6", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -246,11 +246,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -331,11 +331,11 @@ ] }, "locked": { - "lastModified": 1739595404, - "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", + "lastModified": 1742014779, + "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "06519cec8fb32d219006da6eacd255504a9996af", + "rev": "524637ef84c177661690b924bf64a1ce18072a2c", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1741416850, - "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1741397765, - "narHash": "sha256-39zEl8F5HUOHdVaMeo+0jYs056w3vDmjdPhK/GzbqBU=", + "lastModified": 1741917569, + "narHash": "sha256-53CtqldMcB7R8Zx/xoLA+5ks6V2bGAGNHpJc4eGfUJc=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "1146bf0623e06befb70e2905f42f033351fbd19f", + "rev": "ea7470efe0d98ddccdee7d80bb422a5cbd8402ba", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741306000, - "narHash": "sha256-qaDw0TyUceZBLntPBOdd1642T/mBGMNtK5NBuv2gWiY=", + "lastModified": 1742205116, + "narHash": "sha256-u8Nq1jptSJnjwSvuWf/DIbNK++Kqnee9WPCgjEdz2H0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c1855b306b8eeb70118b3ba70471188a65e694e7", + "rev": "acd0f86437b2aeb4f5fab804d6addf951d03f48d", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1741302428, - "narHash": "sha256-zcgucpL/rgEC/IIii6R4NvmtJsYT+/F0ub1FQOWVv0Q=", + "lastModified": 1742165799, + "narHash": "sha256-cv6TDPYQe5mQUqY5p0KDXO1W4CPeJ5Jw277LeXoJW7c=", "owner": "neovim", "repo": "neovim", - "rev": "e46f07b1d2942c7b5c08fca9a4cac735ee2c0c71", + "rev": "502324a7b5f875ba61d65444cee34146f47c8f74", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741311896, - "narHash": "sha256-M/ppn20it9Ru2hoYoWIYzEWyTfBVxQiAQ7SvRws+luY=", + "lastModified": 1742176115, + "narHash": "sha256-gWZhY2Il5aGL2lxwwHaOQ1jPF4ZEW/eQLAPzqpO/xmQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0e78e723bdf5a13dc45f3a6b994715b871c3f650", + "rev": "7a5e1f3c5ed63bcf047103d1edd9276e77b4f684", "type": "github" }, "original": { @@ -551,14 +551,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1740872140, - "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { @@ -579,11 +582,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740791350, - "narHash": "sha256-igS2Z4tVw5W/x3lCZeeadt0vcU9fxtetZ/RyrqsCRQ0=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "199169a2135e6b864a888e89a2ace345703c025d", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -595,11 +598,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -635,11 +638,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1741416594, - "narHash": "sha256-nnnCrsOFm82/Oa6/ipbRQiy7K4f5o9bw4G6qGaYNGIU=", + "lastModified": 1742194526, + "narHash": "sha256-/VEZSYkaSZrKSkNDFb58njvQM/uf129t8Xr0/r4m0ac=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "ee8e149a4ff75ebd5f1b065831746ddaf0e480ec", + "rev": "d76a8b6e1b67fd3bcffec4a5d45fd9dee4dbbee8", "type": "github" }, "original": { From c826c7f3816f2f5de2100636f171c2efa2f2745e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 13:11:42 +0000 Subject: [PATCH 194/584] packages/linux-lava: bump to 6.13.7 --- packages/linux-lava/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index f084b98..fad3ed0 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.13.6"; + version = "6.13.7"; kernelHash = "0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7"; - kernelPatchHash = "11jbq6j7kz47p1291ys9b7v7jh7skaw1n4rj10ahl5m701lsk0vz"; + kernelPatchHash = "0akxqc8fdf6gkiy967crp7m1ikidd3rlhx804y3da1jl75dgqcrw"; mm = lib.versions.majorMinor version; tkgPatches = [ From bc793316b9701dc849fec37dd2a23aa929e59a61 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 00:35:57 +1100 Subject: [PATCH 195/584] system/greetd_wayland: fix autologin --- modules/system/greetd_wayland.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index b441dfa..367e74f 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -8,7 +8,9 @@ }; initial_session = { - command = "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\""; + command = "${pkgs.writeShellScript "launch.sh" '' + zsh -c "source $HOME/.config/zsh/.zshrc && Hyprland > \"$XDG_RUNTIME_DIR/Hyprland.out\"" + ''}"; user = "rin"; }; }; From 3c5d4ba108eff9ea47aaed9ffcf135c2eb955ba4 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 00:36:17 +1100 Subject: [PATCH 196/584] anemone/kernel: allow hibernation on ac --- hosts/anemone/kernel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix index 97d19be..45fa976 100644 --- a/hosts/anemone/kernel.nix +++ b/hosts/anemone/kernel.nix @@ -32,7 +32,7 @@ systemd.sleep.extraConfig = '' HibernateDelaySec=14400 SuspendEstimationSec=3600 - HibernateOnACPower=false + HibernateOnACPower=true ''; powerManagement.cpufreq.min = 400000; From f9de112a18005207853c2cbec6db8a7dd5908bf8 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 13:52:11 +1100 Subject: [PATCH 197/584] user/catppuccin: persist theme on reboot --- modules/user/catppuccin.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index f16d161..9cbac38 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -34,8 +34,19 @@ }; home.packages = [(pkgs.writeShellScriptBin "theme" '' - if [ "$1" != "dark" ] && [ "$1" != "light" ]; then - echo "invalid theme, valid values: [dark, light]" + last_path="$HOME/.local/state/last-theme" + target="$1" + if [ "$target" == "restore" ]; then + echo "restoring theme" + if [ ! -e "$last_path" ]; then + echo "no last theme found; assuming dark" + target="dark" + else + target=$(cat "$last_path" | tr -d "\n") + fi + fi + if [ "$target" != "dark" ] && [ "$target" != "light" ]; then + echo "invalid theme, valid values: [dark, light, restore]" exit 1 fi current="$HOME/.local/state/nix/profiles/home-manager" @@ -52,7 +63,9 @@ exit 1 fi - "$cached/specialisation/$1/activate" + "$cached/specialisation/$target/activate" + + echo "$target" > "$last_path" '')]; }; } From f6cc66d75ce098086c0096eefbf6f76d70253d1d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 13:53:06 +1100 Subject: [PATCH 198/584] user/catppuccin: remove kvantum --- modules/user/catppuccin.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 9cbac38..3679328 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -19,14 +19,8 @@ kitty.enable = true; gtk.enable = true; hyprlock.enable = true; - kvantum.enable = true; nvim.enable = true; }; - qt = { - enable = true; - style.name = "kvantum"; - platformTheme.name = "kvantum"; - }; specialisation = { light.configuration.catppuccin.flavor = "latte"; From 8cd8e9e3dd5a270847d5c19bf3a7e28ba565adb0 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 14:06:32 +1100 Subject: [PATCH 199/584] user/catppuccin: add get_last to theme script --- modules/user/catppuccin.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/user/catppuccin.nix b/modules/user/catppuccin.nix index 3679328..ece7f62 100644 --- a/modules/user/catppuccin.nix +++ b/modules/user/catppuccin.nix @@ -30,10 +30,20 @@ home.packages = [(pkgs.writeShellScriptBin "theme" '' last_path="$HOME/.local/state/last-theme" target="$1" + if [ "$target" == "get_last" ]; then + if [ ! -e "$last_path" ]; then + echo "no last theme found; assuming dark" >&2 + target="dark" + else + target=$(cat "$last_path" | tr -d "\n") + fi + echo "$target" + exit 0 + fi if [ "$target" == "restore" ]; then echo "restoring theme" if [ ! -e "$last_path" ]; then - echo "no last theme found; assuming dark" + echo "no last theme found; assuming dark" >&2 target="dark" else target=$(cat "$last_path" | tr -d "\n") From 54e802548851797b7a254aa9caacdf07948ebe03 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 19 Mar 2025 15:32:29 +1100 Subject: [PATCH 200/584] user/kitty: set window margin to 5 --- modules/user/kitty.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index 1ae7970..3018c85 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -11,6 +11,7 @@ enable_audio_bell = false; color5 = config.catppuccin.hexcolors.mauve; color13 = config.catppuccin.hexcolors.mauve; + window_margin_width = 5; }; }; } From 5f1b9b17ecf886af26d81c639f57486e1d674ac5 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 20 Mar 2025 21:54:10 +1100 Subject: [PATCH 201/584] user/spicetify: add custom css for nowplaying menu --- modules/user/spicetify.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index 998f9f6..f917968 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -8,7 +8,25 @@ in programs.spicetify = { enable = true; alwaysEnableDevTools = true; - theme = spicePkgs.themes.catppuccin; + theme = spicePkgs.themes.catppuccin // { + additionalCss = '' + /* Removes "About the artist" text in now playing menu */ + .main-nowPlayingView-sectionHeaderText { + display: none; + } + + /* Removes gradient in now playing menu */ + .main-nowPlayingView-contextItemInfo:before { + background: none; + } + + /* Removes gradient above artist image */ + /* https://stackoverflow.com/a/77015731 < this is so smart */ + .main-nowPlayingView-aboutArtistV2ImageContainer.main-nowPlayingView-aboutArtistV2Image { + background-size: 0% 0%, cover; + } + ''; + }; colorScheme = config.catppuccin.flavor; enabledSnippets = with spicePkgs.snippets; [ From 30a59b4be03472d20f1e21986b0f0478d28a274e Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Thu, 20 Mar 2025 22:28:12 +1100 Subject: [PATCH 202/584] user/spicetify: link spicetify to .local/bin when switching themes using home-manager specialisations, the user environment in /etc/profiles/per-user is not updated (managed by nixos), so we create a symlink here to force it to use the current hm config's spicetify (.local/bin has higher priority) this is a workaround at best, a hack at worst. should probably somehow make /etc/profiles irrelevant and use something else user-managed. --- modules/user/spicetify.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix index f917968..6249895 100644 --- a/modules/user/spicetify.nix +++ b/modules/user/spicetify.nix @@ -1,4 +1,4 @@ -{ config, inputs, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; in @@ -46,4 +46,6 @@ in volumePercentage ]; }; + + home.file.".local/bin/spotify".source = lib.getExe config.programs.spicetify.spicedSpotify; } From 94d72b25f01273cc8f2bd8410e0b17faba46bd11 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 21 Mar 2025 21:14:21 +1100 Subject: [PATCH 203/584] rin/packages: remove discord-canary --- users/rin/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 31454a5..163df9f 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -26,7 +26,6 @@ in { nodePackages_latest.pnpm ] ++ lib.optionals enableGUI [ - discord-canary drawio element-desktop eww From b89253931d3b16f04151f46f9c0b532a1e57aba7 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 11:12:55 +1100 Subject: [PATCH 204/584] user/kitty: add scrollback pager --- modules/user/kitty.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/user/kitty.nix b/modules/user/kitty.nix index 3018c85..ddc189a 100644 --- a/modules/user/kitty.nix +++ b/modules/user/kitty.nix @@ -12,6 +12,8 @@ color5 = config.catppuccin.hexcolors.mauve; color13 = config.catppuccin.hexcolors.mauve; window_margin_width = 5; + scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - " -c "autocmd VimEnter * normal G"''; + scrollback_pager_history_size = 2; }; }; } From 46c30b9d5d6737648ed839750878b14129881d44 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 00:23:58 +1100 Subject: [PATCH 205/584] treewide: prune out xorg --- hosts/hyacinth/default.nix | 2 -- hosts/hyacinth/kernel.nix | 8 ----- modules/default.nix | 4 --- modules/system/greetd_wayland.nix | 7 +--- modules/system/greetd_xorg.nix | 16 --------- modules/system/input.nix | 7 ---- modules/user/eww.nix | 8 ----- modules/user/rofi.nix | 7 ---- modules/user/sessionVariables.nix | 1 - modules/user/xorg.nix | 51 --------------------------- overlays/default.nix | 1 - overlays/patches/startx.patch | 13 ------- overlays/xinit.nix | 10 ------ scripts/xinitrc | 11 ------ users/rin/packages.nix | 2 -- users/rin/xorg.nix | 58 ------------------------------- 16 files changed, 1 insertion(+), 205 deletions(-) delete mode 100644 modules/system/greetd_xorg.nix delete mode 100644 modules/user/eww.nix delete mode 100644 modules/user/rofi.nix delete mode 100644 modules/user/xorg.nix delete mode 100644 overlays/patches/startx.patch delete mode 100644 overlays/xinit.nix delete mode 100755 scripts/xinitrc delete mode 100644 users/rin/xorg.nix diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index 9584f3a..ae0364a 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -20,7 +20,6 @@ ccache corectrl flatpak - #greetd_xorg greetd_wayland gui input @@ -39,7 +38,6 @@ ./networking.nix ./packages.nix - #../../users/rin/xorg.nix ../../users/rin/wayland.nix ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; diff --git a/hosts/hyacinth/kernel.nix b/hosts/hyacinth/kernel.nix index 7ce4a16..3e2d8d1 100644 --- a/hosts/hyacinth/kernel.nix +++ b/hosts/hyacinth/kernel.nix @@ -13,12 +13,4 @@ ]; kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); }; - services.xserver.xrandrHeads = [{ - output = "DP-1"; - primary = true; - monitorConfig = '' - Modeline "2560x1440_144.00" 808.75 2560 2792 3072 3584 1440 1443 1448 1568 -hsync +vsync - Option "PreferredMode" "2560x1440_144.00" - ''; - }]; } diff --git a/modules/default.nix b/modules/default.nix index 295a8db..36b8adc 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -33,7 +33,6 @@ in { ./system/corectrl.nix ./system/flatpak.nix ./system/greetd_wayland.nix - ./system/greetd_xorg.nix ./system/gui.nix ./system/home-manager.nix ./system/input.nix @@ -54,7 +53,6 @@ in { ./user/direnv.nix ./user/dunst.nix ./user/eww.nix - ./user/eww-wayland.nix ./user/git.nix ./user/gpg.nix ./user/hypridle.nix @@ -70,13 +68,11 @@ in { ./user/picom.nix ./user/polybar.nix ./user/rofi.nix - ./user/rofi-wayland.nix ./user/sessionVariables.nix ./user/spicetify.nix ./user/sxhkd.nix ./user/theming.nix ./user/xdg.nix - ./user/xorg.nix ./user/zsh.nix ]; } diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd_wayland.nix index 367e74f..ad4a2d6 100644 --- a/modules/system/greetd_wayland.nix +++ b/modules/system/greetd_wayland.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { services.greetd = { enable = true; settings = { @@ -15,9 +15,4 @@ }; }; }; - - services.xserver = { - autorun = false; - displayManager.startx.enable = true; - }; } diff --git a/modules/system/greetd_xorg.nix b/modules/system/greetd_xorg.nix deleted file mode 100644 index 2958926..0000000 --- a/modules/system/greetd_xorg.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, lib, ... }: { - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --asterisks --time --cmd 'zsh -c \"source $HOME/.config/zsh/.zshrc && startx\"'"; - user = "greeter"; - }; - }; - }; - - services.xserver = { - autorun = false; - displayManager.startx.enable = true; - }; -} diff --git a/modules/system/input.nix b/modules/system/input.nix index 6eaf550..2ef1eab 100644 --- a/modules/system/input.nix +++ b/modules/system/input.nix @@ -8,12 +8,5 @@ }; xkb.options = "caps:escape"; }; - services.libinput = { - enable = true; - mouse = { - accelSpeed = "0"; - accelProfile = "flat"; - }; - }; console.useXkbConfig = true; } diff --git a/modules/user/eww.nix b/modules/user/eww.nix deleted file mode 100644 index b0a8099..0000000 --- a/modules/user/eww.nix +++ /dev/null @@ -1,8 +0,0 @@ -# Depends on bspwm -{ pkgs, ... }: { - home.packages = with pkgs; [ xtitle ]; - programs.eww = { - enable = true; - configDir = ../../res/eww; - }; -} diff --git a/modules/user/rofi.nix b/modules/user/rofi.nix deleted file mode 100644 index 45fcc4d..0000000 --- a/modules/user/rofi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, inputs, ... }: { - programs.rofi = { - enable = true; - theme = "theme"; - }; - xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi; -} diff --git a/modules/user/sessionVariables.nix b/modules/user/sessionVariables.nix index ef9caab..60d8a81 100644 --- a/modules/user/sessionVariables.nix +++ b/modules/user/sessionVariables.nix @@ -22,7 +22,6 @@ NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; PUB_CACHE = "${config.xdg.cacheHome}/dart"; WGETRC = "${config.xdg.configHome}/wgetrc"; - XINITRC = "${config.xdg.configHome}/xorg/xinitrc"; WINEPREFIX = "${config.xdg.dataHome}/wine64"; WINEARCH = "win64"; diff --git a/modules/user/xorg.nix b/modules/user/xorg.nix deleted file mode 100644 index b8ba9da..0000000 --- a/modules/user/xorg.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, ... }: { - - xsession = { - enable = true; - profilePath = ".config/xorg/xprofile"; - scriptPath = ".config/xorg/xsession"; - }; - - xdg.configFile."xorg/xinitrc".source = ../../scripts/xinitrc; - xresources = { - path = "${config.xdg.configHome}/xorg/xresources"; - properties = { - # special - "*.foreground" = "#c5c8c6"; - "*.background" = "#1d1f21"; - "*.cursorColor" = "#c5c8c6"; - - # black - "*.color0" = "#1d1f21"; - "*.color8" = "#969896"; - - # red - "*.color1" = "#cc342b"; - "*.color9" = "#cc342b"; - - # green - "*.color2" = "#198844"; - "*.color10" = "#198844"; - - # yellow - "*.color3" = "#fba922"; - "*.color11" = "#fba922"; - - # blue - "*.color4" = "#3971ed"; - "*.color12" = "#3971ed"; - - # magenta - "*.color5" = "#a36ac7"; - "*.color13" = "#a36ac7"; - - # cyan - "*.color6" = "#3971ed"; - "*.color14" = "#3971ed"; - - # white - "*.color7" = "#c5c8c6"; - "*.color15" = "#ffffff"; - }; - }; -} diff --git a/overlays/default.nix b/overlays/default.nix index ff5bad1..1f34ee1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,5 +7,4 @@ builtins.map (path: import path) [ ./rofi.nix ./steam.nix ./utillinux.nix - ./xinit.nix ] diff --git a/overlays/patches/startx.patch b/overlays/patches/startx.patch deleted file mode 100644 index aba345e..0000000 --- a/overlays/patches/startx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/startx.cpp b/startx.cpp -index 125c398..296b29f 100644 ---- a/startx.cpp -+++ b/startx.cpp -@@ -270,7 +270,7 @@ if [ x"$enable_xauth" = x1 ] ; then - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile=$XAUTHORITY - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie diff --git a/overlays/xinit.nix b/overlays/xinit.nix deleted file mode 100644 index 6d0daed..0000000 --- a/overlays/xinit.nix +++ /dev/null @@ -1,10 +0,0 @@ -self: super: { - xorg = super.xorg // { - xinit = super.xorg.xinit.overrideAttrs (old: { - # Some info: - # - Make startx use $XAUTHORITY as server auth files instead of .serverauth.$$ - # - Make startx respect $XINITRC and $XSERVERRC - patches = (old.patches or []) ++ [ ./patches/startx.patch ]; - }); - }; -} diff --git a/scripts/xinitrc b/scripts/xinitrc deleted file mode 100755 index 44caff4..0000000 --- a/scripts/xinitrc +++ /dev/null @@ -1,11 +0,0 @@ -if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - eval $(dbus-launch --exit-with-session --sh-syntax) -fi -systemctl --user import-environment DISPLAY XAUTHORITY - -if command -v dbus-update-activation-environment > /dev/null 2>&1; then - dbus-update-activation-environment DISPLAY XAUTHORITY -fi - -xrdb ${XDG_CONFIG_HOME}/xorg/xresources -exec ${XDG_CONFIG_HOME}/xorg/xsession diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 163df9f..31e2213 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -58,8 +58,6 @@ in { vesktop virt-manager winetricks - xclip - xorg.xgamma zathura zenity diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix deleted file mode 100644 index 8a6b604..0000000 --- a/users/rin/xorg.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, lib, modules, pkgs, ... }: { - programs.zsh.enable = true; - users.users.rin = { - isNormalUser = true; - extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ]; - shell = pkgs.zsh; - uid = 1001; - hashedPasswordFile = config.age.secrets.passwd.path; - }; - home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { - home = { - username = "rin"; - homeDirectory = "/home/rin"; - stateVersion = "21.05"; - keyboard = null; # see https://github.com/nix-community/home-manager/issues/2219 - }; - - imports = with modules.user; [ - ./packages.nix - sessionVariables - - catppuccin - direnv - git - gpg - neovim - npm - pass - zsh - ] ++ lib.optionals enableGUI [ - theming - xdg - - kitty - mpv - obs - rofi - - picom - bspwm - sxhkd - xorg - dunst - eww - ]; - - services.mpris-proxy.enable = true; - - home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { - url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe"; - sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns"; - }; - home.file.".local/bin/osu" = { - executable = true; - source = ../../scripts/osu; - }; - }; -} From 2e74aa5f00f0b914f73b7177e57df81a6d84151d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 00:29:58 +1100 Subject: [PATCH 206/584] treewide: prune more old xorg configs, and rename wayland modules --- hosts/anemone/default.nix | 7 +- hosts/hyacinth/default.nix | 5 +- modules/default.nix | 8 +- .../system/{greetd_wayland.nix => greetd.nix} | 0 modules/system/gui.nix | 3 + modules/user/bspwm.nix | 19 -- modules/user/{eww-wayland.nix => eww.nix} | 0 modules/user/pass.nix | 6 - modules/user/picom.nix | 41 ----- modules/user/polybar.nix | 165 ------------------ modules/user/{rofi-wayland.nix => rofi.nix} | 0 modules/user/sessionVariables.nix | 1 - modules/user/sxhkd.nix | 65 ------- scripts/polybar.sh | 4 - users/rin/{wayland.nix => default.nix} | 4 +- 15 files changed, 10 insertions(+), 318 deletions(-) rename modules/system/{greetd_wayland.nix => greetd.nix} (100%) delete mode 100644 modules/user/bspwm.nix rename modules/user/{eww-wayland.nix => eww.nix} (100%) delete mode 100644 modules/user/pass.nix delete mode 100644 modules/user/picom.nix delete mode 100644 modules/user/polybar.nix rename modules/user/{rofi-wayland.nix => rofi.nix} (100%) delete mode 100644 modules/user/sxhkd.nix delete mode 100755 scripts/polybar.sh rename users/rin/{wayland.nix => default.nix} (97%) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index b29d535..34b1c03 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -17,7 +17,7 @@ ccache corectrl flatpak - greetd_wayland + greetd gui input kernel @@ -31,12 +31,9 @@ ./kernel.nix ./networking.nix - ../../users/rin/wayland.nix + ../../users/rin ]; - programs.hyprland.enable = true; - security.pam.services.hyprlock = {}; - # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index ae0364a..ea385b8 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -20,7 +20,7 @@ ccache corectrl flatpak - greetd_wayland + greetd gui input kernel @@ -38,10 +38,9 @@ ./networking.nix ./packages.nix - ../../users/rin/wayland.nix + ../../users/rin ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; - programs.hyprland.enable = true; systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp"; # For steam fhs-env diff --git a/modules/default.nix b/modules/default.nix index 36b8adc..7cd86ec 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -32,7 +32,7 @@ in { ./system/ccache.nix ./system/corectrl.nix ./system/flatpak.nix - ./system/greetd_wayland.nix + ./system/greetd.nix ./system/gui.nix ./system/home-manager.nix ./system/input.nix @@ -48,7 +48,6 @@ in { ./system/wireguard.nix ]; user = mkAttrsFromPaths [ - ./user/bspwm.nix ./user/catppuccin.nix ./user/direnv.nix ./user/dunst.nix @@ -63,14 +62,9 @@ in { ./user/neovim-minimal.nix ./user/npm.nix ./user/obs.nix - ./user/packages-rin.nix - ./user/pass.nix - ./user/picom.nix - ./user/polybar.nix ./user/rofi.nix ./user/sessionVariables.nix ./user/spicetify.nix - ./user/sxhkd.nix ./user/theming.nix ./user/xdg.nix ./user/zsh.nix diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd.nix similarity index 100% rename from modules/system/greetd_wayland.nix rename to modules/system/greetd.nix diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 128e850..e9443ab 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -26,4 +26,7 @@ displayManager.lightdm.enable = lib.mkForce false; desktopManager.xterm.enable = false; }; + + programs.hyprland.enable = true; + security.pam.services.hyprlock = {}; } diff --git a/modules/user/bspwm.nix b/modules/user/bspwm.nix deleted file mode 100644 index 13b2941..0000000 --- a/modules/user/bspwm.nix +++ /dev/null @@ -1,19 +0,0 @@ -# Depends on eww -{ config, pkgs, ... }: { - xsession.windowManager.bspwm = { - enable = true; - monitors = { "DP-1" = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"]; }; - settings = { - window_gap = 10; - border_width = 0; - split_ratio = 0.5; - top_padding = 0; - }; - extraConfig = '' - ${pkgs.feh}/bin/feh --no-fehbg --bg-fill ~/Pictures/Wallpapers/current - - ${pkgs.procps}/bin/pkill -SIGINT eww - ${pkgs.eww}/bin/eww open linebar - ''; - }; -} diff --git a/modules/user/eww-wayland.nix b/modules/user/eww.nix similarity index 100% rename from modules/user/eww-wayland.nix rename to modules/user/eww.nix diff --git a/modules/user/pass.nix b/modules/user/pass.nix deleted file mode 100644 index f1d4c3d..0000000 --- a/modules/user/pass.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - programs.password-store = { - enable = true; - package = pkgs.pass.withExtensions (exts: with exts; [ pass-import pass-otp ]); - }; -} diff --git a/modules/user/picom.nix b/modules/user/picom.nix deleted file mode 100644 index 7c7d5e7..0000000 --- a/modules/user/picom.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, ... }: { - services.picom = { - enable = true; - - # blur = true; - # blurExclude = [ - # (builtins.concatStringsSep " && " [ - # "class_g != 'Alacritty'" - # "class_g != 'kitty'" - # #"class_g != 'Polybar'" - # "class_g != 'URxvt'" - # ]) - # ]; - fade = true; - fadeDelta = 5; - fadeSteps = [ 0.05 0.05 ]; - - opacityRules = [ - "80:class_g = 'Alacritty' && !focused" - "95:class_g = 'kitty' && !focused" - ]; - vSync = true; - - settings = { - glx-no-stencil = true; - glx-copy-from-front = false; - glx-no-rebind-pixmap = true; - # https://github.com/yshui/picom/issues/578 - glx-use-copysubbuffer-mesa = false; - use-damage = true; - - detect-transient = true; - detect-client-leader = true; - detect-client-opacity = true; - detect-rounded-corners = true; - use-ewmh-active-win = true; - mark-wmwin-focused = true; - mark-ovredir-focused = true; - }; - }; -} diff --git a/modules/user/polybar.nix b/modules/user/polybar.nix deleted file mode 100644 index ce71f38..0000000 --- a/modules/user/polybar.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ config, ... }: { - services.polybar = - let - colours = { - background1 = "#1a1b26"; - background2 = "#9d7cd8"; - accent = "#c0caf5"; - foreground2 = "#1a1b26"; - foreground2trans = "#cc1a1b26"; - }; - in { - enable = true; - script = builtins.readFile ../../scripts/polybar.sh; - settings = { - "bar/scroller" = { - monitor = "DP-1"; - width = "100%"; - height = 1; - background = colours.background1; - spacing = 2; - override-redirect = true; - - modules.center = "workspaces-stub"; - scroll = { - up = "#workspaces-stub.prev"; - down = "#workspaces-stub.next"; - }; - }; - - "bar/top" = { - monitor = "DP-1"; - width = "100%"; - height = 29; - background = colours.background1; - foreground = "#fff"; - offset-y = 3; - - spacing = 2; - padding = { - left = 5; - right = 5; - bottom = 5; - }; - override-redirect = true; - wm-restack = "bspwm"; - - font = [ - "NotoSans:style=SemiBold:size=11:antialias=true;2" - "NotoSans:size=11:antialias=true;2" - "MaterialIcons:size=17:antialias=true;6" - "Iosevka:style=Medium:antialias=false:size=19;4" - - "HanaMinA:size=9.8;1" - "HanaMinB:size=9.8;1" - ]; - - modules = { - left = "left workspaces right"; - center = "title"; - right = "left datetime right"; - }; - - enable-ipc = true; - scroll = { - up = "#workspaces.prev"; - down = "#workspaces.next"; - }; - }; - - "module/left" = { - type = "custom/text"; - - content = { - text = "%{T4}"; - background = colours.background1; - foreground = colours.background2; - }; - }; - - "module/right" = { - type = "custom/text"; - - content = { - text = "%{T4}"; - background = colours.background1; - foreground = colours.background2; - }; - }; - - "module/workspaces" = { - type = "internal/bspwm"; - - pin-workspaces = true; - enable-click = true; - enable-scroll = false; - reverse-scroll = false; - - label = { - monitor = ""; - focused = { - text = "%{T3}"; # ef4a - background = colours.background2; - foreground = colours.accent; - }; - occupied = { - text = "%{T3}"; # e837 - background = colours.background2; - foreground = colours.background1; - }; - empty = { - text = "%{T3}"; # ef4a - background = colours.background2; - foreground = colours.background1; - }; - urgent = { - text = "%{T3}"; # e837 - background = colours.background2; - foreground = colours.background1; - }; - - separator = { - text = " "; - background = colours.background2; - padding = "0"; - }; - }; - }; - - "module/workspaces-stub" = { - type = "internal/bspwm"; - pin-workspaces = true; - enable-click = false; - enable-scroll = false; - reverse-scroll = false; - label = { - monitor = ""; - focused = ""; - occupied = ""; - empty = ""; - urgent = ""; - separator = ""; - }; - }; - - "module/title" = { - type = "internal/xwindow"; - format = { - text = "%{T1}