From f23437064d32665d8e2d19e5f243cd8c0d10613a Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 20 Sep 2022 14:33:24 +0200 Subject: [PATCH] add outline --- flake.lock | 12 +- nixos/hosts/olympus/default.nix | 13 +- nixos/hosts/olympus/outline/configuration.nix | 22 ++ nixos/hosts/thalassa/null/home/default.nix | 1 + nixos/hosts/thalassa/null/home/hyprland.nix | 189 ++++++++++-------- 5 files changed, 140 insertions(+), 97 deletions(-) create mode 100644 nixos/hosts/olympus/outline/configuration.nix diff --git a/flake.lock b/flake.lock index 25b8e28..67da750 100644 --- a/flake.lock +++ b/flake.lock @@ -365,11 +365,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1663619079, - "narHash": "sha256-xdv2knlxIHIlOMqaSXhvJlMoruE13ZV5WpNfRmKUk1E=", + "lastModified": 1663629861, + "narHash": "sha256-CjfQUyPfG/hkE4jnMcTvVJ0ubc84u8ySruZL+emXMjw=", "owner": "nix-community", "repo": "home-manager", - "rev": "df79df8be10bc54d79118ac6167a92b779344228", + "rev": "41790ba656bafc023f48ccdbbe7816d30fd52d76", "type": "github" }, "original": { @@ -384,11 +384,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1663618128, - "narHash": "sha256-E/TgcXiKhVynyc68bBKm1NuQYQ6sqwI9W7UBA3ohBwY=", + "lastModified": 1663665418, + "narHash": "sha256-FfHLjo7Cz1U0GRKaGwmBOrbv25LhFfKXkLaJ/PCelHY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a8943246a79faff415f2da7e210e80ae51b00d95", + "rev": "cde624ec6a98b751e67967cbaffd68b1215e8531", "type": "github" }, "original": { diff --git a/nixos/hosts/olympus/default.nix b/nixos/hosts/olympus/default.nix index 4a50db6..56dc527 100644 --- a/nixos/hosts/olympus/default.nix +++ b/nixos/hosts/olympus/default.nix @@ -16,6 +16,7 @@ hostname = "dhcp"; ip = "10.42.42.3"; mac = "3E:2D:E8:AA:E2:81"; + tags = [ "networking" ]; } { hostname = "bastion"; @@ -61,22 +62,24 @@ mac = "74:40:be:48:85:a4"; nix = false; } - # { - # ip = "10.42.42.14"; - # } + { + hostname = "outline"; + mac = "52:13:EB:FD:87:F0"; + ip = "10.42.42.14"; + } { hostname = "dns-1"; profile = "dns"; ip = "10.42.42.15"; mac = "5E:F6:36:23:16:E3"; - tags = [ "dns" ]; + tags = [ "dns" "networking" ]; } { hostname = "dns-2"; profile = "dns"; ip = "10.42.42.16"; mac = "B6:04:0B:CD:0F:9F"; - tags = [ "dns" ]; + tags = [ "dns" "networking" ]; } { hostname = "minio"; diff --git a/nixos/hosts/olympus/outline/configuration.nix b/nixos/hosts/olympus/outline/configuration.nix new file mode 100644 index 0000000..e660f64 --- /dev/null +++ b/nixos/hosts/olympus/outline/configuration.nix @@ -0,0 +1,22 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = [ ]; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.11"; # Did you read the comment? + + # Additional packages + environment.systemPackages = with pkgs; [ ]; + + networking.firewall.allowedTCPPorts = [ ]; +} diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 8ed8473..37ab426 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -32,6 +32,7 @@ kubectl libnotify neofetch + networkmanagerapplet nixpkgs-review pulseview python3 diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/nixos/hosts/thalassa/null/home/hyprland.nix index 45b2467..5950652 100644 --- a/nixos/hosts/thalassa/null/home/hyprland.nix +++ b/nixos/hosts/thalassa/null/home/hyprland.nix @@ -5,105 +5,122 @@ wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png ''; - wayland.windowManager.hyprland = { - enable = true; - extraConfig = '' - exec-once=${pkgs.hyprpaper}/bin/hyprpaper - exec-once=hyprctl setcursor Catppuccin-Frappe-Pink-Cursors 32 - exec-once=${pkgs.xsettingsd}/bin/xsettingsd & - exec-once=foot --server & - exec-once=eww daemon - exec-once=eww open bar - - monitor=eDP-1,1920x1080@60,0x0,1 - monitor=eDP-1,addreserved,0,0,48,0 - monitor=,preferred,auto,1 + wayland.windowManager.hyprland = + let + startup-script = pkgs.writeScriptBin "startup" '' + #!${pkgs.stdenv.shell} + hyprctl setcursor Catppuccin-Frappe-Pink-Cursors 32 + ${pkgs.hyprpaper}/bin/hyprpaper & + ${pkgs.xsettingsd}/bin/xsettingsd & + foot --server & + eww daemon & + eww open bar & + firefox-devedition & + webcord & + element-desktop & + ''; + in + { + enable = true; + extraConfig = '' + monitor=eDP-1,1920x1080@60,0x0,1 + monitor=eDP-1,addreserved,0,0,48,0 + monitor=,preferred,auto,1 - general { - layout = dwindle - col.active_border = 0xfff4b8e4 - } + windowrulev2 = workspace 1,class:^(Electron)$,title:^(.*)(WebCord)(.*)$ + windowrulev2 = workspace 1,title:^(Element)(.*)$ + windowrulev2 = workspace 2,class:^(firefox-aurora)$ - input { - kb_options=caps:escape - touchpad { - natural_scroll= true + general { + layout = dwindle + col.active_border = 0xfff4b8e4 } - } - gestures { - workspace_swipe = true - } + input { + kb_options=caps:escape + touchpad { + natural_scroll= true + } + } - misc { - no_vfr = false - disable_hyprland_logo = true - disable_splash_rendering = true - } + gestures { + workspace_swipe = true + } - dwindle { - pseudotile=true - } + misc { + no_vfr = false + disable_hyprland_logo = true + disable_splash_rendering = true + } - bind=SUPER,RETURN,exec,footclient - bind=SUPER,f,exec,firefox-devedition - bind=SUPER,d,exec,wofi --show run,drun + dwindle { + pseudotile=true + } - bind=,Print,exec,grim -g "$(slurp)" - | wl-copy -t image/png - bind=SUPER,W,killactive, - bind=SUPERSHIFT,Q,exit, - bind=SUPER,S,togglefloating, - bind=SUPER,P,pseudo, + bind=SUPER,RETURN,exec,footclient + bind=SUPER,f,exec,firefox-devedition + bind=SUPER,d,exec,wofi --show run,drun - bind=SUPER,left,movefocus,l - bind=SUPER,right,movefocus,r - bind=SUPER,up,movefocus,u - bind=SUPER,down,movefocus,d + bind=,Print,exec,grim -g "$(slurp)" - | wl-copy -t image/png + bind=SUPER,W,killactive, + bind=SUPERSHIFT,Q,exit, + bind=SUPER,S,togglefloating, + bind=SUPER,P,pseudo, - bind=SUPER,1,workspace,1 - bind=SUPER,2,workspace,2 - bind=SUPER,3,workspace,3 - bind=SUPER,4,workspace,4 - bind=SUPER,5,workspace,5 - bind=SUPER,6,workspace,6 - bind=SUPER,7,workspace,7 - bind=SUPER,8,workspace,8 - bind=SUPER,9,workspace,9 - bind=SUPER,0,workspace,10 + bind=SUPER,left,movefocus,l + bind=SUPER,right,movefocus,r + bind=SUPER,up,movefocus,u + bind=SUPER,down,movefocus,d - bind=ALT,1,movetoworkspace,1 - bind=ALT,2,movetoworkspace,2 - bind=ALT,3,movetoworkspace,3 - bind=ALT,4,movetoworkspace,4 - bind=ALT,5,movetoworkspace,5 - bind=ALT,6,movetoworkspace,6 - bind=ALT,7,movetoworkspace,7 - bind=ALT,8,movetoworkspace,8 - bind=ALT,9,movetoworkspace,9 - bind=ALT,0,movetoworkspace,10 + bind=SUPER,1,workspace,1 + bind=SUPER,2,workspace,2 + bind=SUPER,3,workspace,3 + bind=SUPER,4,workspace,4 + bind=SUPER,5,workspace,5 + bind=SUPER,6,workspace,6 + bind=SUPER,7,workspace,7 + bind=SUPER,8,workspace,8 + bind=SUPER,9,workspace,9 + bind=SUPER,0,workspace,10 + bind=SUPER,grave,togglespecialworkspace - bind=SUPERSHIFT,1,movetoworkspacesilent,1 - bind=SUPERSHIFT,2,movetoworkspacesilent,2 - bind=SUPERSHIFT,3,movetoworkspacesilent,3 - bind=SUPERSHIFT,4,movetoworkspacesilent,4 - bind=SUPERSHIFT,5,movetoworkspacesilent,5 - bind=SUPERSHIFT,6,movetoworkspacesilent,6 - bind=SUPERSHIFT,7,movetoworkspacesilent,7 - bind=SUPERSHIFT,8,movetoworkspacesilent,8 - bind=SUPERSHIFT,9,movetoworkspacesilent,9 - bind=SUPERSHIFT,0,movetoworkspacesilent,10 + bind=ALT,1,movetoworkspace,1 + bind=ALT,2,movetoworkspace,2 + bind=ALT,3,movetoworkspace,3 + bind=ALT,4,movetoworkspace,4 + bind=ALT,5,movetoworkspace,5 + bind=ALT,6,movetoworkspace,6 + bind=ALT,7,movetoworkspace,7 + bind=ALT,8,movetoworkspace,8 + bind=ALT,9,movetoworkspace,9 + bind=ALT,0,movetoworkspace,10 + bind=ALT,grave,movetoworkspace,special - bind=SUPER,mouse_down,workspace,e+1 - bind=SUPER,mouse_up,workspace,e-1 + bind=SUPERSHIFT,1,movetoworkspacesilent,1 + bind=SUPERSHIFT,2,movetoworkspacesilent,2 + bind=SUPERSHIFT,3,movetoworkspacesilent,3 + bind=SUPERSHIFT,4,movetoworkspacesilent,4 + bind=SUPERSHIFT,5,movetoworkspacesilent,5 + bind=SUPERSHIFT,6,movetoworkspacesilent,6 + bind=SUPERSHIFT,7,movetoworkspacesilent,7 + bind=SUPERSHIFT,8,movetoworkspacesilent,8 + bind=SUPERSHIFT,9,movetoworkspacesilent,9 + bind=SUPERSHIFT,0,movetoworkspacesilent,10 + bind=SUPERSHIFT,grave,movetoworkspacesilent,special - bind=SUPER,g,togglegroup - bind=SUPER,tab,changegroupactive + bind=SUPER,mouse_down,workspace,e+1 + bind=SUPER,mouse_up,workspace,e-1 - bind=,XF86MonBrightnessUp,exec,brightnessctl -q s +5% - bind=,XF86MonBrightnessDown,exec,brightnessctl -q s 5%- - bind=,XF86MonRaiseVolume,exec,pamixer -i 5 - bind=,XF86MonLowerVolume,exec,pamixer -d 5 - bind=,XF86AudioMute,exec,pamixer -t - ''; - }; + bind=SUPER,g,togglegroup + bind=SUPER,tab,changegroupactive + + bind=,XF86MonBrightnessUp,exec,brightnessctl -q s +5% + bind=,XF86MonBrightnessDown,exec,brightnessctl -q s 5%- + bind=,XF86MonRaiseVolume,exec,pamixer -i 5 + bind=,XF86MonLowerVolume,exec,pamixer -d 5 + bind=,XF86AudioMute,exec,pamixer -t + + exec-once=${startup-script}/bin/startup + ''; + }; }