diff --git a/flake.lock b/flake.lock index 47252e1..2c49dcd 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1718983978, - "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719037157, + "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718990734, - "narHash": "sha256-kKcFWnov4eYXvG+ONoSqOgOwOYVk806GnMPqnyG0MOQ=", + "lastModified": 1719164993, + "narHash": "sha256-yfDdjbR7Mgwk0c4MQNLHQbPUOXyp07yxsyTYrvLWjGA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4a8b13ea4f8e5111390471c9212d10d4d032e837", + "rev": "8a68199a0ceb2894a5d9cc300961c38123ac0312", "type": "github" }, "original": { @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -613,11 +613,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718979027, - "narHash": "sha256-xj33owEyv36Hm8w6B+v24CUN7OkHMDhHOjVMnNtHw/U=", + "lastModified": 1719228487, + "narHash": "sha256-eJUcZAjOcGAoh97ZRsy+ls8IkHPMpDuh0IpRKSmoWs4=", "owner": "nix-community", "repo": "nixvim", - "rev": "4e224d27ae0db889f92ef228ad6cb984b91777fb", + "rev": "66c8592b31845cb0a1335ecc31ea40e89bed1a38", "type": "github" }, "original": { @@ -696,11 +696,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1718971834, - "narHash": "sha256-k+BjPJgjmG+u8VwyzjA6YxkoBn9tP1m19h0CQGc3iGM=", + "lastModified": 1719235398, + "narHash": "sha256-yccyHeuMUdbG/89Yi1ZSqx0XlpIKb0WQI+mAnTf/GJw=", "owner": "danth", "repo": "stylix", - "rev": "97dcf3c216fe5fb19c406e39f265d3bc9b851377", + "rev": "7cdbd128172d7c4ec63f5073d49da5d0e7d6396c", "type": "github" }, "original": { diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix index 35c8e6d..52202e6 100644 --- a/home/alacritty/default.nix +++ b/home/alacritty/default.nix @@ -6,7 +6,7 @@ settings = { # Font settings font = { - size = 17.5; + size = 14.5; }; # Color scheme diff --git a/home/default.nix b/home/default.nix index d67e539..3a32338 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,17 +1,18 @@ { config, pkgs, inputs, ... }: { - colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium; + colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium; imports = [ + ./rofi ./waybar ./alacritty ./hyprland ./zsh - ./rofi ./gtk ./git inputs.nix-colors.homeManagerModules.default ]; + home.username = "joy"; home.homeDirectory = "/home/joy"; home.stateVersion = "23.11"; @@ -19,6 +20,5 @@ home.sessionVariables = { EDITOR = "vim"; }; - } diff --git a/home/hyprland/.default.nix.swp b/home/hyprland/.default.nix.swp new file mode 100644 index 0000000..1f1503e Binary files /dev/null and b/home/hyprland/.default.nix.swp differ diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index f53b211..5d9d1c7 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -19,7 +19,6 @@ wayland.windowManager.hyprland = { enable = true; - #xwayland.enable = true; settings = { "$mod" = "SUPER"; @@ -37,10 +36,10 @@ "XCURSOR_SIZE = 24 " "HYPRCURSOR_THEME = Bibata-Modern-Ice" "HYPRCURSOR_SIZE = 24" - "XDG_CURRENT_DESKTOP,Hyprland" - "XDG_SESSION_TYPE,wayland" - "XDG_SESSION_DESKTOP,Hyprland" - "QT_QPA_PLATFORM,wayland" + # "XDG_CURRENT_DESKTOP,Hyprland" + # "XDG_SESSION_TYPE,wayland" + # "XDG_SESSION_DESKTOP,Hyprland" + # "QT_QPA_PLATFORM,wayland" ]; exec-once = [ diff --git a/home/rofi/.default.nix.swp b/home/rofi/.default.nix.swp new file mode 100644 index 0000000..feb1699 Binary files /dev/null and b/home/rofi/.default.nix.swp differ diff --git a/home/rofi/default.nix b/home/rofi/default.nix index b395191..3da548e 100644 --- a/home/rofi/default.nix +++ b/home/rofi/default.nix @@ -3,7 +3,7 @@ programs.rofi = { enable = true; - package = pkgs.rofi-wayland; + #packge = "pkgs.rofi-wayland"; theme = "~/nix/home/rofi/gruvbox-material.rasi"; extraConfig = { modi = "drun"; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 63264d3..99779e8 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -21,7 +21,6 @@ #Games alacritty ark - rofi prismlauncher zulu17 lutris @@ -44,6 +43,8 @@ mpv moc obs-studio + pulseaudioFull + alsa-utils #gui stuff ark keepassxc @@ -58,6 +59,8 @@ gnome.gnome-calculator gnome.gnome-disk-utility #random utils + rofi-wayland + screen pciutils cliphist wl-clipboard