diff --git a/README.md b/README.md index 6b0e172..3297267 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ This will create an iso image in the result directory. ## Inspirations - https://github.com/the-nix-way/dev-templates - https://fasterthanli.me/series/building-a-rust-service-with-nix/part-10 -- https://ianthehenry.com/posts/how-to-learn-nix/profiles/ +- https://ianthehenry.com/posts/how-to-learn-nix/profiles - https://github.com/JohnRTitor/nix-conf - https://github.com/mwaldleben/nix-config - https://github.com/anotherhadi/nixy @@ -50,3 +50,4 @@ This will create an iso image in the result directory. - https://github.com/Frost-Phoenix/nixos-config - https://github.com/elifouts/Dotfiles - https://github.com/nomadics9/nixcfg +- https://github.com/Daholli/nixos-config diff --git a/modules/home-manager/code.nix b/modules/home-manager/code.nix index ce389f8..0e28a44 100644 --- a/modules/home-manager/code.nix +++ b/modules/home-manager/code.nix @@ -26,52 +26,41 @@ { key = "ctrl+#"; command = "editor.action.commentLine"; - when = "textInputFocus"; + when = "editorTextFocus"; } ]; userSettings = { + # visual + "editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace"; + "terminal.integrated.fontFamily" = "FiraCode Nerd Font Mono"; + "workbench.iconTheme" = "vs-seti"; + + # telemetry "telemetry.enableCrashReporter" = false; "telemetry.enableTelemetry" = false; + "redhat.telemetry.enabled" = false; + + + # editor QOL + "security.workspace.trust.untrustedFiles" = "open"; + "editor.wordWrap" = "on"; + "files.autoSave" = "onWindowChange"; + "files.autoSaveDelay" = 1000; + "files.insertFinalNewline" = true; + "files.trimTrailingWhitespace" = true; "git.ignoreMissingGitWarning" = true; "editor.suggestSelection" = "first"; - "workbench.editorAssociations" = { - "*.ipynb" = "jupyter-notebook"; - }; "workbench.startupEditor" = "newUntitledFile"; "editor.renderWhitespace" = "none"; "editor.acceptSuggestionOnEnter" = "off"; "explorer.confirmDelete" = false; "git.confirmSync" = false; - "workbench.iconTheme" = "vs-seti"; + "git.enableSmartCommit" = true; "editor.fontLigatures" = true; "explorer.confirmDragAndDrop" = false; - "editor.wordWrap" = "on"; - "settingsSync.ignoredSettings" = [ - "editor.fontFamily" - "terminal.integrated.fontFamily" - "-python.venvFolders" - ]; - "jupyter.askForKernelRestart" = false; - "security.workspace.trust.untrustedFiles" = "open"; - "notebook.cellToolbarLocation" = { - "default" = "right"; - "jupyter-notebook" = "left"; - }; - "git.enableSmartCommit" = true; - "terminal.integrated.fontFamily" = "Fira Code"; - "settingsSync.ignoredExtensions" = [ - "ms-vscode-remote.remote-wsl" - "ms-vscode-remote.remote-ssh-edit" - "ms-vscode-remote.remote-ssh" - ]; - "editor.bracketPairColorization.enabled" = true; - "jupyter.widgetScriptSources" = [ - "jsdelivr.com" - "unpkg.com" - ]; - "diffEditor.renderSideBySide" = false; "editor.inlineSuggest.enabled" = true; + "diffEditor.renderSideBySide" = false; "github.copilot.enable" = { "*" = true; "plaintext" = true; @@ -79,7 +68,7 @@ "scminput" = false; "yaml" = true; }; - "redhat.telemetry.enabled" = false; + "editor.bracketPairColorization.enabled" = true; "git.autofetch" = true; "terminal.integrated.enableMultiLinePasteWarning" = false; "editor.unicodeHighlight.nonBasicASCII" = false; @@ -100,6 +89,23 @@ "language-julia.interrupt" ]; "diffEditor.hideUnchangedRegions.enabled" = true; + + # Python + "jupyter.askForKernelRestart" = false; + "workbench.editorAssociations" = { + "*.ipynb" = "jupyter-notebook"; + }; + "notebook.cellToolbarLocation" = { + "default" = "right"; + "jupyter-notebook" = "left"; + }; + "jupyter.widgetScriptSources" = [ + "jsdelivr.com" + "unpkg.com" + ]; + + + # Typst "[typst]" = { "editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?"; }; @@ -109,7 +115,6 @@ "tinymist.fontPaths" = [ "./font" ]; - "editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace"; }; }; diff --git a/modules/home-manager/hypr/hyprland-customization.nix b/modules/home-manager/hypr/hyprland-customization.nix index d828522..b7a6356 100644 --- a/modules/home-manager/hypr/hyprland-customization.nix +++ b/modules/home-manager/hypr/hyprland-customization.nix @@ -154,27 +154,45 @@ ", preferred, auto, 1" # automatically add any newly detected monitor ]; + xwayland = { + enabled = false; + }; + env = [ + # force apps to use wayland "NIXOS_OZONE_WL,1" "ELECTRON_OZONE_PLATFORM_HINT,wayland" + # set the scale factor for GDK apps + "GDK_SCALE,1.5" + "XCURSOR_SIZE,32" + # set the scale factor for QT apps + "QT_SCALE_FACTOR,1.5" + # set the scale factor for GTK apps ]; }; - plugins = [ - # Global overview - # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace - # Touch gestures: https://github.com/horriblename/hyprgrass - # inputs.hyprgrass.packages.${pkgs.system}.default - # Virtual desktops: https://github.com/levnikmyskin/hyprland-virtual-desktops - # inputs.hyprland-virtual-desktops.packages.${pkgs.system}.virtual-desktops - ]; + # TODO - plugins are broken for now + # plugins = [ + # # Global overview + # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace + # # Touch gestures: https://github.com/horriblename/hyprgrass + # inputs.hyprgrass.packages.${pkgs.system}.default + # ]; + + # plugin = { + # touch_gestures = { + # sensitivity = 4.0; + # # must be >= 3 + # workspace_swipe_fingers = 3; + # }; + # }; }; - services.network-manager-applet = { - enable = true; - }; + # services.network-manager-applet = { + # enable = true; + # }; services.swaync.enable = true; } diff --git a/modules/home-manager/hypr/hyprlock.nix b/modules/home-manager/hypr/hyprlock.nix index 0bf1370..af9a6b6 100644 --- a/modules/home-manager/hypr/hyprlock.nix +++ b/modules/home-manager/hypr/hyprlock.nix @@ -16,7 +16,8 @@ blur_size = 10; }; input-field = { - size = "20%, 5%"; + monitor = ""; + size = "300, 60"; outline_thickness = 3; inner_color = "rgba(0, 0, 0, 0.0)"; @@ -28,11 +29,49 @@ fade_on_empty = false; rounding = 15; - position = "0, -20"; + position = "0, -250"; halign = "center"; valign = "center"; }; + label = [ + { + # Day-Month-Date + monitor = ""; + text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"''; + # color = foreground; + font_size = 28; + # font_family = font + " Bold"; + position = "0, 490"; + halign = "center"; + valign = "center"; + } + # Time + { + monitor = ""; + text = ''cmd[update:1000] echo "$(date +"%I:%M")"''; + # color = foreground; + font_size = 160; + # font_family = "steelfish outline regular"; + position = "0, 370"; + halign = "center"; + valign = "center"; + } + # USER + { + monitor = ""; + text = " $USER"; + # color = foreground; + outline_thickness = 2; + dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true; + font_size = 18; + # font_family = font + " Bold"; + position = "0, -180"; + halign = "center"; + valign = "center"; + } + ]; }; - # Style the lock screen }; } diff --git a/modules/home-manager/hypr/waybar.nix b/modules/home-manager/hypr/waybar.nix index 3f78ffd..aef8fa3 100644 --- a/modules/home-manager/hypr/waybar.nix +++ b/modules/home-manager/hypr/waybar.nix @@ -108,6 +108,10 @@ format-plugged = "{capacity}% 󰂄 "; format-icons = [ "󰁻" "󰁼" "󰁾" "󰂀" "󰂂" "󰁹" ]; }; + "backlight" = { + "format" = "{percent}% {icon}",; + "format-icons" = ["" "" "" "" "" "" "" "" ""]; + }; "wireplumber" = { scroll-step = 10; format = "{icon} {volume}%";# {format_source}"; @@ -133,7 +137,6 @@ "tray" = { spacing = 5; }; - "custom/notification" = { tooltip = false; format = "{icon} {}"; @@ -202,6 +205,12 @@ padding: 3px; } + #battery.warning { + background:rgba(240, 165, 0, 0.6); + } + #battery.critical { + background:rgba(255, 0, 0, 0.6); + } ''; }; } diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix index 7d373ab..ebd1d43 100644 --- a/modules/home-manager/kitty.nix +++ b/modules/home-manager/kitty.nix @@ -7,6 +7,8 @@ background_opacity = 0.8; confirm_os_window_close = 0; cursor_trail = 3; + cursor_trail_decay = "0.1 0.4"; + url_style = "curly"; }; keybindings = { # copy and paste