Compare commits
No commits in common. "d13ae86d15b3860eb9bbf52c47d45442063560d6" and "74befe026b1e81fb21df0f952184c0f9ab8d2188" have entirely different histories.
d13ae86d15
...
74befe026b
12 changed files with 202 additions and 255 deletions
144
flake.lock
144
flake.lock
|
@ -39,6 +39,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"crane": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"ironbar",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1698166613,
|
||||||
|
"narHash": "sha256-y4rdN4flxRiROqNi1waMYIZj/Fs7L2OrszFk/1ry9vU=",
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"rev": "b7db46f0f1751f7b1d1911f6be7daf568ad5bc65",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"deploy-rs": {
|
"deploy-rs": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
@ -172,6 +193,24 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681202837,
|
||||||
|
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_2": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_3"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685518550,
|
"lastModified": 1685518550,
|
||||||
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||||
|
@ -295,6 +334,29 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ironbar": {
|
||||||
|
"inputs": {
|
||||||
|
"crane": "crane",
|
||||||
|
"naersk": "naersk",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-overlay": "rust-overlay"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1700509352,
|
||||||
|
"narHash": "sha256-NXXoGCByLY0YSdhpP/ClRMaiy2dmId6l6N8wOah1wDk=",
|
||||||
|
"owner": "JakeStanger",
|
||||||
|
"repo": "ironbar",
|
||||||
|
"rev": "2016a904c17b2089ec6add445b983a3a3f44df5f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "JakeStanger",
|
||||||
|
"repo": "ironbar",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"libnbtplusplus": {
|
"libnbtplusplus": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -311,6 +373,24 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"naersk": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_3"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1698420672,
|
||||||
|
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "naersk",
|
||||||
|
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "naersk",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nh": {
|
"nh": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
|
@ -366,7 +446,7 @@
|
||||||
"nix-gaming": {
|
"nix-gaming": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_3",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700961605,
|
"lastModified": 1700961605,
|
||||||
|
@ -505,6 +585,20 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1698553279,
|
||||||
|
"narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700856099,
|
"lastModified": 1700856099,
|
||||||
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
|
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
|
||||||
|
@ -520,7 +614,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700794826,
|
"lastModified": 1700794826,
|
||||||
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
|
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
|
||||||
|
@ -536,7 +630,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700108881,
|
"lastModified": 1700108881,
|
||||||
"narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
|
"narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
|
||||||
|
@ -558,7 +652,7 @@
|
||||||
"prismlauncher",
|
"prismlauncher",
|
||||||
"flake-compat"
|
"flake-compat"
|
||||||
],
|
],
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils_2",
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"prismlauncher",
|
"prismlauncher",
|
||||||
|
@ -589,7 +683,7 @@
|
||||||
"flake-parts": "flake-parts_4",
|
"flake-parts": "flake-parts_4",
|
||||||
"libnbtplusplus": "libnbtplusplus",
|
"libnbtplusplus": "libnbtplusplus",
|
||||||
"nix-filter": "nix-filter_2",
|
"nix-filter": "nix-filter_2",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"pre-commit-hooks": "pre-commit-hooks"
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -614,14 +708,37 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprland-plugins": "hyprland-plugins",
|
"hyprland-plugins": "hyprland-plugins",
|
||||||
|
"ironbar": "ironbar",
|
||||||
"nh": "nh",
|
"nh": "nh",
|
||||||
"nix-gaming": "nix-gaming",
|
"nix-gaming": "nix-gaming",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"prismlauncher": "prismlauncher",
|
"prismlauncher": "prismlauncher",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": [
|
||||||
|
"ironbar",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1698726852,
|
||||||
|
"narHash": "sha256-V1S4TTzg++GzPc96i/yy4jib+7/xU0LXHcggm9MllMM=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "ec19bd20af08f3b004089cc12ab54c823ed899b7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -673,6 +790,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1667395993,
|
||||||
|
|
|
@ -25,6 +25,10 @@
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
ironbar = {
|
||||||
|
url = "github:JakeStanger/ironbar";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:Mic92/nix-index-database";
|
url = "github:Mic92/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
nfs-utils
|
nfs-utils
|
||||||
dig
|
dig
|
||||||
tailspin
|
tailspin
|
||||||
nitch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
services.gpg-agent = {
|
services.gpg-agent = {
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
./languages.nix
|
./languages.nix
|
||||||
./themes/catppuccin_mocha.nix
|
./themes/catppuccin_mocha.nix
|
||||||
./themes/tokyonight.nix
|
|
||||||
];
|
];
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,174 +0,0 @@
|
||||||
_: {
|
|
||||||
programs.helix = {
|
|
||||||
themes.tokyonight = let
|
|
||||||
red = "#f7768e";
|
|
||||||
orange = "#ff9e64";
|
|
||||||
yellow = "#e0af68";
|
|
||||||
light-green = "#9ece6a";
|
|
||||||
green = "#73daca";
|
|
||||||
turquoise = "#89ddff";
|
|
||||||
light-cyan = "#b4f9f8";
|
|
||||||
teal = "#2ac3de";
|
|
||||||
cyan = "#7dcfff";
|
|
||||||
blue = "#7aa2f7";
|
|
||||||
magenta = "#bb9af7";
|
|
||||||
white = "#c0caf5";
|
|
||||||
light-gray = "#9aa5ce";
|
|
||||||
parameters = "#cfc9c2";
|
|
||||||
comment = "#565f89";
|
|
||||||
black = "#414868";
|
|
||||||
foreground = "#a9b1d6";
|
|
||||||
foreground_highlight = "#c0caf5";
|
|
||||||
foreground_gutter = "#363b54";
|
|
||||||
background = "#1a1b26";
|
|
||||||
background_highlight = "#30374b";
|
|
||||||
background_menu = "#16161e";
|
|
||||||
in {
|
|
||||||
"comment" = {
|
|
||||||
fg = comment;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
"constant" = {fg = orange;};
|
|
||||||
"constant.character.escape" = {fg = magenta;};
|
|
||||||
"function" = {
|
|
||||||
fg = blue;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
"function.macro" = {fg = cyan;};
|
|
||||||
"keyword" = {
|
|
||||||
fg = cyan;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
"keyword.control" = {fg = magenta;};
|
|
||||||
"keyword.control.import" = {fg = cyan;};
|
|
||||||
"keyword.operator" = {fg = turquoise;};
|
|
||||||
"keyword.function" = {
|
|
||||||
fg = magenta;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
"operator" = {fg = turquoise;};
|
|
||||||
"punctuation" = {fg = turquoise;};
|
|
||||||
"string" = {fg = light-green;};
|
|
||||||
"string.regexp" = {fg = "light-blue";};
|
|
||||||
"tag" = {fg = red;};
|
|
||||||
"type" = {fg = teal;};
|
|
||||||
"namespace" = {fg = blue;};
|
|
||||||
"variable" = {fg = white;};
|
|
||||||
"variable.builtin" = {fg = red;};
|
|
||||||
"variable.other.member" = {fg = green;};
|
|
||||||
"variable.parameter" = {
|
|
||||||
fg = yellow;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
|
|
||||||
"diff.plus" = {fg = green;};
|
|
||||||
"diff.delta" = {fg = orange;};
|
|
||||||
"diff.minus" = {fg = red;};
|
|
||||||
|
|
||||||
"ui.background" = {fg = foreground;};
|
|
||||||
|
|
||||||
"ui.cursor" = {modifiers = ["reversed"];};
|
|
||||||
"ui.cursor.match" = {
|
|
||||||
fg = orange;
|
|
||||||
modifiers = ["bold"];
|
|
||||||
};
|
|
||||||
"ui.cursor.primary" = {modifiers = ["reversed"];};
|
|
||||||
"ui.cursorline.primary" = {bg = background_menu;};
|
|
||||||
"ui.help" = {
|
|
||||||
fg = foreground;
|
|
||||||
bg = background_menu;
|
|
||||||
};
|
|
||||||
"ui.linenr" = {fg = foreground_gutter;};
|
|
||||||
"ui.linenr.selected" = {fg = foreground;};
|
|
||||||
"ui.menu" = {
|
|
||||||
fg = foreground;
|
|
||||||
bg = background_menu;
|
|
||||||
};
|
|
||||||
"ui.menu.selected" = {bg = background_highlight;};
|
|
||||||
"ui.popup" = {
|
|
||||||
fg = foreground;
|
|
||||||
bg = background_menu;
|
|
||||||
};
|
|
||||||
"ui.selection" = {bg = background_highlight;};
|
|
||||||
"ui.selection.primary" = {bg = background_highlight;};
|
|
||||||
"ui.statusline" = {
|
|
||||||
fg = foreground;
|
|
||||||
bg = background_menu;
|
|
||||||
};
|
|
||||||
"ui.statusline.inactive" = {
|
|
||||||
fg = foreground_gutter;
|
|
||||||
bg = background_menu;
|
|
||||||
};
|
|
||||||
"ui.statusline.normal" = {
|
|
||||||
fg = black;
|
|
||||||
bg = blue;
|
|
||||||
};
|
|
||||||
"ui.statusline.insert" = {
|
|
||||||
fg = black;
|
|
||||||
bg = green;
|
|
||||||
};
|
|
||||||
"ui.statusline.select" = {
|
|
||||||
fg = black;
|
|
||||||
bg = magenta;
|
|
||||||
};
|
|
||||||
"ui.text" = {fg = foreground;};
|
|
||||||
"ui.text.focus" = {fg = cyan;};
|
|
||||||
"ui.virtual.ruler" = {bg = foreground_gutter;};
|
|
||||||
"ui.virtual.whitespace" = {fg = foreground_gutter;};
|
|
||||||
"ui.virtual.inlay-hint" = {fg = comment;};
|
|
||||||
"ui.window" = {fg = black;};
|
|
||||||
|
|
||||||
"error" = {fg = red;};
|
|
||||||
"warning" = {fg = yellow;};
|
|
||||||
"info" = {fg = blue;};
|
|
||||||
"hint" = {fg = teal;};
|
|
||||||
"diagnostic.error" = {
|
|
||||||
underline = {
|
|
||||||
style = "curl";
|
|
||||||
color = red;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"diagnostic.warning" = {
|
|
||||||
underline = {
|
|
||||||
style = "curl";
|
|
||||||
color = yellow;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"diagnostic.info" = {
|
|
||||||
underline = {
|
|
||||||
style = "curl";
|
|
||||||
color = blue;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"diagnostic.hint" = {
|
|
||||||
underline = {
|
|
||||||
style = "curl";
|
|
||||||
color = teal;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"special" = {fg = orange;};
|
|
||||||
|
|
||||||
"markup.heading" = {
|
|
||||||
fg = cyan;
|
|
||||||
modifiers = ["bold"];
|
|
||||||
};
|
|
||||||
"markup.list" = {fg = cyan;};
|
|
||||||
"markup.bold" = {
|
|
||||||
fg = orange;
|
|
||||||
modifiers = ["bold"];
|
|
||||||
};
|
|
||||||
"markup.italic" = {
|
|
||||||
fg = yellow;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
"markup.strikethrough" = {modifiers = ["crossed_out"];};
|
|
||||||
"markup.link.url" = {fg = green;};
|
|
||||||
"markup.link.text" = {fg = light-gray;};
|
|
||||||
"markup.quote" = {
|
|
||||||
fg = yellow;
|
|
||||||
modifiers = ["italic"];
|
|
||||||
};
|
|
||||||
"markup.raw" = {fg = cyan;};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -14,7 +14,7 @@ alias cat = bat
|
||||||
alias rm = rm -i
|
alias rm = rm -i
|
||||||
alias cp = cp -i
|
alias cp = cp -i
|
||||||
alias mv = mv -i
|
alias mv = mv -i
|
||||||
alias build = nh os switch . --nom
|
alias rebuild = nh os switch . --nom
|
||||||
alias clean = sudo nh clean all
|
alias clean = sudo nh clean all
|
||||||
alias sakura = nix run github:serokell/deploy-rs ".#sakura"
|
alias sakura = nix run github:serokell/deploy-rs ".#sakura"
|
||||||
alias kariru = nix run github:serokell/deploy-rs ".#kariru"
|
alias kariru = nix run github:serokell/deploy-rs ".#kariru"
|
||||||
|
@ -28,8 +28,7 @@ alias sxfix = nix run "nixpkgs#statix" -- fix
|
||||||
alias dl = yt-dlp -P ~/Videos/downloaded
|
alias dl = yt-dlp -P ~/Videos/downloaded
|
||||||
alias dlcd = yt-dlp
|
alias dlcd = yt-dlp
|
||||||
alias up = rpaste -s "https://i.flake.sh/" -e 1day
|
alias up = rpaste -s "https://i.flake.sh/" -e 1day
|
||||||
alias tail = tspin
|
alias tail = spin
|
||||||
nitch
|
|
||||||
|
|
||||||
$env.config = {
|
$env.config = {
|
||||||
|
|
||||||
|
|
|
@ -18,10 +18,10 @@ def create_right_prompt [] {
|
||||||
|
|
||||||
$env.PROMPT_COMMAND = {|| create_left_prompt }
|
$env.PROMPT_COMMAND = {|| create_left_prompt }
|
||||||
$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
|
$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
|
||||||
$env.PROMPT_INDICATOR = {|| "" }
|
$env.PROMPT_INDICATOR = {|| "〉" }
|
||||||
$env.PROMPT_INDICATOR_VI_INSERT = {|| "" }
|
$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
|
||||||
$env.PROMPT_INDICATOR_VI_NORMAL = {|| "" }
|
$env.PROMPT_INDICATOR_VI_NORMAL = {|| "〉" }
|
||||||
$env.PROMPT_MULTILINE_INDICATOR = {|| "" }
|
$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
|
||||||
$env.ENV_CONVERSIONS = {
|
$env.ENV_CONVERSIONS = {
|
||||||
"PATH": {
|
"PATH": {
|
||||||
from_string: { |s| $s | split row (char esep) | path expand -n }
|
from_string: { |s| $s | split row (char esep) | path expand -n }
|
||||||
|
|
|
@ -9,62 +9,43 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
enableNushellIntegration = true;
|
enableNushellIntegration = true;
|
||||||
settings = {
|
settings = {
|
||||||
palette = "tokyonight";
|
|
||||||
add_newline = false;
|
|
||||||
palettes.tokyonight = {
|
|
||||||
red = "#f7768e";
|
|
||||||
orange = "#ff9e64";
|
|
||||||
yellow = "#e0af68";
|
|
||||||
light-green = "#9ece6a";
|
|
||||||
green = "#73daca";
|
|
||||||
turquoise = "#89ddff";
|
|
||||||
light-cyan = "#b4f9f8";
|
|
||||||
teal = "#2ac3de";
|
|
||||||
cyan = "#7dcfff";
|
|
||||||
blue = "#7aa2f7";
|
|
||||||
magenta = "#bb9af7";
|
|
||||||
white = "#c0caf5";
|
|
||||||
light-gray = "#9aa5ce";
|
|
||||||
parameters = "#cfc9c2";
|
|
||||||
comment = "#565f89";
|
|
||||||
black = "#414868";
|
|
||||||
foreground = "#a9b1d6";
|
|
||||||
background = "#1a1b26";
|
|
||||||
};
|
|
||||||
format = lib.concatStrings [
|
format = lib.concatStrings [
|
||||||
"$character"
|
"[░▒▓](#f5c2e7)"
|
||||||
|
"$username"
|
||||||
"$hostname"
|
"$hostname"
|
||||||
|
"[](bg:#f38ba8 fg:#f5c2e7)"
|
||||||
"$directory"
|
"$directory"
|
||||||
|
"[](fg:#f38ba8 bg:#eb7c92)"
|
||||||
"$git_branch"
|
"$git_branch"
|
||||||
"$git_status"
|
"$git_status"
|
||||||
"$rust"
|
"[](fg:#eb7c92 bg:#e6657f)"
|
||||||
|
"$c"
|
||||||
"$golang"
|
"$golang"
|
||||||
|
"$nodejs"
|
||||||
|
"$rust"
|
||||||
|
"$docker_context"
|
||||||
|
"[](fg:#e6657f bg:#e05a75)"
|
||||||
|
"$time"
|
||||||
|
"[](fg:#e05a75)"
|
||||||
];
|
];
|
||||||
right_format = lib.concatStrings [
|
|
||||||
"$nix_shell"
|
|
||||||
];
|
|
||||||
character = {
|
|
||||||
error_symbol = "[](bold red)";
|
|
||||||
success_symbol = "[](bold teal)";
|
|
||||||
};
|
|
||||||
username = {
|
username = {
|
||||||
show_always = false;
|
show_always = true;
|
||||||
format = "[$user]($style)";
|
style_user = "bg:#f5c2e7 fg:#11111b";
|
||||||
style_user = "red";
|
style_root = "bg:#f5c2e7 fg:#11111b";
|
||||||
|
format = "[ $user]($style)";
|
||||||
};
|
};
|
||||||
hostname = {
|
hostname = {
|
||||||
ssh_symbol = "🌐";
|
ssh_symbol = "";
|
||||||
format = "[on $hostname $ssh_symbol]($style)";
|
style = "bg:#f5c2e7 fg:#11111b";
|
||||||
ssh_only = true;
|
format = "[@$hostname]($style)";
|
||||||
|
ssh_only = false;
|
||||||
disabled = false;
|
disabled = false;
|
||||||
};
|
};
|
||||||
directory = {
|
directory = {
|
||||||
|
style = "bg:#f38ba8 fg:#11111b";
|
||||||
format = "[ $path ]($style)";
|
format = "[ $path ]($style)";
|
||||||
truncation_length = 3;
|
truncation_length = 3;
|
||||||
truncation_symbol = "…/";
|
truncation_symbol = "…/";
|
||||||
read_only = "🔒";
|
|
||||||
style = "teal";
|
|
||||||
home_symbol = "";
|
|
||||||
};
|
};
|
||||||
directory.substitutions = {
|
directory.substitutions = {
|
||||||
"Documents" = " ";
|
"Documents" = " ";
|
||||||
|
@ -72,33 +53,45 @@
|
||||||
"Music" = " ";
|
"Music" = " ";
|
||||||
"Pictures" = " ";
|
"Pictures" = " ";
|
||||||
};
|
};
|
||||||
nix_shell = {
|
c = {
|
||||||
disabled = false;
|
symbol = " ";
|
||||||
impure_msg = "[impure shell](bold red)";
|
style = "bg:#e6657f fg:#11111b";
|
||||||
pure_msg = "[pure shell](bold green)";
|
format = "[ $symbol ($version) ]($style)";
|
||||||
unknown_msg = "[unknown shell](bold yellow)";
|
};
|
||||||
format = "via [ $state( \($name\))](bold teal)";
|
docker_context = {
|
||||||
|
symbol = " ";
|
||||||
|
style = "bg:#e6657f fg:#11111b";
|
||||||
|
format = "[ $symbol $context ]($style) $path";
|
||||||
};
|
};
|
||||||
git_branch = {
|
git_branch = {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
|
style = "bg:#eb7c92 fg:#11111b";
|
||||||
format = "[ $symbol $branch ]($style)";
|
format = "[ $symbol $branch ]($style)";
|
||||||
};
|
};
|
||||||
git_status = {
|
git_status = {
|
||||||
|
style = "bg:#eb7c92 fg:#11111b";
|
||||||
format = "[$all_status$ahead_behind ]($style)";
|
format = "[$all_status$ahead_behind ]($style)";
|
||||||
};
|
};
|
||||||
golang = {
|
golang = {
|
||||||
symbol = " ";
|
symbol = " ";
|
||||||
|
style = "bg:#e6657f fg:#11111b";
|
||||||
|
format = "[ $symbol ($version) ]($style)";
|
||||||
|
};
|
||||||
|
nodejs = {
|
||||||
|
symbol = "";
|
||||||
|
style = "bg:#e6657f fg:#11111b";
|
||||||
format = "[ $symbol ($version) ]($style)";
|
format = "[ $symbol ($version) ]($style)";
|
||||||
};
|
};
|
||||||
rust = {
|
rust = {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
|
style = "bg:#e6657f fg:#11111b";
|
||||||
format = "[ $symbol ($version) ]($style)";
|
format = "[ $symbol ($version) ]($style)";
|
||||||
};
|
};
|
||||||
time = {
|
time = {
|
||||||
disabled = false;
|
disabled = false;
|
||||||
time_format = "%R";
|
time_format = "%R"; # Hour:Minute Format
|
||||||
|
style = "bg:#e05a75 fg:#11111b";
|
||||||
format = "[ $time ]($style)";
|
format = "[ $time ]($style)";
|
||||||
style = "red";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,12 +1,4 @@
|
||||||
{pkgs, ...}: {
|
_: {
|
||||||
xdg.configFile."hypr/hyprpaper.conf".text = ''
|
|
||||||
preload = ~/Pictures/wallpapers/city.png
|
|
||||||
wallpaper = HDMI-A-1,~/Pictures/wallpapers/city.png
|
|
||||||
wallpaper = DP-1,~/Pictures/wallpapers/city.png
|
|
||||||
wallpaper = DP-2,~/Pictures/wallpapers/city.png
|
|
||||||
wallpaper = DP-3,~/Pictures/wallpapers/city.png
|
|
||||||
'';
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland.extraConfig = ''
|
wayland.windowManager.hyprland.extraConfig = ''
|
||||||
|
|
||||||
monitor = HDMI-A-1,1920x1080@60, 3640x560, auto, transform, 3 #right
|
monitor = HDMI-A-1,1920x1080@60, 3640x560, auto, transform, 3 #right
|
||||||
|
@ -90,9 +82,10 @@
|
||||||
disable_hyprland_logo = true
|
disable_hyprland_logo = true
|
||||||
}
|
}
|
||||||
|
|
||||||
exec-once = hyprpaper
|
exec-once = swww init
|
||||||
|
|
||||||
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||||
exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
|
exec-once = /nix/store/gjbi20m2wz9xhm18ifmcdl45cpgd7hpz-polkit-gnome-0.105/libexec/polkit-gnome-authentication-agent-1
|
||||||
|
|
||||||
# swayidle / lock
|
# swayidle / lock
|
||||||
exec-once = ~/.local/bin/lock
|
exec-once = ~/.local/bin/lock
|
||||||
|
@ -105,7 +98,6 @@
|
||||||
windowrulev2 = float, title:^(Friends List)$
|
windowrulev2 = float, title:^(Friends List)$
|
||||||
windowrulev2 = float, title:^(Cryptomator)$
|
windowrulev2 = float, title:^(Cryptomator)$
|
||||||
windowrulev2 = float, title:^(RuneLite)$
|
windowrulev2 = float, title:^(RuneLite)$
|
||||||
windowrulev2 = float, title:^(Lutris)$
|
|
||||||
windowrulev2 = move 850 360, title:^(RuneLite)$
|
windowrulev2 = move 850 360, title:^(RuneLite)$
|
||||||
windowrulev2 = size 830 600, title:^(RuneLite)$
|
windowrulev2 = size 830 600, title:^(RuneLite)$
|
||||||
windowrulev2 = fullscreen, title:^(cs2)$
|
windowrulev2 = fullscreen, title:^(cs2)$
|
||||||
|
|
|
@ -26,11 +26,12 @@ in {
|
||||||
slurp
|
slurp
|
||||||
swappy
|
swappy
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
wlogout
|
||||||
wlr-randr
|
wlr-randr
|
||||||
swayidle
|
swayidle
|
||||||
swaylock-effects
|
swaylock-effects
|
||||||
|
swww
|
||||||
hyprpicker
|
hyprpicker
|
||||||
hyprpaper
|
|
||||||
];
|
];
|
||||||
|
|
||||||
services.dbus.enable = true;
|
services.dbus.enable = true;
|
||||||
|
|
|
@ -15,5 +15,5 @@ return {
|
||||||
enable_tab_bar = false,
|
enable_tab_bar = false,
|
||||||
color_scheme = 'tokyonight',
|
color_scheme = 'tokyonight',
|
||||||
|
|
||||||
window_padding = { top = 20, bottom = 20, left = 20, right = 20 }
|
window_padding = { top = 0, bottom = 0, left = 0, right = 0 }
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://hyprland.cachix.org"
|
"https://hyprland.cachix.org"
|
||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
|
"https://jakestanger.cachix.org"
|
||||||
"https://cache.garnix.io"
|
"https://cache.garnix.io"
|
||||||
"https://nix-gaming.cachix.org"
|
"https://nix-gaming.cachix.org"
|
||||||
"https://anyrun.cachix.org"
|
"https://anyrun.cachix.org"
|
||||||
|
@ -34,6 +35,7 @@
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
|
"jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM="
|
||||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||||
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
|
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
|
||||||
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
|
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
|
||||||
|
|
Loading…
Reference in a new issue