diff --git a/flake.lock b/flake.lock index dc60a28..e4c9615 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1792274446, - "narHash": "sha256-AM1HmBeDnB2B3dSiXuCYeu7Me+lHNpz/P39lVxGJBuQ=", + "lastModified": 1792818383, + "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab3823b4b24c0c3ca984c1f3ee577fd6d667424c", + "rev": "24f2190587513b9c2f73db112a17844ae912d965", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792295010, - "narHash": "sha256-F7meJtbqGttmUoMmYjRRgkVs42sn7bh7vvRvLPlUN98=", + "lastModified": 1792615934, + "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ce73368d1efd4d657e9064d29b144a52046b4e8", + "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1792175215, - "narHash": "sha256-XD64JVLV8iE4lR+W5gkTweEaT+SBwOrSy0+le2WgITI=", + "lastModified": 1792889789, + "narHash": "sha256-xpH3z+T5NELixXRjxGJ3mx30kz63Xt2B0ZfPWl7hcUg=", "owner": "NotAShelf", "repo": "nvf", - "rev": "a736b60b1e2019931168979951c94dc46e342957", + "rev": "557d2eb05a76e5939e6a75351343cae5731a71f8", "type": "github" }, "original": { diff --git a/home/coyote/default.nix b/home/coyote/default.nix index 7cffc59..3c47329 100644 --- a/home/coyote/default.nix +++ b/home/coyote/default.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.nvf.homeManagerModules.default + ./fastfetch.nix ./nvf.nix ]; @@ -20,8 +20,7 @@ karp keepassxc pdfarranger - # emacs - emacs + proton-vpn # multimedia furnace corrscope @@ -38,179 +37,91 @@ # emulation (unstable.bottles.override {removeWarningPopup = true;}) # devel + emacs unstable.racket - unstable.lazygit - unstable.opencode - treesitter-cli ]; - programs = { - home-manager.enable = true; - - ssh = { - enable = true; - enableDefaultConfig = false; - settings."*" = { - ForwardAgent = false; - AddKeysToAgent = "yes"; # no passphrase, silent auto-add - Compression = false; - ServerAliveInterval = 0; - ServerAliveCountMax = 3; - HashKnownHosts = false; - UserKnownHostsFile = "~/.ssh/known_hosts"; - ControlMaster = "no"; - ControlPath = "~/.ssh/master-%r@%n:%p"; - ControlPersist = "no"; - }; - }; - - git = { - enable = true; - settings.user.name = "asnev"; - settings.user.email = "notasnev@proton.me"; - signing.key = "/home/coyote/.ssh/id_ed25519.pub"; - signing.format = "ssh"; - includes = [ - { - condition = "gitdir:/home/coyote/NixOS/"; - contents.core.sshCommand = "ssh -i /home/coyote/.ssh/id_ed25519"; - } - ]; - }; - - fish.enable = true; - fish.shellAbbrs = { - l = "eza --grid --all"; - ll = "eza --long --all"; - ls = "eza"; - ".." = "cd .."; - "..." = "cd ../.."; - }; - - tmux = { - enable = true; - clock24 = true; - baseIndex = 1; - shortcut = "b"; - keyMode = "vi"; - terminal = "tmux-256color"; - escapeTime = 10; - extraConfig = '' - set -g pane-base-index 1 - set-window-option -g pane-base-index 1 - set-option -g renumber-windows on - set-option -g status-right "\"#W\"" - set -ga terminal-overrides ",*:RGB" - set -g mouse on - set -g set-clipboard on - ''; - }; - - yt-dlp.enable = true; - yt-dlp.package = pkgs.unstable.yt-dlp; - - starship = { - enable = true; - package = pkgs.unstable.starship; - enableTransience = true; - settings = { - "$schema" = "https://starship.rs/config-schema.json"; - git_status = { - ahead = ">"; - behind = "<"; - diverged = "<>"; - renamed = "r"; - deleted = "d"; - }; - }; - }; - - obs-studio.enable = true; - obs-studio.plugins = with pkgs.obs-studio-plugins; [ - input-overlay - droidcam-obs - ]; - - fastfetch.enable = true; - fastfetch.settings = { - "$schema" = "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json"; - logo.type = "small"; - logo.padding.top = 4; - logo.padding.left = 3; - logo.padding.right = 4; - display.separator = " "; - modules = [ - { - key = "╭─────────╮"; - type = "custom"; - } - { - key = "│ {#31}user {#keys}│"; - type = "title"; - format = "{user-name}"; - } - { - key = "│ {#32}host {#keys}│"; - type = "title"; - format = "{host-name}"; - } - { - key = "│ {#33}uptime {#keys}│"; - type = "uptime"; - } - { - key = "│ {#34}distro {#keys}│"; - type = "os"; - } - { - key = "│ {#35}kernel {#keys}│"; - type = "kernel"; - } - { - key = "│ {#36}desktop {#keys}│"; - type = "de"; - } - { - key = "│ {#31}term {#keys}│"; - type = "terminal"; - } - { - key = "│ {#32}shell {#keys}│"; - type = "shell"; - } - { - key = "│ {#33}cpu {#keys}│"; - type = "cpu"; - showPeCoreCount = true; - } - { - key = "│ {#34}disk {#keys}│"; - type = "disk"; - folders = "/"; - } - { - key = "│ {#35}memory {#keys}│"; - type = "memory"; - } - { - key = "│ {#36}network {#keys}│"; - type = "localip"; - format = "{ipv4} ({ifname})"; - } - { - key = "├─────────┤"; - type = "custom"; - } - { - key = "│ {#39}colors {#keys}│"; - type = "colors"; - symbol = "circle"; - } - { - key = "╰─────────╯"; - type = "custom"; - } - ]; + programs.ssh = { + enable = true; + enableDefaultConfig = false; + settings."*" = { + ForwardAgent = false; + AddKeysToAgent = "yes"; # no passphrase, silent auto-add + Compression = false; + ServerAliveInterval = 0; + ServerAliveCountMax = 3; + HashKnownHosts = false; + UserKnownHostsFile = "~/.ssh/known_hosts"; + ControlMaster = "no"; + ControlPath = "~/.ssh/master-%r@%n:%p"; + ControlPersist = "no"; }; }; + + programs.git = { + enable = true; + settings.user.name = "asnev"; + settings.user.email = "notasnev@proton.me"; + signing.key = "/home/coyote/.ssh/id_ed25519.pub"; + signing.format = "ssh"; + includes = [ + { + condition = "gitdir:/home/coyote/NixOS/"; + contents.core.sshCommand = "ssh -i /home/coyote/.ssh/id_ed25519"; + } + ]; + }; + + programs.fish.enable = true; + programs.fish.shellAbbrs = { + l = "eza --grid --all"; + ll = "eza --long --all"; + ls = "eza"; + ".." = "cd .."; + "..." = "cd ../.."; + cat = "bat"; + }; + + programs.tmux = { + enable = true; + clock24 = true; + baseIndex = 1; + keyMode = "vi"; + terminal = "tmux-256color"; + escapeTime = 10; + extraConfig = '' + set -g pane-base-index 1 + set-window-option -g pane-base-index 1 + set-option -g renumber-windows on + set-option -g status-right "\"#W\"" + set -ga terminal-overrides ",*:RGB" + set -g mouse on + set -g set-clipboard on + ''; + }; + + programs.yt-dlp.enable = true; + programs.yt-dlp.package = pkgs.unstable.yt-dlp; + + programs.starship = { + enable = true; + package = pkgs.unstable.starship; + enableTransience = true; + settings = { + "$schema" = "https://starship.rs/config-schema.json"; + git_status = { + ahead = ">"; + behind = "<"; + diverged = "<>"; + renamed = "r"; + deleted = "d"; + }; + }; + }; + + programs.obs-studio.enable = true; + programs.obs-studio.plugins = with pkgs.obs-studio-plugins; [ + input-overlay + droidcam-obs + ]; } diff --git a/home/coyote/fastfetch.nix b/home/coyote/fastfetch.nix new file mode 100644 index 0000000..795a86a --- /dev/null +++ b/home/coyote/fastfetch.nix @@ -0,0 +1,83 @@ +{pkgs, ...}: { + programs.fastfetch.enable = true; + programs.fastfetch.settings = { + "$schema" = "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json"; + logo.type = "small"; + logo.padding.top = 4; + logo.padding.left = 3; + logo.padding.right = 4; + display.separator = " "; + modules = [ + { + key = "╭─────────╮"; + type = "custom"; + } + { + key = "│ {#31}user {#keys}│"; + type = "title"; + format = "{user-name}"; + } + { + key = "│ {#32}host {#keys}│"; + type = "title"; + format = "{host-name}"; + } + { + key = "│ {#33}uptime {#keys}│"; + type = "uptime"; + } + { + key = "│ {#34}distro {#keys}│"; + type = "os"; + } + { + key = "│ {#35}kernel {#keys}│"; + type = "kernel"; + } + { + key = "│ {#36}desktop {#keys}│"; + type = "de"; + } + { + key = "│ {#31}term {#keys}│"; + type = "terminal"; + } + { + key = "│ {#32}shell {#keys}│"; + type = "shell"; + } + { + key = "│ {#33}cpu {#keys}│"; + type = "cpu"; + showPeCoreCount = true; + } + { + key = "│ {#34}disk {#keys}│"; + type = "disk"; + folders = "/"; + } + { + key = "│ {#35}memory {#keys}│"; + type = "memory"; + } + { + key = "│ {#36}network {#keys}│"; + type = "localip"; + format = "{ipv4} ({ifname})"; + } + { + key = "├─────────┤"; + type = "custom"; + } + { + key = "│ {#39}colors {#keys}│"; + type = "colors"; + symbol = "circle"; + } + { + key = "╰─────────╯"; + type = "custom"; + } + ]; + }; +} diff --git a/home/coyote/nvf.nix b/home/coyote/nvf.nix index 3cdbf2e..8a2159d 100644 --- a/home/coyote/nvf.nix +++ b/home/coyote/nvf.nix @@ -1,4 +1,15 @@ -{...}: { +{ + inputs, + pkgs, + ... +}: { + imports = [inputs.nvf.homeManagerModules.default]; + + home.packages = with pkgs; [ + unstable.lazygit + unstable.tree-sitter + ]; + programs.nvf = { enable = true; defaultEditor = true; @@ -89,7 +100,7 @@ languages.nix = { enable = true; treesitter.enable = true; - lsp.enable = false; + lsp.enable = true; format.enable = false; extraDiagnostics.enable = false; }; diff --git a/hosts/phostron/configuration.nix b/hosts/phostron/configuration.nix index c047547..9f33aba 100644 --- a/hosts/phostron/configuration.nix +++ b/hosts/phostron/configuration.nix @@ -25,6 +25,6 @@ # SDDM look, specific to this machine # NOTE: Wayland for SDDM intentionally left disabled (experimental) - services.displayManager.sddm.settings.Theme.Font = "Inter"; + services.displayManager.sddm.settings.Theme.Font = "Cantarell"; services.displayManager.sddm.settings.Theme.CursorSize = 18; }