From 840b47e7a059f05561194e14ac593a3cb1584df1 Mon Sep 17 00:00:00 2001 From: cnst Date: Sun, 30 Jun 2024 14:36:04 +0200 Subject: [PATCH] added a kitty --- flake.lock | 115 +--------------------------------- flake.nix | 2 - home/core/shell/cnst.nix | 6 +- home/extra/cnst.nix | 3 +- home/extra/kitty/default.nix | 7 +++ home/extra/zellij/default.nix | 28 +-------- 6 files changed, 12 insertions(+), 149 deletions(-) create mode 100644 home/extra/kitty/default.nix diff --git a/flake.lock b/flake.lock index 83add693..b6982c7a 100644 --- a/flake.lock +++ b/flake.lock @@ -37,27 +37,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "zjstatus", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718730147, - "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", - "owner": "ipetkov", - "repo": "crane", - "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "firefox-nightly": { "inputs": { "cachix": "cachix", @@ -264,24 +243,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -590,22 +551,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -643,8 +588,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", - "systems": "systems_3", - "zjstatus": "zjstatus" + "systems": "systems_3" } }, "rust-overlay": { @@ -672,27 +616,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "zjstatus", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -737,42 +660,6 @@ "repo": "default-linux", "type": "github" } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zjstatus": { - "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1719650330, - "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=", - "owner": "dj95", - "repo": "zjstatus", - "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14", - "type": "github" - }, - "original": { - "owner": "dj95", - "repo": "zjstatus", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f704c7fd..d0ceddf2 100644 --- a/flake.nix +++ b/flake.nix @@ -25,8 +25,6 @@ url = "github:nix-community/flake-firefox-nightly"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Zellij Plugins - zjstatus.url = "github:dj95/zjstatus"; }; outputs = { self, diff --git a/home/core/shell/cnst.nix b/home/core/shell/cnst.nix index a9cd7fd9..acc17c87 100644 --- a/home/core/shell/cnst.nix +++ b/home/core/shell/cnst.nix @@ -1,7 +1,7 @@ -{ config, ... }: -{ +{config, ...}: { programs.zsh = { enable = true; + dotDir = ".config/zsh"; enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; @@ -28,8 +28,6 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241' eval $(thefuck --alias) eval $(thefuck --alias FUCK) - - eval "$(zellij setup --generate-auto-start zsh)" ''; }; } diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix index b189e77c..48516f1e 100644 --- a/home/extra/cnst.nix +++ b/home/extra/cnst.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - ./zellij + ./kitty ./firefox ./neovim ./lutris @@ -22,7 +22,6 @@ # UTILITY wl-clipboard - inputs.zjstatus.packages.${system}.default xfce.thunar-volman xfce.thunar-archive-plugin gnome.file-roller diff --git a/home/extra/kitty/default.nix b/home/extra/kitty/default.nix new file mode 100644 index 00000000..4811f906 --- /dev/null +++ b/home/extra/kitty/default.nix @@ -0,0 +1,7 @@ +{ + programs.kitty = { + enable = true; + theme = "GruvboxMaterialDarkMedium"; + font = "JetBrainsMono Nerd Font 11"; + }; +} diff --git a/home/extra/zellij/default.nix b/home/extra/zellij/default.nix index df7591df..cc6c8d1f 100644 --- a/home/extra/zellij/default.nix +++ b/home/extra/zellij/default.nix @@ -1,7 +1,7 @@ { programs.zellij = { enable = true; - enableZshIntegration = true; + enableZshIntegration = false; }; home.shellAliases = { zr = "zellij run --"; @@ -74,30 +74,4 @@ } } ''; - xdg.configFile."zellij/layouts/gruvbox.kdl".text = '' - layout { - pane split_direction="vertical" { - pane - } - - pane size=1 borderless=true { - plugin location="file:/home/cnst/.nix-profile/bin/zjstatus.wasm" { - format_left "#[fg=#FBF1C7,bold] {session} {mode} {tabs}" - format_right "#[bg=#8A8A8A,fg=#3C3836] #[bg=#8A8A8A,fg=#3C3836,bold]{swap_layout} #[bg=#3C3836,fg=#8A8A8A]" - - mode_locked "#[fg=#B16286,bold] {name} " - mode_normal "#[fg=#98971A,bold] {name} " - mode_resize "#[fg=#D75F00,bold] {name} " - mode_default_to_mode "resize" - - tab_normal "#[bg=#8A8A8A,fg=#3C3836] #[bg=#8A8A8A,fg=#3C3836,bold]{name} {sync_indicator}{fullscreen_indicator}{floating_indicator} #[bg=#3C3836,fg=#8A8A8A]" - tab_active "#[bg=#98971A,fg=#3C3836] #[bg=#98971A,fg=#3C3836,bold]{name} {sync_indicator}{fullscreen_indicator}{floating_indicator} #[bg=#3C3836,fg=#98971A]" - - tab_sync_indicator " " - tab_fullscreen_indicator "□ " - tab_floating_indicator "󰉈 " - } - } - } - ''; }