diff --git a/configuration.nix b/configuration.nix index 0c08327..c7d1d42 100644 --- a/configuration.nix +++ b/configuration.nix @@ -139,6 +139,7 @@ environment.systemPackages = with pkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget + nmap openssh vesktop kdePackages.kdeconnect-kde diff --git a/flake.lock b/flake.lock index c00ef6e..5e9d2eb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,60 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1735597925, + "narHash": "sha256-znyKiXlrkPL+2xQwAR6G4/DKCgsutyIPo+d1dGeh2W4=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "478fe3917c2882a1c321f9d1eec808b71698974d", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -37,11 +92,84 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { + "ghostty": "ghostty", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c6191ac..7538542 100644 --- a/flake.nix +++ b/flake.nix @@ -8,9 +8,13 @@ url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + + ghostty = { + url = "github:ghostty-org/ghostty"; + }; }; - outputs = { self, nixpkgs, home-manager, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, ghostty, ... }@inputs: { nixosConfigurations = { default = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; @@ -18,6 +22,11 @@ modules = [ ./configuration.nix inputs.home-manager.nixosModules.default + { + environment.systemPackages = [ + ghostty.packages.x86_64-linux.default + ]; + } ]; }; }; diff --git a/home-manager/cli-tools.nix b/home-manager/cli-tools.nix index 606bdc1..5217b0e 100644 --- a/home-manager/cli-tools.nix +++ b/home-manager/cli-tools.nix @@ -52,7 +52,7 @@ grep = "grep --color=auto"; ll = "eza -la"; lt = "eza --tree"; - cd = "z"; + cd = "z"; open = "xdg-open"; rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#default"; }; @@ -73,75 +73,75 @@ settings = { add_newline = true; format = lib.concatStrings [ - "$time" - "$directory" - "$git_branch" - "$git_status" - "$hostname" - "$golang" - "direnv" - "$status" + "$time" + "$directory" + "$git_branch" + "$git_status" + "$hostname" + "$golang" + "direnv" + "$status" ]; right_format = lib.concatStrings [ - "$cmd_duration" + "$cmd_duration" ]; cmd_duration = { - disabled = false; - show_notifications = true; - min_time = 2000; - format = "[$duration](bold yellow)"; + disabled = false; + show_notifications = false; + min_time = 2000; + format = "[$duration](bold yellow)"; }; directory = { style = "cyan"; - format = ''\[[$path]($style)\] ''; + format = ''\[[$path]($style)\] ''; }; direnv = { - disabled = false; + disabled = false; }; git_branch = { - style = "bold cyan"; - format = ''\[[$symbol$branch(:$remote_branch)]($style)\] ''; + style = "bold cyan"; + format = ''\[[$symbol$branch(:$remote_branch)]($style)\] ''; }; git_status = { - format = "[($all_status$ahead_behind )]($style)"; - conflicted = "🏳"; - ahead = "⇡\${count}"; - diverged = "⇕⇡\${ahead_count}⇣\${behind_count}"; - behind = "⇣\${count}"; - up_to_date = "✓"; - untracked = "🤷"; - stashed = "📦"; - modified = "📝"; + format = "[($all_status$ahead_behind )]($style)"; + conflicted = "🏳"; + ahead = "⇡\${count}"; + diverged = "⇕⇡\${ahead_count}⇣\${behind_count}"; + behind = "⇣\${count}"; + up_to_date = "✓"; + untracked = "🤷"; + stashed = "📦"; + modified = "📝"; staged = ''[++\($count\)](green)''; - renamed = "👅"; - deleted = "🗑"; + renamed = "👅"; + deleted = "🗑"; }; golang = { - format = ''\[[$symbol($version)]($style)\]''; + format = ''\[[$symbol($version)]($style)\]''; }; hostname = { - format = "[$ssh_symbol$hostname]($style) "; + format = "[$ssh_symbol$hostname]($style) "; }; status = { disabled = false; - success_symbol = "[❱](bold red)[❱](bold yellow)[❱](bold green) "; - symbol = "[❱❱❱](bold red) "; - format = "$symbol"; + success_symbol = "[❱](bold red)[❱](bold yellow)[❱](bold green) "; + symbol = "[❱❱❱](bold red) "; + format = "$symbol"; }; time = { disabled = false; - style = "cyan"; - format = ''\[[$time]($style)\] ''; + style = "cyan"; + format = ''\[[$time]($style)\] ''; }; }; diff --git a/home-manager/neovim-nvim/default.nix b/home-manager/neovim-nvim/default.nix index 452ad03..b8ee0af 100644 --- a/home-manager/neovim-nvim/default.nix +++ b/home-manager/neovim-nvim/default.nix @@ -31,9 +31,19 @@ in viAlias = true; vimAlias = true; vimdiffAlias = true; + +# colorschemes.everforest = { +# enable = true; +# settings = { +# background = "soft"; +# transparent_background = 1; +# }; +# }; + plugins = with pkgs.vimPlugins; [ #gruvbox # theme - tokyonight-nvim + #tokyonight-nvim + sonokai vim-nix # nix language vim-lsp # lsp telescope-nvim # fuzzy finder diff --git a/home-manager/neovim-nvim/nvim.lua b/home-manager/neovim-nvim/nvim.lua index ea46611..4cf1ccf 100644 --- a/home-manager/neovim-nvim/nvim.lua +++ b/home-manager/neovim-nvim/nvim.lua @@ -106,7 +106,7 @@ set splitright let mapleader = "\" -colorscheme tokyonight +colorscheme sonokai set noswapfile