diff --git a/home/common/core/default.nix b/home/common/core/default.nix index bbb9e43..71712c1 100644 --- a/home/common/core/default.nix +++ b/home/common/core/default.nix @@ -17,6 +17,8 @@ tree jq coreutils + btop + htop ;}; home.stateVersion = "23.11"; } diff --git a/home/common/optional/desktop/common/default.nix b/home/common/optional/desktop/common/default.nix index f349273..90c09b3 100644 --- a/home/common/optional/desktop/common/default.nix +++ b/home/common/optional/desktop/common/default.nix @@ -8,5 +8,6 @@ pkgs.zathura pkgs.xfce.thunar pkgs.wofi + pkgs.kcolorchooser ]; } diff --git a/home/common/optional/desktop/hyprland/default.nix b/home/common/optional/desktop/hyprland/default.nix index e9fb092..d73886f 100644 --- a/home/common/optional/desktop/hyprland/default.nix +++ b/home/common/optional/desktop/hyprland/default.nix @@ -37,9 +37,9 @@ kb_variant = kb_model = kb_rules = - + repeat_delay = 280 + repeat_rate = 60 follow_mouse = 1 - touchpad { natural_scroll = no } @@ -48,20 +48,18 @@ general { - gaps_in = 5 - gaps_out = 20 + gaps_in = 10 + gaps_out = 10 border_size = 2 - col.active_border = #22ff00 - col.inactive_border = #aecbb4 - + col.active_border = rgba(22ff00ee) + col.inactive_border = rgba(aecbb4ee) layout = dwindle - allow_tearing = false } decoration { - rounding = 10 + rounding = 5 blur { enabled = true @@ -112,18 +110,17 @@ $mainMod = SUPER - bind = $mainMod, Q, exec, $terminal - bind = $mainMod, C, killactive, + bind = $mainMod, RETURN, exec, $terminal + bind = $mainMod, Q, killactive, bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating, bind = $mainMod, R, exec, $menu - bind = $mainMod, S, exec, rofi -show drun -show-icons - bind = $mainMod, left, movefocus, l - bind = $mainMod, right, movefocus, r - bind = $mainMod, up, movefocus, u - bind = $mainMod, down, movefocus, d + bind = $mainMod, h, movefocus, l + bind = $mainMod, l, movefocus, r + bind = $mainMod, k, movefocus, u + bind = $mainMod, j, movefocus, d bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 diff --git a/home/semita.nix b/home/semita.nix index b5e71b1..9d8e616 100644 --- a/home/semita.nix +++ b/home/semita.nix @@ -26,19 +26,19 @@ monitors = [ { - name = "Virtual-1"; - width = 1920; + name = "DP-1"; + width = 2560; height = 1440; - refreshRate = 75; + refreshRate = 144; x = 0; primary = true; } { - name = "Virtual-2"; - width = 1920; + name = "DP-2"; + width = 2560; height = 1440; refreshRate = 75; - x = 1920; + x = 2560; } ]; } diff --git a/hosts/common/optional/pipewire.nix b/hosts/common/optional/pipewire.nix index fb0fbd8..7791d92 100644 --- a/hosts/common/optional/pipewire.nix +++ b/hosts/common/optional/pipewire.nix @@ -1,17 +1,17 @@ { pkgs, ... }: { sound.enable = true; - hardware.pulseaudio.enable = false; + hardware.pulseaudio.enable = true; security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; +# services.pipewire = { +# enable = true; +# alsa.enable = true; # alsa.support32Bit = true; - pulse.enable = true; - wireplumber.enable = true; - jack.enable = true; - - }; +# pulse.enable = true; +# wireplumber.enable = true; +# jack.enable = true; +# +# }; environment.systemPackages = [ pkgs.pamixer diff --git a/hosts/common/users/sam/default.nix b/hosts/common/users/sam/default.nix index 51a660d..90e93ef 100644 --- a/hosts/common/users/sam/default.nix +++ b/hosts/common/users/sam/default.nix @@ -49,6 +49,16 @@ in chown -R ${user}:${group} /home/${username}/.ssh ''; + environment.persistence."/persist" = { + hideMounts = true; + users.${username} = { + directories = [ + "." + ]; + }; + }; + + programs.zsh.enable = true; home-manager = { diff --git a/hosts/semita/default.nix b/hosts/semita/default.nix index 36ae3c1..dbaff18 100644 --- a/hosts/semita/default.nix +++ b/hosts/semita/default.nix @@ -42,15 +42,6 @@ in }; }; - environment.persistence."/persist" = { - hideMounts = true; - users.${user} = { - directories = [ - "/home/${user}" - ]; - }; - }; - networking = { hostName = "semita"; networkmanager.enable = true;