From 9272749b6f495bb9b06e9fcb620769fe11402efd Mon Sep 17 00:00:00 2001 From: stubdesu Date: Sun, 14 Jan 2024 20:58:52 +0700 Subject: [PATCH 01/24] 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 02/24] 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 03/24] 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 04/24] 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 05/24] 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 06/24] 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 07/24] 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 08/24] 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 09/24] 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 10/24] 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 11/24] 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 12/24] 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 13/24] 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 14/24] 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 15/24] 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 16/24] 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 17/24] 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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 23/24] 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 24/24] 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: {