diff --git a/configuration.nix b/configuration.nix index 3f9f460..a6d56bd 100755 --- a/configuration.nix +++ b/configuration.nix @@ -135,7 +135,15 @@ openssl fastfetch polkit_gnome + gcc + blueman ]; + + programs.steam = { + enable = true; + extraCompatPackages = with pkgs; [ proton-ge-bin ]; + + }; programs.git.enable = true; systemd.user.services.polkit-gnome-authentication-agent-1 = { description = "polkit-gnome-authentication-agent-1"; diff --git a/home/home.nix b/home/home.nix index 4beb515..6dcaf8d 100755 --- a/home/home.nix +++ b/home/home.nix @@ -18,6 +18,10 @@ # want to update the value, then make sure to first check the Home Manager # release notes. programs.bash.enable = true; + programs.bash.bashrcExtra = '' + "fastfetch" + ''; + home.stateVersion = "24.05"; # Please read the comment before changing. home.shell.enableShellIntegration = true; home.shellAliases = { diff --git a/home/nixvim/coding.nix b/home/nixvim/coding.nix index be7751d..8349918 100755 --- a/home/nixvim/coding.nix +++ b/home/nixvim/coding.nix @@ -12,10 +12,14 @@ servers = { bashls.enable = true; - clangd = { - package = null; - enable = true; - }; + clangd.package = null; + clangd.enable = true; + clangd.cmd = [ + "clangd" + "--background-index" + "--query-driver=${pkgs.clang}/bin/clang++" + "--query-driver=${pkgs.clang}/bin/clang" + ]; nixd.enable = true; }; }; diff --git a/home/nixvim/plugins.nix b/home/nixvim/plugins.nix index c1b8417..020c439 100755 --- a/home/nixvim/plugins.nix +++ b/home/nixvim/plugins.nix @@ -22,12 +22,25 @@ { type = "text"; val = [ - " ██████╗ █████╗ ██╗ ██╗██╗ ██╗██╗███╗ ███╗" - " ██╔════╝ ██╔══██╗╚██╗ ██╔╝██║ ██║██║████╗ ████║" - " ██║ ███╗███████║ ╚████╔╝ ██║ ██║██║██╔████╔██║" - " ██║ ██║██╔══██║ ╚██╔╝ ╚██╗ ██╔╝██║██║╚██╔╝██║" - " ╚██████╔╝██║ ██║ ██║ ╚████╔╝ ██║██║ ╚═╝ ██║" - " ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝" + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⣠⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣡⣾⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣟⠻⣿⣿⣿⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⣿⡿⢫⣷⣿⣿⣿⣿⣿⣿⣿⣾⣯⣿⡿⢧⡚⢷⣌⣽⣿⣿⣿⣿⣿⣶⡌⣿⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⣿⠇⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣮⣇⣘⠿⢹⣿⣿⣿⣿⣿⣻⢿⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⣿⠀⢸⣿⣿⡇⣿⣿⣿⣿⣿⣿⣿⣿⡟⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣻⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⡇⠀⣬⠏⣿⡇⢻⣿⣿⣿⣿⣿⣿⣿⣷⣼⣿⣿⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⢻⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⠀⠈⠁⠀⣿⡇⠘⡟⣿⣿⣿⣿⣿⣿⣿⣿⡏⠿⣿⣟⣿⣿⣿⣿⣿⣿⣿⣿⣇⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⡏⠀⠀⠐⠀⢻⣇⠀⠀⠹⣿⣿⣿⣿⣿⣿⣩⡶⠼⠟⠻⠞⣿⡈⠻⣟⢻⣿⣿⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⢿⠀⡆⠀⠘⢿⢻⡿⣿⣧⣷⢣⣶⡃⢀⣾⡆⡋⣧⠙⢿⣿⣿⣟⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⡿⠀⠀⠀⠀⠀⠀⠀⡥⠂⡐⠀⠁⠑⣾⣿⣿⣾⣿⣿⣿⡿⣷⣷⣿⣧⣾⣿⣿⣿⣿⣿⣿⣿" + "⣿⣿⡿⣿⣍⡴⠆⠀⠀⠀⠀⠀⠀⠀⠀⣼⣄⣀⣷⡄⣙⢿⣿⣿⣿⣿⣯⣶⣿⣿⢟⣾⣿⣿⢡⣿⣿⣿⣿⣿" + "⣿⡏⣾⣿⣿⣿⣷⣦⠀⠀⠀⢀⡀⠀⠀⠠⣭⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⣡⣾⣿⣿⢏⣾⣿⣿⣿⣿⣿" + "⣿⣿⣿⣿⣿⣿⣿⣿⡴⠀⠀⠀⠀⠀⠠⠀⠰⣿⣿⣿⣷⣿⠿⠿⣿⣿⣭⡶⣫⠔⢻⢿⢇⣾⣿⣿⣿⣿⣿⣿" + "⣿⣿⣿⡿⢫⣽⠟⣋⠀⠀⠀⠀⣶⣦⠀⠀⠀⠈⠻⣿⣿⣿⣾⣿⣿⣿⣿⡿⣣⣿⣿⢸⣾⣿⣿⣿⣿⣿⣿⣿" + "⡿⠛⣹⣶⣶⣶⣾⣿⣷⣦⣤⣤⣀⣀⠀⠀⠀⠀⠀⠀⠉⠛⠻⢿⣿⡿⠫⠾⠿⠋⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿" + "⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣀⡆⣠⢀⣴⣏⡀⠀⠀⠀⠉⠀⠀⢀⣠⣰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿" + "⠿⠛⠛⠛⠛⠛⠛⠻⢿⣿⣿⣿⣿⣯⣟⠷⢷⣿⡿⠋⠀⠀⠀⠀⣵⡀⢠⡿⠋⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿" + "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⢿⣿⣿⠂⠀⠀⠀⠀⠀⢀⣽⣿⣿⣿⣿⣿⣿⣿⣍⠛⠿⣿⣿⣿⣿⣿⣿" ]; opts = { position = "center"; @@ -43,7 +56,7 @@ val = [ { type = "button"; - val = "  new file"; + val = " new file "; on_press.__raw = "function() vim.cmd[[ene]] end"; opts = { position = "center"; @@ -56,7 +69,7 @@ } { type = "button"; - val = "  search files"; + val = " search files "; on_press.__raw = "function() vim.cmd[[Telescope find_files]] end"; opts = { position = "center"; @@ -69,7 +82,7 @@ } { type = "button"; - val = "  live grep"; + val = " live grep "; on_press.__raw = "function() vim.cmd[[Telescope live_grep]] end"; opts = { position = "center"; @@ -82,7 +95,7 @@ } { type = "button"; - val = "  quit neovim"; + val = " quit neovim "; on_press.__raw = "function() vim.cmd[[qa]] end"; opts = { position = "center"; @@ -104,7 +117,11 @@ settings = { pickers = { find_files = { - find_command = [ "fd" "--unrestricted" "--no-ignore" ]; + find_command = [ + "fd" + "--unrestricted" + "--no-ignore" + ]; }; }; defaults = { @@ -118,7 +135,6 @@ }; }; - lualine = { enable = true; settings = { @@ -138,14 +154,16 @@ lualine_a = [ "mode" ]; lualine_b = [ "branch" ]; lualine_c = [ "filename" ]; - lualine_x = [ "diagnostics" "filetype" ]; + lualine_x = [ + "diagnostics" + "filetype" + ]; lualine_y = [ "progress" ]; lualine_z = [ "location" ]; }; }; }; - bufferline.enable = true; web-devicons.enable = true; }; diff --git a/home/programs.nix b/home/programs.nix index 1250003..09d599b 100755 --- a/home/programs.nix +++ b/home/programs.nix @@ -18,8 +18,6 @@ dconf fd ripgrep - gnumake - stlink ]; programs.git = { enable = true; @@ -30,6 +28,104 @@ }; programs.spicetify.enable = true; + programs.fastfetch = { + enable = true; + settings = { + logo = { + source = "~/.config/fastfetch/logo.txt"; + }; + display = { + separator = "  "; + }; + modules = [ + { + type = "title"; + key = "User"; + } + { + type = "custom"; + text = ""; + } + + { + type = "os"; + key = "OS"; + } + { + type = "custom"; + text = ""; + } + + { + type = "kernel"; + key = "Kernel"; + } + { + type = "custom"; + text = ""; + } + + { + type = "packages"; + key = "Packages"; + } + { + type = "custom"; + text = ""; + } + + { + type = "cpu"; + key = "CPU"; + } + { + type = "custom"; + text = ""; + } + + { + type = "gpu"; + key = "GPU"; + } + { + type = "custom"; + text = ""; + } + + { + type = "memory"; + key = "Memory"; + } + { + type = "custom"; + text = ""; + } + + { + type = "disk"; + key = "Disk"; + } + { + type = "custom"; + text = ""; + } + + { + type = "display"; + key = "Resolution"; + } + { + type = "custom"; + text = ""; + } + + { + type = "shell"; + key = "Shell"; + } + ]; + }; + }; programs.foot = { enable = true; diff --git a/home/waybar.nix b/home/waybar.nix index d682bb9..5e4c895 100755 --- a/home/waybar.nix +++ b/home/waybar.nix @@ -5,68 +5,67 @@ systemd.enable = true; style = '' - * { - font-family: "0xProto Nerd Font Propo"; - font-size: 14px; - font-weight: 600; + * { + font-family: "0xProto Nerd Font Propo"; + font-size: 14px; + font-weight: 600; + } + + window#waybar { + background-color: @base00; + } - - window#waybar { - background-color: transparent; - - } - #workspaces button { - all: unset; - padding: 1px 6px; - margin: 2px; - color: alpha(@base05, 0.5); - border-radius: 1em; - } + #workspaces button { + all: unset; + padding: 1px 6px; + margin: 2px; + color: alpha(@base05, 0.5); + border-radius: 1em; + } - #workspaces button.active { - color: @base00; - background-color: @base05; - } + #workspaces button.active { + color: @base05; + } - #workspaces { - margin: 0px; - padding: 2px; - background-color: @base00; - border-radius: 1em; - } - #mpris, - #backlight, - #tray, - #pulseaudio, - #window, - #upower, - #clock, - #power-profiles-daemon { - margin: 0px; - padding: 2px 14px; - border-radius: 1em; - background-color: @base00; - color: @base05; - } + #workspaces { + margin: 0px; + padding: 2px; + background-color: @base00; + border-radius: 1em; + } + #mpris, + #backlight, + #tray, + #pulseaudio, + #window, + #upower, + #clock, + #power-profiles-daemon { + margin: 0px; + padding: 2px 2px; + border-radius: 1em; + background-color: @base00; + color: @base05; + } - #tray { - padding: 0px 6px 0px 6px; - } + #tray { + padding: 0px 8px 0px 4px; + } - window#waybar.empty #window { - background: none; - } + window#waybar.empty #window { + background: none; + } + #custom-sep { + color: alpha(@base05, 0.5); + } ''; settings = { mainBar = { layer = "top"; position = "top"; - margin-top = 5; - margin-right = 5; - margin-left = 5; - spacing = 5; + spacing = 0; modules-left = [ "hyprland/workspaces" "hyprland/window" @@ -74,13 +73,20 @@ ]; modules-right = [ "backlight" + "custom/sep" "pulseaudio" + "custom/sep" "upower" + "custom/sep" "power-profiles-daemon" + "custom/sep" "clock" + "custom/sep" "tray" ]; - + "custom/sep" = { + format = " | "; + }; "mpris" = { player = "spotify"; format = "{title} - {artist}"; diff --git a/stylix.nix b/stylix.nix index de1d313..f25f971 100755 --- a/stylix.nix +++ b/stylix.nix @@ -23,7 +23,7 @@ stylix = { enable = true; autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml"; polarity = "dark"; image = ./home/wallpaper.png; fonts = {