From 5140dec6bc69a8332a4b4801efcfcbff0ab1dca2 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 3 May 2023 16:11:50 +0100 Subject: [PATCH] wowo --- lib/mkapp.nix | 8 +++++++ lib/mkconf.nix | 2 +- system/global/home.nix | 50 ++++++++++++++++++++++++++++++++---------- system/work/home.nix | 27 +++++++++++++---------- system/work/system.nix | 2 -- system/zenix/home.nix | 1 + 6 files changed, 64 insertions(+), 26 deletions(-) create mode 100644 lib/mkapp.nix diff --git a/lib/mkapp.nix b/lib/mkapp.nix new file mode 100644 index 0000000..6b24888 --- /dev/null +++ b/lib/mkapp.nix @@ -0,0 +1,8 @@ +name: { pkgs, app-id, browser, desktopName, ... }: + +pkgs.makeDesktopItem { + name = "${name}"; + desktopName = "${desktopName}"; + exec = "${browser} --app-id=${app-id} --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer"; + icon = "brave-${app-id}-Profile_2"; +} diff --git a/lib/mkconf.nix b/lib/mkconf.nix index c6c6daa..05d17ed 100644 --- a/lib/mkconf.nix +++ b/lib/mkconf.nix @@ -19,8 +19,8 @@ nixpkgs.lib.nixosSystem rec { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.${user}.imports = [ - ../system/global/home.nix ../system/${name}/home.nix + ../system/global/home.nix hyprland.homeManagerModules.default ]; } diff --git a/system/global/home.nix b/system/global/home.nix index c317741..a1e748c 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -51,23 +51,29 @@ let ''); brightness-down = (pkgs.writeShellScriptBin "brightness-down" '' - light -U 10 + light -U $1 ${my-deps.notify-send} "Brightness" -h int:value:$(light) -a brightness-down -t 1000 ''); brightness-up = (pkgs.writeShellScriptBin "brightness-up" '' - light -A 10 + light -A $1 ${my-deps.notify-send} "Brightness" -h int:value:$(light) -a brightness-up -t 1000 ''); open-code = (pkgs.writeShellScriptBin "open-code" '' code_dir=~/Documents/code - ls $code_dir/ | ${my-deps.menu} | ${my-deps.xargs} -I_ my-editor $code_dir/_ + cd $code_dir + repo=$({ ls && echo clone-repo; } | ${my-deps.menu}) + case $repo in + clone-repo) + url=$(wl-paste) + ${my-deps.terminal} -e -- git clone "$url" ;; + *) [ -e "$repo" ] && my-editor $repo ;; + esac ''); }; lf-sixel = pkgs.callPackage ../../custom/lf-sixel/. { }; - brave-nightly = pkgs.callPackage ../../custom/brave-nightly/. { }; in { programs.home-manager.enable = true; @@ -90,6 +96,8 @@ in playerctl pavucontrol dbeaver + qpwgraph + element-desktop brave quickemu @@ -115,6 +123,7 @@ in screenshots = true; effect-scale = 0.5; effect-blur = "10x10"; + grace = 5; }; }; @@ -163,12 +172,17 @@ in bind = SUPER_SHIFT, Q, killactive, bind = SUPER_SHIFT, E, exit, bind = SUPER, d, exec, wofi --show drun - bind = SUPER, Z, exec, "${pkgs.swaylock-effects}/bin/swaylock" -f + bind = SUPER, Z, exec, ${pkgs.wlogout}/bin/wlogout bind = SUPER, M, exec, ${ my-deps.terminal } -e ncmpcpp - bind = SUPER, E, exec, ${ my-deps.terminal } -e aerc bind = SUPER, O, exec, pcmanfm bind = SUPER, C, exec, ${ my-scripts.open-code }/bin/open-code bind = SUPER, G, exec, ${ pkgs.hyprpicker }/bin/hyprpicker | wl-copy && notify-send "Copied Colour" "$(wl-paste)" + bind = SUPER, EQUAL, exec, hyprctl keyword misc:cursor_zoom_factor 2 + bind = SUPER, MINUS, exec, hyprctl keyword misc:cursor_zoom_factor 1 + bind = SUPER, SLASH, focuswindow, brave-browser + bind = SUPER, n, focuswindow, Logseq + + windowrule = float, title:wlogout bind = SUPER, h, movefocus,l bind = SUPER, l, movefocus,r @@ -179,6 +193,8 @@ in bind = SUPER, j, layoutmsg,cyclenext bind = SUPER, k, layoutmsg,cycleprev bind = SUPER, space, layoutmsg,swapwithmaster master + bind = SUPER_SHIFT, k, layoutmsg, orientationtop + bind = SUPER_SHIFT, h, layoutmsg, orientationleft bind = SUPER, F, fullscreen, bind = SUPER, V, togglefloating, bind = SUPER_SHIFT, V, togglegroup, @@ -193,8 +209,10 @@ in bind =,XF86AudioPlay, exec,${ my-scripts.play-pause }/bin/play-pause bind =,XF86AudioNext, exec,${ my-deps.playerctl } next bind =,XF86AudioPrev, exec,${ my-deps.playerctl } previous - bind =,XF86MonBrightnessUp, exec,${ my-scripts.brightness-up }/bin/brightness-up - bind =,XF86MonBrightnessDown, exec,${ my-scripts.brightness-down }/bin/brightness-down + bind =,XF86MonBrightnessUp, exec,${ my-scripts.brightness-up }/bin/brightness-up 10 + bind =,XF86MonBrightnessDown, exec,${ my-scripts.brightness-down }/bin/brightness-down 10 + bind =SHIFT,XF86MonBrightnessUp, exec,${ my-scripts.brightness-up }/bin/brightness-up 1 + bind =SHIFT,XF86MonBrightnessDown, exec,${ my-scripts.brightness-down }/bin/brightness-down 1 bind = SUPER,1,workspace,1 bind = SUPER,2,workspace,2 @@ -224,7 +242,7 @@ in decoration { rounding = 5 - blur = 0 + drop_shadow = no } bezier=overshot, 0.05, 0.9, 0.1, 1.1 @@ -242,7 +260,7 @@ in general { resize_on_border = yes layout = master - col.active_border = rgb(FFF00F) rgb(0FFFF0) rgb(F00FFF) 120deg + col.active_border = rgb(FFFF00) rgb(00FFFF) rgb(FF00FF) border_size = 5 } @@ -252,7 +270,16 @@ in } ''; }; - + + programs.wlogout = { + enable = true; + style = '' + window { + background-color: rgba(12, 12, 12, 0.2); + } + ''; + }; + programs.waybar = { enable = true; settings = { @@ -394,6 +421,7 @@ in bright5 = "8f88be"; bright6 = "6caabf"; bright7 = "ffffff"; + alpha = 0.8; }; }; diff --git a/system/work/home.nix b/system/work/home.nix index 945b477..8e6ed24 100644 --- a/system/work/home.nix +++ b/system/work/home.nix @@ -19,22 +19,22 @@ (pkgs.writeShellScriptBin "my-editor" '' ${pkgs.vscode}/bin/code --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations $@ '') - (pkgs.makeDesktopItem { - name = "teams"; - desktopName = "Microsoft Teams"; - exec = "${brave}/opt/brave.com/brave/brave-browser --app-id=cifhbcnohmdccbgoicgdjpfamggdegmo --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer"; - icon = "brave-cifhbcnohmdccbgoicgdjpfamggdegmo-Default"; - }) - (pkgs.makeDesktopItem { - name = "slack"; + (import ../../lib/mkapp.nix "slack" { + inherit pkgs; desktopName = "Slack"; - exec = "${brave}/opt/brave.com/brave/brave-browser --app-id=dgboickhmnkjicgoildlenjnlaokbiib --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations"; - icon = "brave-dgboickhmnkjicgoildlenjnlaokbiib-Default"; + app-id = "mpagibdhafmlkgpemeicgogjnhclenoc"; + browser = "${brave}/opt/brave.com/brave/brave-browser"; }) (pkgs.makeDesktopItem { name = "logseq"; desktopName = "Logseq"; - exec = "${pkgs.logseq}/bin/logseq --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --disable-gpu"; + exec = "${logseq}/bin/logseq --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --disable-gpu"; + }) + (import ../../lib/mkapp.nix "teams" { + inherit pkgs; + browser = "${brave}/opt/brave.com/brave/brave-browser"; + app-id = "cifhbcnohmdccbgoicgdjpfamggdegmo"; + desktopName = "Microsoft Teams"; }) ]; @@ -49,7 +49,7 @@ exec-once = ${pkgs.swaybg}/bin/swaybg -o eDP-1 -i ~/Pictures/backgrounds/nix-wallpaper-simple-red.png & monitor = eDP-1, preferred, 0x0, 1.2 - workspace = eDP-1, 5 + monitor = HDMI-A-1, 1920x1080@144, auto, 1 input { kb_variant = dvorak @@ -57,7 +57,10 @@ general { gaps_out = 10 + border_size = 3 } + bind = SUPER, E, focuswindow, thunderbird + bind = SUPER, t, focuswindow, brave-cifhbcnohmdccbgoicgdjpfamggdegmo-Profile_2 ''; }; diff --git a/system/work/system.nix b/system/work/system.nix index f53f047..399d5b9 100644 --- a/system/work/system.nix +++ b/system/work/system.nix @@ -21,8 +21,6 @@ "vscode" ]; - services.tailscale.enable = true; - networking = { networkmanager = { plugins = [ pkgs.networkmanager-openvpn ]; diff --git a/system/zenix/home.nix b/system/zenix/home.nix index 53a725e..93f1775 100644 --- a/system/zenix/home.nix +++ b/system/zenix/home.nix @@ -81,6 +81,7 @@ wsbind = 9, HDMI-A-1 wsbind = 10,HDMI-A-1 bind = SUPER_SHIFT, X, killactive, + bind = SUPER, E, exec, ${ my-deps.terminal } -e aerc ''; };