diff --git a/home/dconf.nix b/home/dconf.nix index d5551bc..603ba79 100644 --- a/home/dconf.nix +++ b/home/dconf.nix @@ -1,6 +1,8 @@ { inputs, pkgs, lib, config, ... }: { + services.udev.packages = [ pkgs.gnome-settings-daemon ]; + dconf = { enable = true; settings = { diff --git a/home/default.nix b/home/default.nix index aa94c71..4ec8c4f 100755 --- a/home/default.nix +++ b/home/default.nix @@ -4,6 +4,7 @@ imports = [ ./home.nix ./bash.nix + ./gtk.nix ./tmux.nix ./starship.nix #./vscode.nix diff --git a/home/gtk.nix b/home/gtk.nix new file mode 100644 index 0000000..c54851e --- /dev/null +++ b/home/gtk.nix @@ -0,0 +1,21 @@ +{ inputs, pkgs, lib, config, ... }: + +{ + home.sessionVariables.GTK_THEME = "Tokyonight-Dark-B"; + gtk = { + enable = true; + # theme.name = "adw-gtk3"; + theme = { + name = "Tokyonight-Dark-B"; + package = pkgs.tokyo-night-gtk; + }; + cursorTheme = { + name = "Oreo-Cursors"; + package = pkgs.oreo-cursors-plus; + }; + iconTheme = { + name = "breeze-dark"; + package = pkgs.breeze-icons; + }; + }; +} \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index b7d0664..3ae7c66 100755 --- a/home/home.nix +++ b/home/home.nix @@ -6,12 +6,6 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; - gtk = { - enable = true; - theme.name = "adw-gtk3"; - cursorTheme.name = "Bibata-Modern-Ice"; - iconTheme.name = "GruvboxPlus"; - }; # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. diff --git a/home/kitty.nix b/home/kitty.nix index b2d65fd..34fe6df 100755 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -10,8 +10,8 @@ enable_audio_bell = false; mouse_hide_wait = "-1.0"; window_padding_width = 5; - background_opacity = "0.8"; - background_blur = 0; + background_opacity = "0.90"; + background_blur = 5; themeFile = "Alucard"; # symbol_map = # let diff --git a/home/packages.nix b/home/packages.nix index aaf42e3..7c72e03 100755 --- a/home/packages.nix +++ b/home/packages.nix @@ -4,6 +4,7 @@ home.packages = with pkgs; [ hello tmux + gnomeExtensions.appindicator #zsh-powerlevel10k #inputs.nixvim.packages.${pkgs.system}.default diff --git a/home/vscode.nix b/home/vscode.nix deleted file mode 100755 index 6f3c8c0..0000000 --- a/home/vscode.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ inputs, pkgs, lib, config, ... }: - -{ - programs.vscode = { - enable = true; - #package = pkgs.vscode.fhs; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - mutableExtensionsDir = true; - - # VSCode installation and extensions - extensions = (with pkgs.vscode-extensions; [ - golang.go - ms-vscode.cpptools - ms-vsliveshare.vsliveshare - bbenoist.nix - ms-python.python - laravel.vscode-laravel - ms-azuretools.vscode-docker - ms-vscode-remote.remote-ssh - vscodevim.vim - enkia.tokyo-night - - ]); - - # Settings - userSettings = { - # General - "editor.fontSize" = 13; - #"editor.fontFamily" = "'Jetbrains Mono', 'monospace', monospace"; - "terminal.integrated.fontSize" = 14; - "terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'monospace', monospace"; - "window.zoomLevel" = 1; - "editor.multiCursorModifier" = "ctrlCmd"; - "workbench.startupEditor" = "none"; - "explorer.compactFolders" = false; - # Whitespace - "files.trimTrailingWhitespace" = true; - "files.trimFinalNewlines" = true; - "files.insertFinalNewline" = true; - "diffEditor.ignoreTrimWhitespace" = false; - # Git - "git.enableCommitSigning" = true; - "git-graph.repository.sign.commits" = true; - "git-graph.repository.sign.tags" = true; - "git-graph.repository.commits.showSignatureStatus" = true; - # Styling - "window.autoDetectColorScheme" = true; - "workbench.preferredDarkColorTheme" = "Default Dark Modern"; - "workbench.preferredLightColorTheme" = "Default Light Modern"; - "workbench.iconTheme" = "material-icon-theme"; - "material-icon-theme.activeIconPack" = "none"; - "material-icon-theme.folders.theme" = "classic"; - # Other - "telemetry.telemetryLevel" = "off"; - "update.showReleaseNotes" = false; - # # Gitmoji - # "gitmoji.onlyUseCustomEmoji" = true; - # "gitmoji.addCustomEmoji" = [ - # { - # "emoji" = "📦 NEW:"; - # "code" = ":package: NEW:"; - # "description" = "... Add new code/feature"; - # } - # { - # "emoji" = "👌 IMPROVE:"; - # "code" = ":ok_hand: IMPROVE:"; - # "description" = "... Improve existing code/feature"; - # } - # { - # "emoji" = "❌ REMOVE:"; - # "code" = ":x: REMOVE:"; - # "description" = "... Remove existing code/feature"; - # } - # { - # "emoji" = "🐛 FIX:"; - # "code" = ":bug: FIX:"; - # "description" = "... Fix a bug"; - # } - # { - # "emoji" = "📑 DOC:"; - # "code" = ":bookmark_tabs: DOC:"; - # "description" = "... Anything related to documentation"; - # } - # { - # "emoji" = "🤖 TEST:"; - # "code" = ":robot: TEST:"; - # "description" = "... Anything realted to tests"; - # } - # ]; - }; - # #vscode-extensions.hikarin522.glassit - # ] - # ++ pkgs.vscode-utils.extensionsfromvscodemarketplace [ - # { - # name = "remote-ssh-edit"; - # publisher = "ms-vscode-remote"; - # version = "0.47.2"; - # sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; - # } - # { - # name = "vsliveshare"; - # publisher = "ms-vsliveshare"; - # version = "1.0.5948"; # replace with the latest version - # sha256 = "kou9zf5l6mtlu8z/l4xbwrl2x3uie15yghezjrkshgy="; # replace with the calculated hash - # } - # { - # name = "glassit"; - # publisher = "s-nlf-fh"; - # version = "0.2.6"; - # sha256 = "lcaomgk91hnjwqaw4i0fagtowr8kwv7zhvgcgkokkuy="; - # } - # ]; - }; -} diff --git a/system/services.nix b/system/services.nix index 3cbc066..1845c9d 100755 --- a/system/services.nix +++ b/system/services.nix @@ -4,4 +4,5 @@ { # Enable the OpenSSH daemon. #services.openssh.enable = true; + services.udev.packages = [ pkgs.gnome-settings-daemon ]; } diff --git a/system/vscode.nix b/system/vscode.nix index f3f5f6a..14f70ad 100755 --- a/system/vscode.nix +++ b/system/vscode.nix @@ -13,13 +13,9 @@ ms-vsliveshare.vsliveshare bbenoist.nix ms-python.python - #laravel.vscode-laravel - ms-azuretools.vscode-docker - ms-vscode-remote.remote-ssh vscodevim.vim enkia.tokyo-night yzhang.markdown-all-in-one - #onecentlin.laravel-extension-pack ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "remote-ssh-edit"; @@ -27,18 +23,19 @@ version = "0.47.2"; sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; } - { - name = "vsliveshare"; - publisher = "ms-vsliveshare"; - version = "1.0.5948"; # replace with the latest version - sha256 = "kou9zf5l6mtlu8z/l4xbwrl2x3uie15yghezjrkshgy="; # replace with the calculated hash - } # { - # name = "glassit"; - # publisher = "s-nlf-fh"; - # version = "0.2.6"; - # sha256 = "lcaomgk91hnjwqaw4i0fagtowr8kwv7zhvgcgkokkuy="; + # name = "vsliveshare"; + # publisher = "ms-vsliveshare"; + # version = "1.0.5948"; # replace with the latest version + # sha256 = "KOu9zF5l6MTLU8z/l4xBwRl2X3uIE15YgHEZJrKSHGY="; # replace with the calculated hash # } + { + name = "glassit"; + publisher = "s-nlf-fh"; + version = "0.2.6"; + #sha256 = "lcaomgk91hnjwqaw4i0fagtowr8kwv7zhvgcgkokkuy="; + sha256 = "LcAomgK91hnJWqAW4I0FAgTOwr8Kwv7ZhvGCgkokKuY="; + } ]; }) ]; diff --git a/system/yazi.nix b/system/yazi.nix index 49e5737..160272a 100755 --- a/system/yazi.nix +++ b/system/yazi.nix @@ -19,23 +19,7 @@ show_hidden = true; show_symlink = true; }; - - # preview = { - # image_filter = "lanczos3"; - # image_quality = 90; - # tab_size = 1; - # max_width = 600; - # max_height = 900; - # cache_dir = ""; - # ueberzug_scale = 1; - # ueberzug_offset = [ - # 0 - # 0 - # 0 - # 0 - # ]; - # }; - + # tasks = { # micro_workers = 5; # macro_workers = 10;