diff --git a/data/hyprland/config.nix b/data/hyprland/config.nix index f7222f6..9450cea 100644 --- a/data/hyprland/config.nix +++ b/data/hyprland/config.nix @@ -1,65 +1,71 @@ MOD: TAGS: pkgs: '' - general { - gaps_in = 1 - gaps_out = 0 - } + general { + gaps_in = 1 + gaps_out = 0 + } - input { - sensitivity = 0 - kb_layout = de - kb_variant = bone - repeat_rate = 60 - repeat_delay = 235 - # Only change focus on mouse click - follow_mouse = 2 - accel_profile = flat - touchpad { - natural_scroll = true + input { + sensitivity = 0 + kb_layout = de + kb_variant = bone + repeat_rate = 60 + repeat_delay = 235 + # Only change focus on mouse click + follow_mouse = 2 + accel_profile = flat + touchpad { + natural_scroll = true + } + } + + gestures { + workspace_swipe = true } - } - gestures { - workspace_swipe = true - } + misc { + disable_hyprland_logo = true + } - # keybinds - bind=${MOD},q,killactive, - bind=${MOD},return,fullscreen, - bind=${MOD},f,togglefloating - bind=${MOD},tab,cyclenext, - bind=ALT,tab,cyclenext, - bind=,Menu,exec,rofi -show drun + # keybinds + bind=${MOD},q,killactive, + bind=${MOD},return,fullscreen, + bind=${MOD},f,togglefloating + bind=${MOD},tab,cyclenext, + bind=ALT,tab,cyclenext, + bind=,Menu,exec,rofi -show drun - bind=${MOD},left,movefocus,l - bind=${MOD},right,movefocus,r - bind=${MOD},up,movefocus,u - bind=${MOD},down,movefocus,d + bind=${MOD},left,movefocus,l + bind=${MOD},right,movefocus,r + bind=${MOD},up,movefocus,u + bind=${MOD},down,movefocus,d - bind=${MOD},n,movefocus,l - bind=${MOD},s,movefocus,r - bind=${MOD},l,movefocus,u - bind=${MOD},r,movefocus,d + bind=${MOD},n,movefocus,l + bind=${MOD},s,movefocus,r + bind=${MOD},l,movefocus,u + bind=${MOD},r,movefocus,d - bind=${MOD} + SHIFT,left,movewindow,l - bind=${MOD} + SHIFT,right,movewindow,r - bind=${MOD} + SHIFT,up,movewindow,u - bind=${MOD} + SHIFT,down,movewindow,d + bind=${MOD} + SHIFT,left,movewindow,l + bind=${MOD} + SHIFT,right,movewindow,r + bind=${MOD} + SHIFT,up,movewindow,u + bind=${MOD} + SHIFT,down,movewindow,d - bind=${MOD} + SHIFT,n,movewindow,l - bind=${MOD} + SHIFT,s,movewindow,r - bind=${MOD} + SHIFT,l,movewindow,u - bind=${MOD} + SHIFT,r,movewindow,d + bind=${MOD} + SHIFT,n,movewindow,l + bind=${MOD} + SHIFT,s,movewindow,r + bind=${MOD} + SHIFT,l,movewindow,u + bind=${MOD} + SHIFT,r,movewindow,d - bind=${MOD},comma,workspace,-1 - bind=${MOD},period,workspace,+1 + bind=${MOD},comma,workspace,-1 + bind=${MOD},period,workspace,+1 - bind=${MOD},b,exec,firefox - bind=${MOD},t,exec,kitty - bind=${MOD} + SHIFT,Escape,exit + bind=${MOD},b,exec,firefox + bind=${MOD},t,exec,kitty + bind=${MOD} + SHIFT,Escape,exit + + exec-once="${pkgs.waybar}/bin/waybar main" '' + builtins.concatStringsSep "\n" (map ( x: '' diff --git a/flake.lock b/flake.lock index af5aca0..1ee9b1e 100644 --- a/flake.lock +++ b/flake.lock @@ -247,11 +247,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-b3t2blYgmHf/HXc152Fa7+YKJSS05vRnrs8i+H6SWA8=", - "path": "/nix/store/m12grpvqvq7vs62knlp1s288mb2n775k-source/templates", + "path": "/nix/store/prychaf8a2rz70ix83z9knjhgv5ajviw-source/templates", "type": "path" }, "original": { - "path": "/nix/store/m12grpvqvq7vs62knlp1s288mb2n775k-source/templates", + "path": "/nix/store/prychaf8a2rz70ix83z9knjhgv5ajviw-source/templates", "type": "path" } }, diff --git a/users/common/default.nix b/users/common/default.nix index 10f880f..67ce7b0 100644 --- a/users/common/default.nix +++ b/users/common/default.nix @@ -58,6 +58,13 @@ inherit identityFile; }; + "CompConst" = { + hostname = "cp-service.kaist.ac.kr"; + user = "s20236085"; + port = 13001; + inherit identityFile; + }; + "valhalla" = { hostname = "valhalla.fs.tum.de"; user = "grossmann"; diff --git a/users/common/graphical/hyprland.nix b/users/common/graphical/hyprland.nix index de83429..7c8d5f5 100644 --- a/users/common/graphical/hyprland.nix +++ b/users/common/graphical/hyprland.nix @@ -6,6 +6,23 @@ MOD = "SUPER"; TAGS = map toString (lib.lists.range 42 50); in { + home.packages = with pkgs; [ + qt6.qtwayland + ]; + + programs.waybar = { + enable = true; + settings = { + main = { + layer = "top"; + position = "bottom"; + modules-left = ["hyprland/window"]; + modules-center = ["workspaces"]; + modules-right = ["network" "memory" "backlight" "wireplumber" "battery" "clock" "tray"]; + }; + }; + }; + wayland.windowManager.hyprland = { enable = true; nvidiaPatches = true; diff --git a/users/common/shells/zsh.nix b/users/common/shells/zsh.nix index 3479b8f..2ee6aeb 100644 --- a/users/common/shells/zsh.nix +++ b/users/common/shells/zsh.nix @@ -36,8 +36,8 @@ src = pkgs.fetchFromGitHub { owner = "aloxaf"; repo = "fzf-tab"; - rev = "69024c27738138d6767ea7246841fdfc6ce0d0eb"; - sha256 = "07wwcplyb2mw10ia9y510iwfhaijnsdcb8yv2y3ladhnxjd6mpf8"; + rev = "5a81e13792a1eed4a03d2083771ee6e5b616b9ab"; + sha256 = "0lfl4r44ci0wflfzlzzxncrb3frnwzghll8p365ypfl0n04bkxvl"; }; } { @@ -45,8 +45,8 @@ src = pkgs.fetchFromGitHub { owner = "zdharma-continuum"; repo = "fast-syntax-highlighting"; - rev = "7c390ee3bfa8069b8519582399e0a67444e6ea61"; - sha256 = "0gh4is2yzwiky79bs8b5zhjq9khksrmwlaf13hk3mhvpgs8n1fn0"; + rev = "5521b083f8979ad40be2137d7a46bfa51c8d666a"; + sha256 = "0ki5dl3gvmcl1kr9smx0949303dxzwadz7r4abj7ivj3284xxk44"; }; } ]; diff --git a/users/patrick.nix b/users/patrick.nix index f6f5128..bd4affa 100644 --- a/users/patrick.nix +++ b/users/patrick.nix @@ -58,6 +58,9 @@ }; }; + # notification are nice to have + services.dunst.enable = true; + nixpkgs.config.allowUnfree = true; xsession.enable = true; }