From 1f447a4b56643a59693c365d9b822c4dc84be87c Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sun, 24 Sep 2023 21:56:38 +0200 Subject: [PATCH] feat: switch apache to sway --- configuration.nix | 40 ++---- flake.nix | 1 + greetd.nix | 19 +++ home-manager/i3/default.nix | 136 ------------------ .../i3/wallpapers/nix-wallpaper-dracula.png | Bin 26003 -> 0 bytes home-manager/i3/workspaces/workspace-1.json | 10 -- home-manager/i3/workspaces/workspace-2.json | 10 -- home-manager/i3/workspaces/workspace-4.json | 10 -- home-manager/i3/workspaces/workspace-5.json | 10 -- home-manager/kitty.nix | 2 +- home-manager/rofi.nix | 13 -- home-manager/sway/default.nix | 71 +++++++++ home-manager/{i3 => sway}/i3status-rust.nix | 0 home-mandlm.nix | 3 +- machines/apache/configuration.nix | 2 +- 15 files changed, 105 insertions(+), 222 deletions(-) create mode 100644 greetd.nix delete mode 100644 home-manager/i3/default.nix delete mode 100644 home-manager/i3/wallpapers/nix-wallpaper-dracula.png delete mode 100644 home-manager/i3/workspaces/workspace-1.json delete mode 100644 home-manager/i3/workspaces/workspace-2.json delete mode 100644 home-manager/i3/workspaces/workspace-4.json delete mode 100644 home-manager/i3/workspaces/workspace-5.json delete mode 100644 home-manager/rofi.nix create mode 100644 home-manager/sway/default.nix rename home-manager/{i3 => sway}/i3status-rust.nix (100%) diff --git a/configuration.nix b/configuration.nix index 531c6e9..690358d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -43,31 +43,6 @@ zsh.enable = true; }; - services.xserver = { - enable = true; - windowManager.i3.enable = true; - - layout = "de"; - xkbVariant = "nodeadkeys"; - xkbModel = "pc105"; - - libinput = { - enable = true; - touchpad = { - horizontalScrolling = false; - naturalScrolling = true; - }; - }; - - displayManager = { - defaultSession = "none+i3"; - autoLogin = { - enable = true; - user = "mandlm"; - }; - }; - }; - virtualisation.docker.enable = true; time.timeZone = "Europe/Berlin"; @@ -82,15 +57,22 @@ fonts.fonts = with pkgs; [ (nerdfonts.override { fonts = [ "DejaVuSansMono" "FiraCode" ]; }) font-awesome + dejavu_fonts ]; - hardware.pulseaudio.enable = true; + hardware = { + pulseaudio.enable = true; - hardware.sane = { - enable = true; - extraBackends = [ pkgs.sane-airscan ]; + opengl.enable = true; + + sane = { + enable = true; + extraBackends = [ pkgs.sane-airscan ]; + }; }; + security.polkit.enable = true; + environment.systemPackages = with pkgs; [ neovim git diff --git a/flake.nix b/flake.nix index 903ce6d..e63201e 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,7 @@ system = "x86_64-linux"; modules = [ ./configuration.nix + ./greetd.nix ./users.nix ./machines/apache/configuration.nix ./machines/apache/hardware-configuration.nix diff --git a/greetd.nix b/greetd.nix new file mode 100644 index 0000000..564d9e6 --- /dev/null +++ b/greetd.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: +{ + services.greetd = { + enable = true; + settings = { + default_session.command = '' + ${pkgs.greetd.tuigreet}/bin/tuigreet \ + --time \ + --asterisks \ + --user-menu \ + --cmd sway + ''; + }; + }; + + environment.etc."greetd/environments".text = '' + sway + ''; +} diff --git a/home-manager/i3/default.nix b/home-manager/i3/default.nix deleted file mode 100644 index 9a93754..0000000 --- a/home-manager/i3/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ config, lib, pkgs, user, ... }: - -let - cfg = config.xsession.windowManager.i3; - font.name = "DejaVu Sans Mono"; - font.size = 12.0; -in -{ - imports = [ - ./i3status-rust.nix - ]; - - home.file = { - workspaces = { - source = ./workspaces; - target = ".config/i3/workspaces"; - recursive = true; - }; - wallpapers = { - source = ./wallpapers; - target = ".config/i3/wallpapers"; - recursive = true; - }; - }; - - xsession.windowManager.i3 = { - enable = true; - - config = { - modifier = "Mod4"; - terminal = "${pkgs.kitty}/bin/kitty"; - - fonts = { - names = [ font.name ]; - size = font.size; - }; - - window = { - titlebar = false; - border = 0; - }; - - floating = { - titlebar = false; - border = 0; - }; - - menu = "${pkgs.rofi}/bin/rofi -show drun"; - - bars = [{ - mode = "hide"; - position = "top"; - statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml"; - - fonts = { - names = [ font.name ]; - size = font.size * 1.1; - }; - }]; - - defaultWorkspace = "workspace number 1"; - - keybindings = lib.mkOptionDefault { - "${cfg.config.modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\""; - "${cfg.config.modifier}+Shift+s" = "exec flameshot gui"; - }; - - startup = [ - { command = "i3-msg 'workspace 1; append_layout ~/.config/i3/workspaces/workspace-1.json'"; } - { command = "i3-msg 'workspace 2; append_layout ~/.config/i3/workspaces/workspace-2.json'"; } - { command = "i3-msg 'workspace 4; append_layout ~/.config/i3/workspaces/workspace-4.json'"; } - { command = "i3-msg 'workspace 5; append_layout ~/.config/i3/workspaces/workspace-5.json'"; } - { command = "kitty"; notification = false; } - { command = "firefox"; notification = false; } - { command = "element-desktop"; notification = false; } - { command = "keepassxc"; notification = false; } - { command = "nextcloud"; notification = false; } - { command = "thunderbird"; notification = false; } - ]; - - assigns = { - "6" = [{ class = "^\.zoom $"; }]; - }; - }; - }; - - services = { - betterlockscreen = { - enable = true; - arguments = [ "--update /home/mandlm/.config/i3/wallpapers/nix-wallpaper-dracula.png" ]; - }; - - flameshot = { - enable = true; - settings = { - General = { - showStartupLaunchMessage = false; - }; - }; - }; - - unclutter.enable = true; - - dunst = { - enable = true; - settings = { - global = { - follow = "keyboard"; - font = "DejaVu Sans Mono 11"; - frame_width = 1; - }; - - urgency_low = { - frame_color = "#268bd2"; - foreground = "#eee8d5"; - background = "#002b36"; - timeout = 4; - }; - - urgency_normal = { - frame_color = "#859900"; - foreground = "#eee8d5"; - background = "#002b36"; - timeout = 6; - }; - - urgency_critical = { - frame_color = "#dc322f"; - foreground = "#eee8d5"; - background = "#002b36"; - timeout = 8; - }; - }; - }; - }; -} diff --git a/home-manager/i3/wallpapers/nix-wallpaper-dracula.png b/home-manager/i3/wallpapers/nix-wallpaper-dracula.png deleted file mode 100644 index 8e439ac59f7e94b222780c3a25eb30932a6a369f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26003 zcmeFZ`9GBH|2{tLN};=j5^{T$5K{sF03;xBi%;Y5aOF-a5QyjD#A-wqXchn~~!cxOT#C|RuO&lc5hIDYfx`I()O(N*QTR-wAIzJ}jM z?DH)57qy#Y4``LYTRUgi5PMmwwe1eK=De z=}559TmQ=*CR^Bk_4h?z+xYm0PF5!|6;2;>ClmHT%C6 zJo+wH$jA38(&UkwGi6AriQ7<}rc(dqsET7suW)72O4GS;yUX&&-tU8}+yz zTPiy~xp|_u|G|#{iOrusPW1f!v;L{d^mkqP`M7My_AMA1)%Q(Im+1QJe7WE0;TumP z0^7RZyHDz#{+Vjkbj-O45yf~Z{Pj~#NKyQU&xwM!5#|0*_l!#~s#I4Y&Ay)?o;E%F zgPd_ysK!)Hzg1D$RQlF6xZB(b{KW?Gucxxt64^V62QKBz`99n_%AWqB&Ny4?^MLr) zIFeE%w|c4QZL;R>U7aK6O%yu3uKs-PPBF7Zy2xnMnOWUWI8f|`S#-@1X$^boa#dL8 z626~L1ht-maMf2|^&O3N?LW@bHfOI?6txhY&;uQlLEND z6*IkW)T}MV7tshOr8o_DYLCD_=5L($ifA|;pIGgXxUxI{*gNv z()dY1@Tm2%($7PVN4DEv?!PQqXmy&OheP(Ai5&mmZS+x=weFj#(Ngpt-|&AX`EB;W zA&@;`PP)4H@966Oe?%KqCLefC=@kDi z2>pe%`Ta@!j+fU-OJ2T^%O)b08NR-rr}ls67m(DGyeTNPioWyVX7r&JmOpaYi@_&w z_EfH!)%5e+VF$HTfpYvKg^fso{r?Cwer~^PXBZD#5wT(LtkC5;%Xhn2s((9=*vf*reV}3F#`Ln^m+tRH zPn{c$8x?+nD@XQI#Xe%1+H-1*L#K;lfEc>gdsBKdqtuw`55pbp`B`I5?bOKgwE zo|j$U62~^-!r$5@7wA=|)%WgHy@;Y#{<-nce`s;k>AB^j%#}%mbY@uC{=dWz9}R;@ho3hveOdH3&&wax zWfJaB?hHIVF5-30re(J8-IdqJt@odNaR13UFT3kE8y}o*^17vX#WnJ%^#7g-+~v7L zsTFfa`qJY+)zolIL%Y^*5DMKh2|lRmU6qV<$Ii3_@P#0d$DjHvxoryq`J3nWzt=E< z_j|ZM@Q7dE$Gr;ZJU__2o)3c@<6f`x>^aN5J{Q=l$h|_u_domhs`K9sApfla?&qWE7N{I>@G#le60;6IG?A5P@ff&b#*zcu(T4ghZy5hsr@_>@YW+F-5E z2}8BbIP-z^3FI&Q7%~n&;~Q=4c4b6;afvmDfe|&6U}q((bFUR+YnK0lKr(aME=m?j0f0SR#7pzQ?p8~gHqw$*|89?(2W(_ zYI)V6UXX6P7jj+lIN-+f0{EGD<2vatk5FTdrGt7RzB8X6u>KVJHl;yD#9K6DcAm%x!0C3-;h^}2&`vh zWiAdHqP6>)fx}u0GuOje(45#sWwi|y0*Fu*ZboHpMexUD1B%CPmYl$ zt?`9$g^!4S00S@Sfp1E38L#)6IV84QknDObXMv6>X9hzcYA??Kk;5k}zVJ=+=mUC# zm<9to>_I}OE0uyLOo5bJWVp3Pj^CoO^W>jtBDG z(9U5$H|QC6H)U1bpe|I@=4d&iIEyl56?y2*7dou9kYCfk^_Fl|88z!ob4NoGrW>1# z+6K$Nh|BTiOM(?(ElaVO?msQHUQ>;4P=@8NB3b-s^jz5C6EF|Y(nk#1BckYrF=B4f z?;D!{jj=rgP?y?EpxInMB!!)c?^JUc8z{3g?)oakDxf~*-zc2Tki3_+(TOm!ZulZg ztL4Oam)Hcao}xc0EQAM|dm0pEY57umuXXuT-@3Qhlr1j>(JCFKu;l!3?D!l0dO`-d z3(cH2hj-;Jt%I!KalZ>b&#RJk`NohSmaD-91r@Pkb>CW{Q7D0Abt9{upSoIU8OHj8mMfejS&M#al%Z5Hk-bCC zL^@29U^RJm@O??$h%|f_B8yqofXk$RY_2L6b5#2IM^8-Y6F2e%ll!2=$}1?FW^DtD?;dj3!`8YbiF%M9zy%4^Nj$yExU_nvM=toRw`lX=H06 zLXgd7#8skh=iG`>vuBT(kADvenMZ9evzIV2(6MSSk+VS_UYaq1bs^icHY-YdA@6gd zhx}U|N`Po5GP{tMHR3_6bE!;nFi`BcxWoZH`3;TG`z=bBLn0n;ugwbD><$LHuTKMs@gHsl z&{c#^d9OCX+1p)cYlh=N%q%7GSArywT-y_5-PWM_#Zq3?>dWKF$Wt;ygxOA2qb!Z> zMTFrz;x?A)zWYU&F^*!WHmEiV*ZcO!hipGyj_kg}y{`mUm-P9_sb8KH=FrrouvZ%~ zX+e=2ZPryxt)LD=sYIBOOUlU+%H2s=+l5hI(nm4QmZZxNP3_>N3*_BaxagPBqGAIn zsl+)SE##6HRU^LA^~=*=@vnGGT^B#^pl!rKroG^1TExy)i@a5>zn9Vd65LjPJi&sN zqF`sJwq0DA)pB?#q^TMJ354e*ze)1QYoR zg*l9rahByy<0!G(r`s5cj*=Zz&!WxBz>eV;#>n{($HFoB6ipL+oqdaD^-i+kv`F3O@ zb(Fk2xqFtT;$>?$wO&I(aFFogK)=Z!U5cpIR$=ghr>}8??lwNiVKu%fPR#RLn@gp5 zSH@4(JdC7a#ucYfFYOvyUd*1tzb)OmfAEBw)-UFx7^5z)Llp~T|Zljk_(?Sy*UToR`>7h|lPwi{b+xJ02i zdx=o?I3_2{p{91%?g4RdWgoYk{8kUb5xV`fb4x!(h=puTgz^h%2Kw0bh#%8% zXiqs~;Tkx7566f0^PFDi*I4;hXoLC6VDo@ZL-n`yA;rzEkuMr~x;2p@9&{?t!A!@6Qu+XRj9EGu5A!5UYO%;FMd&;&olCS2-B(LHlg^P=2av z7S+nMf`JS`jec;4kY1D@G_O~%A< z@L4Dg>A&#pSbyrzVM3&ouMw-BT9VCPe+5rjJPNr^zQ)}GQ!EBX39U~Ezq-vxlOJ7) zA_!KZgjC}K*H`uOJ{UnoKU*u!!#ar*YkHyqPrsmUewvK$rev(I&9(_%uKwh;XAk6k zLh2rn+C`_6+nzNg7-ai5v6)rOd7=jB!-BPsfAFLI;dUh2y+?9bANhLAHY4^VKa++- z7MlqBl)sbvql(?AOZTYTtP!?73xzENYWCCpX1kGRP5M3@R7D# z)8vqjVycg$C=0Wr>h6VFj1q;+ZWg~rEmdyVt!nUMjO3Bctl;YsA-k(BMp_G2bQr8l z|2#<1Uzfjwz{|Kg5ixSoIcVI6*SFIUBwD)xK>=EhPh%RXrJo=+g96$?H{N zJ4?l7tp9ig*H~{aZ?GB6Ic2jm1ve?Nwqn)R%y)r3QRD83zZ?eUT&YZ6H1Vy$#2bfz z?`528ION`6<<=ozlJ_uO3$^p{rZ#%!T}wp3t(blO!K-3<9?J9!*KlvFPfvdU&2x-_ z3Z4KXrRyzMxm!Zk>8ymc#+Kt!>D|Qzg5g)~Rq}Gjc8oYa3wCju{cI7>V!xq$$v9#4 ziWS9jtU;_M^ytcO}FA70n#rBL%z(g9Q$kW~TOSTq-6 z?j5*YPgwfWu-TPPn1|{2Aq)%;iTHo>8z#=T7M7q_zDK0-ddRui;Ja~Jr0kHLg}9KX zPc*TXL)lL>S3>LbK5OlR2>4JJ0jUxAAc+KAM{Z%G$A|)8O;+aP#5XO`XHc7|>oEOf z>%iI8L>ayL?!NSrCp6*lUEBo&_QSg2yhYrX=wI)L&uz78qHcoi;`8SL-RMc6i3~tG z5`1d&&&jKA4AYf;SEq@D$!7F;z-AQyre*~uIH9phm)(u|oVcuzW~PC~iGo5$?ag#% z?f0-%UcnHbhBwsF?P<>1|8#+b`)>-Qzzn2ftUNZ3>(ws>APgUs(MWCxfFJ!0q!zN} zs~1xpvli+gG}7pjQ4&lG(L^@LXN=mpYo+*#x+xv5!N4>tRx-(1fCzjd5tqJnupM$R z+}Yt?ZW(J-qekP6bMNN&WBf(uWAG?$(OM29zhP)^tbD>VN&y7#z7`R2yaD!+L{1ZkwLu0{eS*>pkL~)om?l9!~dqJXS^M_K^ ztpGIHO#hCQSm1!T#og?{Ka$!6|J8U5tRVRbAHlY%H4e4-aY-mMotOPPDa3u(QeTzc zi;EG4mhAY(X>JaniK@Of#t_I4E~MC>hHhP*?ib58H@!TC{t&3tp^AN2*yn9{;^JKu z=3;tzZ>ZS@oGQ@;ajALP0)cX4i60)UdSIbzqM$r#BA%*U+Ny8Nz;4}#Bp4jBkquJg+- zXDN|Fs6-C4{(JwpDdW^L%gV10b7udjNty^G;gMbAKVZWoo$ zVKLhD{5E(WJdd3a72$bcsh%l#4~4H_kw1s%OLeF(44k>KMVa*<8tWWQQ(hwGvuMH2qu01ZV%Qy@wdd?%6WHgBG^zHa! zM_2q!U!`!BJsNo!#QMyG%gKo^XLD?>x{Wieopv^UL|~EaV-s{Ahx~ zbf+j-Ic6%!CyzLsT*`{EhP6t~8XKjm2dvG61UVI*TWj67Ic%SoDuo?Uw6TZ=ci#H< z{{KtN@YZ+C*qp1|9HW*}8wq3;az@YA>NJ#@E;!=f!!PNk64D}q6Z_)k{zS(|6AP$u zPts-fD3?O_ANMu#G?eNXbDERNtG^>%0D=6U7a;43^FufhrR?B{^o<$Yd1Vny-w{sd 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 bj$FccHN<9r7x$f5PzLpM^>bP0l+XkKAN5$l diff --git a/home-manager/i3/workspaces/workspace-1.json b/home-manager/i3/workspaces/workspace-1.json deleted file mode 100644 index d6ce6b0..0000000 --- a/home-manager/i3/workspaces/workspace-1.json +++ /dev/null @@ -1,10 +0,0 @@ -// vim:ts=4:sw=4:et -{ - "name": "Terminal", - "swallows": [ - { - "class": "^kitty$" - } - ], - "type": "con" -} diff --git a/home-manager/i3/workspaces/workspace-2.json b/home-manager/i3/workspaces/workspace-2.json deleted file mode 100644 index a6d29f3..0000000 --- a/home-manager/i3/workspaces/workspace-2.json +++ /dev/null @@ -1,10 +0,0 @@ -// vim:ts=4:sw=4:et -{ - "name": "Element", - "swallows": [ - { - "class": "^Element$" - } - ], - "type": "con" -} diff --git a/home-manager/i3/workspaces/workspace-4.json b/home-manager/i3/workspaces/workspace-4.json deleted file mode 100644 index 108f590..0000000 --- a/home-manager/i3/workspaces/workspace-4.json +++ /dev/null @@ -1,10 +0,0 @@ -// vim:ts=4:sw=4:et -{ - "name": "Email", - "swallows": [ - { - "class": "^thunderbird$" - } - ], - "type": "con" -} diff --git a/home-manager/i3/workspaces/workspace-5.json b/home-manager/i3/workspaces/workspace-5.json deleted file mode 100644 index 7c74fa7..0000000 --- a/home-manager/i3/workspaces/workspace-5.json +++ /dev/null @@ -1,10 +0,0 @@ -// vim:ts=4:sw=4:et -{ - "name": "Browser", - "swallows": [ - { - "class": "^firefox$" - } - ], - "type": "con" -} diff --git a/home-manager/kitty.nix b/home-manager/kitty.nix index dc585bf..9a204d6 100644 --- a/home-manager/kitty.nix +++ b/home-manager/kitty.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, user, theme, ... }: +{ theme, ... }: let theme_name = if theme == "light" then "Solarized Light" else "Solarized Dark"; diff --git a/home-manager/rofi.nix b/home-manager/rofi.nix deleted file mode 100644 index 0c75bfd..0000000 --- a/home-manager/rofi.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, pkgs, user, ... }: - -{ - programs.rofi = { - enable = true; - font = "DejaVu Sans Mono 12"; - terminal = "${pkgs.kitty}/bin/kitty"; - extraConfig = { - show-icons = true; - matching = "fuzzy"; - }; - }; -} diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix new file mode 100644 index 0000000..a11f835 --- /dev/null +++ b/home-manager/sway/default.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, user, ... }: +let + font.name = "DejaVu Sans Mono"; + font.size = 12.0; +in +{ + imports = [ + ./i3status-rust.nix + ]; + + programs.fuzzel = { + enable = true; + settings = { + main = { + terminal = "${pkgs.kitty}/bin/kitty"; + layer = "overlay"; + font = "DejaVu Sans Mono:size=10"; + }; + colors.background = "55000000"; + }; + }; + + wayland.windowManager.sway = { + enable = true; + + config = rec { + modifier = "Mod4"; + terminal = "${pkgs.kitty}/bin/kitty"; + + input = { + "type:keyboard" = { + xkb_layout = "de"; + }; + "type:touchpad" = { + natural_scroll = "enabled"; + tap = "enabled"; + accel_profile = "flat"; + dwt = "enabled"; + }; + }; + + seat = { + "*" = { + hide_cursor = "1000"; + }; + }; + + fonts = { + names = [ font.name ]; + size = font.size; + }; + + bars = [{ + mode = "hide"; + position = "top"; + statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml"; + + fonts = { + names = [ font.name ]; + size = font.size; + }; + }]; + + menu = "${pkgs.fuzzel}/bin/fuzzel"; + }; + + extraConfig = '' + ''; + }; + +} diff --git a/home-manager/i3/i3status-rust.nix b/home-manager/sway/i3status-rust.nix similarity index 100% rename from home-manager/i3/i3status-rust.nix rename to home-manager/sway/i3status-rust.nix diff --git a/home-mandlm.nix b/home-mandlm.nix index 287dbc0..d3aaad0 100644 --- a/home-mandlm.nix +++ b/home-mandlm.nix @@ -44,8 +44,7 @@ ./home-manager/gpg ./home-manager/zsh.nix ./home-manager/starship.nix - ./home-manager/i3 - ./home-manager/rofi.nix + ./home-manager/sway ./home-manager/direnv.nix ./home-manager/bat.nix ]; diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix index d3d2b13..1303e3c 100644 --- a/machines/apache/configuration.nix +++ b/machines/apache/configuration.nix @@ -3,6 +3,6 @@ { networking.hostName = "apache"; boot.loader.grub.enableCryptodisk = true; - services.xserver.videoDrivers = [ "intel" "nvidia" ]; + # services.xserver.videoDrivers = [ "intel" "nvidia" ]; }