From 684b9a41cc6fd4b344d4ef5ba029ce7e38c69fb9 Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Sat, 1 Jun 2024 16:57:00 +0530 Subject: [PATCH] home: move around things a bit Signed-off-by: Amneesh Singh --- home/{modules => common}/laptop.nix | 2 +- home/{modules => common}/programs.nix | 0 home/{modules => common}/zsh.nix | 4 ++-- home/default.nix | 18 +++++++------- home/natto/default.nix | 4 ++-- home/natto/eww/default.nix | 18 ++++++++++++-- home/natto/games.nix | 14 +++++++++++ home/natto/music.nix | 13 ++++++---- home/natto/pkgs.nix | 33 ++++---------------------- home/natto/secrets/gitconfig.age | Bin 1215 -> 1280 bytes home/natto/stuff.nix | 1 - home/natto/wayland.nix | 4 ++++ 12 files changed, 61 insertions(+), 50 deletions(-) rename home/{modules => common}/laptop.nix (79%) rename home/{modules => common}/programs.nix (100%) rename home/{modules => common}/zsh.nix (89%) create mode 100644 home/natto/games.nix diff --git a/home/modules/laptop.nix b/home/common/laptop.nix similarity index 79% rename from home/modules/laptop.nix rename to home/common/laptop.nix index fd4b710..604dcdb 100644 --- a/home/modules/laptop.nix +++ b/home/common/laptop.nix @@ -1,6 +1,6 @@ { lib, ... }: { - options.natto.laptop = lib.mkOption { + options.isLaptop = lib.mkOption { type = lib.types.bool; default = false; example = true; diff --git a/home/modules/programs.nix b/home/common/programs.nix similarity index 100% rename from home/modules/programs.nix rename to home/common/programs.nix diff --git a/home/modules/zsh.nix b/home/common/zsh.nix similarity index 89% rename from home/modules/zsh.nix rename to home/common/zsh.nix index 6b62cba..af7c411 100644 --- a/home/modules/zsh.nix +++ b/home/common/zsh.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { programs.zsh = { enable = true; @@ -8,7 +8,7 @@ size = 30000; save = size; }; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; syntaxHighlighting.enable = true; prezto = { diff --git a/home/default.nix b/home/default.nix index 83eb9e7..17a038b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,8 +1,8 @@ { self, inputs, globalArgs, ... }: let - commonModules = [ - ./modules/zsh.nix - ./modules/programs.nix + common = [ + ./common/zsh.nix + ./common/programs.nix globalArgs ]; @@ -22,15 +22,15 @@ in nattoModules = [ ./natto - ./modules/laptop.nix + ./common/laptop.nix inputs.hyprland.homeManagerModules.default inputs.agenix.homeManagerModules.default - ] ++ commonModules; + ] ++ common; in { natto-laptop = inputs.home-manager.lib.homeManagerConfiguration { modules = nattoModules ++ [ - { natto.laptop = true; } + { isLaptop = true; } ]; pkgs = mkPkgs "x86_64-linux"; }; @@ -50,7 +50,7 @@ in username = "spark"; stateVersion = "23.05"; }; - }] ++ commonModules; + }] ++ common; pkgs = self.legacyPackages.aarch64-linux; }; @@ -61,7 +61,7 @@ in username = "bat"; stateVersion = "23.05"; }; - }] ++ commonModules; + }] ++ common; pkgs = self.legacyPackages.x86_64-linux; }; @@ -72,7 +72,7 @@ in username = "spin"; stateVersion = "23.05"; }; - }] ++ commonModules; + }] ++ common; pkgs = self.legacyPackages.x86_64-linux; }; }; diff --git a/home/natto/default.nix b/home/natto/default.nix index e0ae6ad..b8418b0 100644 --- a/home/natto/default.nix +++ b/home/natto/default.nix @@ -9,16 +9,16 @@ imports = [ ./email.nix ./programs.nix - ./eww # ./xsession.nix ./wayland.nix ./pkgs.nix ./stuff.nix - ./emacs.nix + #./emacs.nix ./gtk.nix ./dunst.nix ./git.nix ./music.nix ./zsh.nix + ./games.nix ]; } diff --git a/home/natto/eww/default.nix b/home/natto/eww/default.nix index 6f776ca..b6de378 100644 --- a/home/natto/eww/default.nix +++ b/home/natto/eww/default.nix @@ -2,7 +2,7 @@ { programs.eww = { enable = true; - package = pkgs.eww-wayland; + package = pkgs.eww; configDir = lib.cleanSourceWith { src = ./.; filter = name: _: @@ -22,8 +22,22 @@ let deps = [ config.programs.eww.package + ] ++ lib.optional + config.wayland.windowManager.hyprland.enable config.wayland.windowManager.hyprland.package - ] ++ (import ./bar pkgs); + ++ (with pkgs; [ + coreutils + bash + jq + less + gawk + socat + playerctl + networkmanager + iwgtk + wireplumber + ]) + ++ lib.optional config.laptop pkgs.light; in { Type = "simple"; diff --git a/home/natto/games.nix b/home/natto/games.nix new file mode 100644 index 0000000..7818efe --- /dev/null +++ b/home/natto/games.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + # Wine and games and stuff + wineWowPackages.stable + steam + winetricks + # lutris + # inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin + ]; + + programs.mangohud.enable = true; +} + diff --git a/home/natto/music.nix b/home/natto/music.nix index aed732d..0878717 100644 --- a/home/natto/music.nix +++ b/home/natto/music.nix @@ -18,7 +18,8 @@ in }; mpd-discord-rpc = { - inherit (mpd) enable; + # inherit (mpd) enable; + enable = false; settings = { id = 1039532008424099850; # dont really care format = { @@ -37,8 +38,6 @@ in host = "localhost"; }; }; - - playerctld.enable = true; }; systemd.user.services = { @@ -68,12 +67,12 @@ in home = { packages = with pkgs; [ + playerctl + mpc_cli (ncmpcpp.override { visualizerSupport = true; clockSupport = true; }) - mpc_cli - playerctl (tauon.override { withDiscordRPC = true; }) @@ -83,6 +82,10 @@ in source = ./config/ncmpcpp/config; target = "${config.xdg.configHome}/ncmpcpp/config"; }; + + sessionVariables = { + # LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]); + }; }; age.secrets.mpdasrc = { diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix index 7a5b846..f3d8c25 100644 --- a/home/natto/pkgs.nix +++ b/home/natto/pkgs.nix @@ -1,7 +1,6 @@ -{ config, flake, inputs, pkgs, ... }: +{ flake, pkgs, config, ... }: { home.packages = with pkgs; [ - # A/V, codec and media stuff ffmpeg-full wireplumber @@ -18,20 +17,12 @@ p7zip unrar vim - jmtpfs - (flake.packages.${pkgs.system}.customscripts) - translate-shell - powertop + (flake.packages.${system}.customscripts) cachix - undervolt - w3m steam-run # GUI utils slack - (discord.override { - nss = nss_latest; - }) webcord (xfce.thunar.override { thunarPlugins = with xfce; [ @@ -44,21 +35,9 @@ xfce.tumbler qbittorrent hexchat - luajit dunst - authy gnome.zenity - # Wine and games and stuff - lutris - wineWowPackages.stable - steam - lutris - winetricks - flake.packages.${pkgs.system}.tlauncher - mangohud - # inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin - # Programming and dev stuff (texlive.combine { inherit (texlive) @@ -83,16 +62,14 @@ tcolorbox; }) python3Packages.pygments - inform7 - ghc - nodejs - rust-bin.nightly.latest.default - openjdk # Misc anki tor-browser-bundle-bin mailcap libsForQt5.qtstyleplugins + ] ++ lib.optionals config.isLaptop [ + powertop + undervolt ]; } diff --git a/home/natto/secrets/gitconfig.age b/home/natto/secrets/gitconfig.age index a4a565a86e1926f537031abfa895ddd2431483df..7aa9a161d58c1c646701a5bf8552d39d06077170 100644 GIT binary patch delta 1252 zcmdnb*}yeHr{1-sB(c;j*rz1RKOoIVKPkV|wA|D*)!VQtAT+`++dZ(d(y=5lH9I-e zlgqcv*W4$x(m5=s)HTA;wAjek$T!=?-?Azr-#^i(ytK+BJgUeuH!<8Xn@iVDp}06h zx2QN#At%q<*e{(crLw#*G~KT(#3jlzJ$FMvg%Fx+0)3LlXsie%u-8{g>F~zLN z$2%p*E7d#G$=5O?m#e}f#3w2}HPWceJ19LfyWTB1DBsM?FeD1$SKhys<6~N$=ouy$UD@-B}qSBJ2;!m*)TDwu(H4}$Im^$EweZ)J;x`wBH2GD zs5CMxKds0&(mCJBxunF<*)lUKBf~Gs(#UH@P6F zyxt(RP(Lriqr${Hq_iY5xj^65qp-v>GSRZaEWOG*-6OZaJJ`HRKhVppqA`N0W)fH@N(i5~4 zH6j)C^>u8^xXe6D0#fqAgK{l=y`2K{y!7=8GLyX0_4D%bE&Yw1(#tKpA`DVI$|Ebi zvz$FF3i7pcynPD7oP3IkO}yNTO}LDcJi-hrQ*x5>i+oce)46nYbrrHw0*fr_eJU$_ zT$4-7oFh}6%mZ>=^P{rNT@v*Rvob4^iaiTTEelP}^pm;%6!A?Ia*oK&)h|1redv+2 z^G4$d0{Y%g$^Z1G#XFYXFPGU9rGp zR*$dsQ?*0B+BPkn@qF+575Wcf8P(OT&s_ep>MO^V9hbEfESJVkzU&sgR&u4{IhkOS z|JvGSOe-g9vQ(RY&kmg2ny&Km`J7WSYDdxy{s|13DMbfW*Pr^*FhQ$6g?zV1rj`D3!fRU^@z>rZRO3YnO2#=A}H6jyxt(qG$bS})W|C-&nPR)E88nG z%Os;P$UCwi(!-_7y`ZpMJHS2NJ+Q#tpUX+x*DtrSFfq^2EV(i$$tf@`Ej!!8(Ins7 z!X>CcKiEIW%rhk~upluzJlvuv!#Kdi!=%D7L)+Xlpv1@2z=A8V!ZklEJS{oV(J?F} z(9*R$puRZK(=0H^FwMZSu)y2PFx(GoZ-PJyAa~!lxiN+|o3O zD?2ODFgMq-EV0lzTsz0ov%owk$T6=dtk@$jDmBEiJSo&W!qF$#D8M)?FDS*sxzHoZ z(XZ6p+$=INBE#J;l`GB6vbZwE%(cLvDBM5Cv_8)_xiTO{JGV02FW4v8Qa>coFuXiC z%^=9p&pb6mJ0q(k+`!l<&CMs%u*$V4-`A0=+|somG1V}vASo}a*rm)n!^1NqIKr|h z)6lJ;FxacmJ=oo%v?9FJwbVb-!zC>uEzK>%*eB52G0HJB&n?x9D=)7kqR82}($Y)Y zyWYg#CpauDHz~-%DA_qV)U;ANpei`WKQ&0d&^)*-GSV#E!qLmm$22?F!m=R0GSJe| zIfpAh!!*@2Gd!=n)G*Po$j8kr&$PnGIiuXs#or`2JgXwZ#UjJBz{0}9Nju8eDX1vJ z-O$xB)H^WTJjgpZ*u{hklswez^lDt{l>*gu(~D9Qi&GV{YSa?B%>66f0z%46vvVv{ ze6-!lEFy~YGF^(bJ$!Q=!;`$+&5R9vBeb*igUusT5({&*i;NTF2&2L}HTlukD6=D)&i# z3^bNn?Q>XJ&*HnQ$ko@+-yBd)pTRLT#Mb=p`MdXfj+_j*+`%Qx|612L`w!#n{QcK+ z_+BP`JhEg;uH*(DrWeh6Nk10V@qIYs;aH#DI;Ca4UHIAG#fzubt>t*aCUvpt^^3!W zlUetj{!**;-<`3_X-S#KzQE_sQGjC zua2uwisP&r)~yzbaU0aPo>OlT+VOD3-rSo3veAcM%&Bh^7h|oP`yfa>FXh3l%3z(^ zKa!7B>aYAx7HaIdSFAt1?Wwr$ZXtQ*T8X@$`89v!o!JY%Ce8Kp{t)tRe(G07HkKzz zn~DPUgFGG;Bv&}@@6+=L5Z`&zQvUPdWgT17OSPOoJrg^p)6V)h^40V;=DQ{()Xfe! zQv34B`42BVmVI67-eLcY)jc!3Vzc?OhcP)ko6;Hu7yg#nc%|KL$DJ#=!KJ;Xvpr^6 S-CSsD`#s_*^P9`p&H?}%yu^h7 diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix index 60dd4e5..454617d 100644 --- a/home/natto/stuff.nix +++ b/home/natto/stuff.nix @@ -19,7 +19,6 @@ }; sessionVariables = { - LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]); QT_X11_NO_MITSHM = "1"; HM_CONF_DIR = "/etc/nixos"; QT_QPA_PLATFORMTHEME = "gtk2"; diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix index 115f787..dbf94d2 100644 --- a/home/natto/wayland.nix +++ b/home/natto/wayland.nix @@ -1,5 +1,9 @@ { pkgs, config, conf, inputs, ... }: { + imports = [ + # ./eww + ]; + wayland = { windowManager = { sway = {