more stuff
This commit is contained in:
parent
42a0bf27e0
commit
fe34badada
GPG key ID:
60FF63B4826B7400
24 changed files with 904 additions and 2343 deletions
18
common/style/vars/grymforge.nix
Normal file
18
common/style/vars/grymforge.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
rounding = 25;
|
||||||
|
gaps-in = 12;
|
||||||
|
gaps-out = 12 * 2;
|
||||||
|
active-opacity = 1;
|
||||||
|
inactive-opacity = 0.87;
|
||||||
|
blur = true;
|
||||||
|
border-size = 3;
|
||||||
|
animation-speed = "slow"; # "fast" | "medium" | "slow"
|
||||||
|
fetch = "fastfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
||||||
|
|
||||||
|
bar = {
|
||||||
|
position = "top"; # "top" | "bottom"
|
||||||
|
transparent = true;
|
||||||
|
transparentButtons = false;
|
||||||
|
floating = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
229
flake.lock
generated
229
flake.lock
generated
|
|
@ -465,7 +465,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
|
|
@ -504,7 +504,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -1031,6 +1031,32 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hyprland-qt-support": {
|
||||||
|
"inputs": {
|
||||||
|
"hyprlang": "hyprlang_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737634706,
|
||||||
|
"narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprland-qt-support",
|
||||||
|
"rev": "8810df502cdee755993cb803eba7b23f189db795",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprland-qt-support",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"hyprland-qtutils": {
|
"hyprland-qtutils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprutils": [
|
"hyprutils": [
|
||||||
|
|
@ -1065,10 +1091,10 @@
|
||||||
"aquamarine": "aquamarine_2",
|
"aquamarine": "aquamarine_2",
|
||||||
"hyprcursor": "hyprcursor_2",
|
"hyprcursor": "hyprcursor_2",
|
||||||
"hyprland-protocols": "hyprland-protocols_2",
|
"hyprland-protocols": "hyprland-protocols_2",
|
||||||
"hyprlang": "hyprlang_2",
|
"hyprlang": "hyprlang_3",
|
||||||
"hyprutils": "hyprutils_2",
|
"hyprutils": "hyprutils_4",
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner_2",
|
"hyprwayland-scanner": "hyprwayland-scanner_2",
|
||||||
"nixpkgs": "nixpkgs_6",
|
"nixpkgs": "nixpkgs_7",
|
||||||
"pre-commit-hooks": "pre-commit-hooks_2",
|
"pre-commit-hooks": "pre-commit-hooks_2",
|
||||||
"systems": [
|
"systems": [
|
||||||
"hyprspace",
|
"hyprspace",
|
||||||
|
|
@ -1120,6 +1146,34 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprlang_2": {
|
"hyprlang_2": {
|
||||||
|
"inputs": {
|
||||||
|
"hyprutils": "hyprutils_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"hyprland-qt-support",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"hyprland-qt-support",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737634606,
|
||||||
|
"narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprlang",
|
||||||
|
"rev": "f41271d35cc0f370d300413d756c2677f386af9d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprlang",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"hyprlang_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprutils": [
|
"hyprutils": [
|
||||||
"hyprspace",
|
"hyprspace",
|
||||||
|
|
@ -1170,10 +1224,31 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hyprpolkitagent": {
|
||||||
|
"inputs": {
|
||||||
|
"hyprland-qt-support": "hyprland-qt-support",
|
||||||
|
"hyprutils": "hyprutils_3",
|
||||||
|
"nixpkgs": "nixpkgs_6",
|
||||||
|
"systems": "systems_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1739049006,
|
||||||
|
"narHash": "sha256-AlvqgzQTaSWepmfNHugQM+aSuhsNaLUU95y5VzdbuI8=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprpolkitagent",
|
||||||
|
"rev": "3bef8bf8fcac95339d1e8cab3addbe83a7f99d57",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprpolkitagent",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"hyprspace": {
|
"hyprspace": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland": "hyprland_2",
|
"hyprland": "hyprland_2",
|
||||||
"systems": "systems_2"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736162631,
|
"lastModified": 1736162631,
|
||||||
|
|
@ -1215,6 +1290,60 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprutils_2": {
|
"hyprutils_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"hyprland-qt-support",
|
||||||
|
"hyprlang",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"hyprland-qt-support",
|
||||||
|
"hyprlang",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737632363,
|
||||||
|
"narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprutils",
|
||||||
|
"rev": "006620eb29d54ea9086538891404c78563d1bae1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprutils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"hyprutils_3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprpolkitagent",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737632363,
|
||||||
|
"narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprutils",
|
||||||
|
"rev": "006620eb29d54ea9086538891404c78563d1bae1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprutils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"hyprutils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprspace",
|
"hyprspace",
|
||||||
|
|
@ -1460,6 +1589,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731763621,
|
||||||
|
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_11": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715534503,
|
"lastModified": 1715534503,
|
||||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||||
|
|
@ -1540,6 +1685,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737469691,
|
||||||
|
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729413321,
|
"lastModified": 1729413321,
|
||||||
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
|
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
|
||||||
|
|
@ -1555,7 +1716,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736883708,
|
"lastModified": 1736883708,
|
||||||
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
|
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
|
||||||
|
|
@ -1571,7 +1732,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736344531,
|
"lastModified": 1736344531,
|
||||||
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
||||||
|
|
@ -1587,22 +1748,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731763621,
|
|
||||||
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixvim": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"devshell": "devshell",
|
"devshell": "devshell",
|
||||||
|
|
@ -1611,7 +1756,7 @@
|
||||||
"git-hooks": "git-hooks_2",
|
"git-hooks": "git-hooks_2",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_9",
|
||||||
"nuschtosSearch": "nuschtosSearch",
|
"nuschtosSearch": "nuschtosSearch",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
|
|
@ -1729,9 +1874,10 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprpanel": "hyprpanel",
|
"hyprpanel": "hyprpanel",
|
||||||
|
"hyprpolkitagent": "hyprpolkitagent",
|
||||||
"hyprspace": "hyprspace",
|
"hyprspace": "hyprspace",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
"pre-commit-hooks": "pre-commit-hooks_3",
|
"pre-commit-hooks": "pre-commit-hooks_3",
|
||||||
|
|
@ -1742,7 +1888,7 @@
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_9"
|
"nixpkgs": "nixpkgs_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736808430,
|
"lastModified": 1736808430,
|
||||||
|
|
@ -1773,7 +1919,7 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems_4",
|
"systems": "systems_5",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-tmux": "tinted-tmux",
|
"tinted-tmux": "tinted-tmux",
|
||||||
|
|
@ -1798,7 +1944,7 @@
|
||||||
"flake-compat": "flake-compat_7",
|
"flake-compat": "flake-compat_7",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"gomod2nix": "gomod2nix",
|
"gomod2nix": "gomod2nix",
|
||||||
"nixpkgs": "nixpkgs_10"
|
"nixpkgs": "nixpkgs_11"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736149529,
|
"lastModified": 1736149529,
|
||||||
|
|
@ -1846,16 +1992,16 @@
|
||||||
},
|
},
|
||||||
"systems_3": {
|
"systems_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1689347949,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default-linux",
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default-linux",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -1889,6 +2035,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"tinted-foot": {
|
"tinted-foot": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
# at the same time. Here's an working example:
|
# at the same time. Here's an working example:
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
|
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
|
||||||
|
hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
|
||||||
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
||||||
hyprspace = {
|
hyprspace = {
|
||||||
url = "github:KZDKM/Hyprspace";
|
url = "github:KZDKM/Hyprspace";
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -22,7 +22,8 @@
|
||||||
./candlekeep/variables.nix
|
./candlekeep/variables.nix
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
../modules/common.nix
|
../modules/common.nix
|
||||||
../modules/hyprland.nix
|
# ../modules/hyprland.nix
|
||||||
|
../modules/hyprland
|
||||||
../modules/common-gui.nix
|
../modules/common-gui.nix
|
||||||
../modules/linux-gui.nix
|
../modules/linux-gui.nix
|
||||||
../modules/devenv.nix
|
../modules/devenv.nix
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,8 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
{
|
||||||
# You can import other home-manager modules here
|
# You can import other home-manager modules here
|
||||||
imports = [
|
imports = [
|
||||||
# If you want to use modules your own flake exports (from modules/home-manager):
|
# If you want to use modules your own flake exports (from modules/home-manager):
|
||||||
|
|
@ -17,8 +18,14 @@
|
||||||
# inputs.nix-colors.homeManagerModules.default
|
# inputs.nix-colors.homeManagerModules.default
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
|
|
||||||
|
./candlekeep/variables.nix
|
||||||
|
../modules/hyprpanel.nix
|
||||||
|
../modules/hyprlock.nix
|
||||||
|
# ../modules/hypridle.nix
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
../modules/common.nix
|
../modules/common.nix
|
||||||
|
|
||||||
../modules/hyprland.nix
|
../modules/hyprland.nix
|
||||||
../modules/common-gui.nix
|
../modules/common-gui.nix
|
||||||
../modules/linux-gui.nix
|
../modules/linux-gui.nix
|
||||||
|
|
@ -106,7 +113,7 @@
|
||||||
|
|
||||||
# Add stuff for your user as you see fit:
|
# Add stuff for your user as you see fit:
|
||||||
# programs.neovim.enable = true;
|
# programs.neovim.enable = true;
|
||||||
home.packages = with pkgs; [openvpn];
|
home.packages = with pkgs; [ openvpn ];
|
||||||
|
|
||||||
# Enable home-manager and git
|
# Enable home-manager and git
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
|
||||||
26
home-manager/machines/grymforge/variables.nix
Normal file
26
home-manager/machines/grymforge/variables.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
{ config, ... }:
|
||||||
|
{
|
||||||
|
imports = [ ../../../common/nixos/variables-config.nix ];
|
||||||
|
|
||||||
|
config.var = {
|
||||||
|
hostname = "grymforge";
|
||||||
|
username = "gwg313";
|
||||||
|
configDirectory = "/home/" + config.var.username + "/.config/nixos";
|
||||||
|
|
||||||
|
keyboardLayout = "en_US";
|
||||||
|
|
||||||
|
location = "Ottawa";
|
||||||
|
timeZone = "American/Toronto";
|
||||||
|
defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
|
git = {
|
||||||
|
username = "gwg313";
|
||||||
|
email = "gwg313@pm.me";
|
||||||
|
};
|
||||||
|
|
||||||
|
autoUpgrade = true;
|
||||||
|
autoGarbageCollector = true;
|
||||||
|
|
||||||
|
theme = import ../../../common/style/vars/grymforge.nix;
|
||||||
|
};
|
||||||
|
}
|
||||||
6
home-manager/modules/btop.nix
Normal file
6
home-manager/modules/btop.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
programs.btop = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
./atuin.nix
|
./atuin.nix
|
||||||
./bat.nix
|
./bat.nix
|
||||||
|
./btop.nix
|
||||||
# ./broot.nix
|
# ./broot.nix
|
||||||
./eza.nix
|
./eza.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
|
|
@ -23,11 +24,13 @@
|
||||||
home.packages =
|
home.packages =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
ghostty
|
|
||||||
# Editors
|
# Editors
|
||||||
# neovim # Improved version of vim, often used with overlays.
|
# neovim # Improved version of vim, often used with overlays.
|
||||||
vim # Highly configurable text editor popular for efficiency and extensibility.
|
vim # Highly configurable text editor popular for efficiency and extensibility.
|
||||||
|
|
||||||
|
sshfs
|
||||||
|
lurk
|
||||||
|
|
||||||
# Builtin Replacements
|
# Builtin Replacements
|
||||||
bottom # Similar to 'htop,' providing a top-like interface with additional features.
|
bottom # Similar to 'htop,' providing a top-like interface with additional features.
|
||||||
colordiff # Tool to colorize 'diff' output, making differences between files easier to spot.
|
colordiff # Tool to colorize 'diff' output, making differences between files easier to spot.
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,12 @@
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
settings = {
|
settings = {
|
||||||
auto-update = "off";
|
auto-update = "off";
|
||||||
background-opacity = 0.8;
|
# background-opacity = 0.8;
|
||||||
|
background-opacity = 1;
|
||||||
confirm-close-surface = false;
|
confirm-close-surface = false;
|
||||||
font-family = "Comic Code Ligatures";
|
font-family = lib.mkForce "Comic Code Ligatures";
|
||||||
font-size = 14;
|
font-size = 16;
|
||||||
|
gtk-titlebar = false;
|
||||||
# theme = "Teerb";
|
# theme = "Teerb";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,14 +99,14 @@
|
||||||
# general binds
|
# general binds
|
||||||
",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid
|
",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid
|
||||||
# "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty"
|
# "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty"
|
||||||
"$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty"
|
"$mod, RETURN, exec, ${pkgs.ghostty}/bin/ghostty"
|
||||||
"$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
|
"$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
|
||||||
"$mod, Q, killactive"
|
"$mod, Q, killactive"
|
||||||
"SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout"
|
"SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout"
|
||||||
"$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle
|
"$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle
|
||||||
"SUPER_SHIFT, SPACE, togglefloating"
|
"SUPER_SHIFT, SPACE, togglefloating"
|
||||||
# "$mod, F, fullscreen"
|
"$mod, F, fullscreen"
|
||||||
"$mod,F, exec, hyprfocus-toggle" # Toggle HyprFocus
|
# "$mod,F, exec, hyprfocus-toggle" # Toggle HyprFocus
|
||||||
"$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
"$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||||
"$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png"
|
"$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png"
|
||||||
"SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard
|
"SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard
|
||||||
|
|
@ -167,7 +167,15 @@
|
||||||
"$mod_ALT, mouse:272, resizewindow"
|
"$mod_ALT, mouse:272, resizewindow"
|
||||||
];
|
];
|
||||||
|
|
||||||
monitor = [ ",preferred,auto,1" ];
|
monitor = [
|
||||||
|
# "eDP-1,highres,0x0,1"
|
||||||
|
# "DP-1,preferred,0x0,1"
|
||||||
|
# "HDMI-A-1,2560x0,auto,1"
|
||||||
|
",preferred,auto,1"
|
||||||
|
];
|
||||||
|
# monitor = [ "DP-1,preferred,0x0,1" ];
|
||||||
|
# monitor = [ "HDMI-A-1,2560x0,auto,1" ];
|
||||||
|
|
||||||
# monitor = [ "HDMI-A-1,1920x1080@144,auto,1" ];
|
# monitor = [ "HDMI-A-1,1920x1080@144,auto,1" ];
|
||||||
exec = [ "${pkgs.swaybg}/bin/swaybg -i ${config.stylix.image} -m fill" ];
|
exec = [ "${pkgs.swaybg}/bin/swaybg -i ${config.stylix.image} -m fill" ];
|
||||||
exec-once = [
|
exec-once = [
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
# general binds
|
# general binds
|
||||||
",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid
|
",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid
|
||||||
# "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty"
|
# "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty"
|
||||||
"$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty"
|
"$mod, RETURN, exec, ${pkgs.ghostty}/bin/ghostty"
|
||||||
"$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
|
"$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
|
||||||
"$mod, Q, killactive"
|
"$mod, Q, killactive"
|
||||||
"SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout"
|
"SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout"
|
||||||
|
|
|
||||||
169
home-manager/modules/hyprland/default.nix
Normal file
169
home-manager/modules/hyprland/default.nix
Normal file
|
|
@ -0,0 +1,169 @@
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
border-size = config.var.theme.border-size;
|
||||||
|
gaps-in = config.var.theme.gaps-in;
|
||||||
|
gaps-out = config.var.theme.gaps-out;
|
||||||
|
active-opacity = config.var.theme.active-opacity;
|
||||||
|
inactive-opacity = config.var.theme.inactive-opacity;
|
||||||
|
rounding = config.var.theme.rounding;
|
||||||
|
blur = config.var.theme.blur;
|
||||||
|
keyboardLayout = config.var.keyboardLayout;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
./animations.nix
|
||||||
|
./bindings.nix
|
||||||
|
./polkitagent.nix
|
||||||
|
# ./hyprspace.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
qt5.qtwayland
|
||||||
|
qt6.qtwayland
|
||||||
|
libsForQt5.qt5ct
|
||||||
|
qt6ct
|
||||||
|
hyprshot
|
||||||
|
hyprpicker
|
||||||
|
swappy
|
||||||
|
imv
|
||||||
|
wf-recorder
|
||||||
|
wlr-randr
|
||||||
|
wl-clipboard
|
||||||
|
brightnessctl
|
||||||
|
gnome-themes-extra
|
||||||
|
libva
|
||||||
|
dconf
|
||||||
|
wayland-utils
|
||||||
|
wayland-protocols
|
||||||
|
glib
|
||||||
|
direnv
|
||||||
|
meson
|
||||||
|
];
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
systemd.enable = true;
|
||||||
|
package = inputs.hyprland.packages."${pkgs.system}".hyprland;
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
"$mod" = "SUPER";
|
||||||
|
"$shiftMod" = "SUPER_SHIFT";
|
||||||
|
|
||||||
|
monitor = [
|
||||||
|
",prefered,auto,1"
|
||||||
|
];
|
||||||
|
|
||||||
|
env = [
|
||||||
|
"XDG_SESSION_TYPE,wayland"
|
||||||
|
"XDG_CURRENT_DESKTOP,Hyprland"
|
||||||
|
"MOZ_ENABLE_WAYLAND,1"
|
||||||
|
"ANKI_WAYLAND,1"
|
||||||
|
"DISABLE_QT5_COMPAT,0"
|
||||||
|
"NIXOS_OZONE_WL,1"
|
||||||
|
"XDG_SESSION_TYPE,wayland"
|
||||||
|
"XDG_SESSION_DESKTOP,Hyprland"
|
||||||
|
"QT_AUTO_SCREEN_SCALE_FACTOR,1"
|
||||||
|
"QT_QPA_PLATFORM=wayland,xcb"
|
||||||
|
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
|
||||||
|
"ELECTRON_OZONE_PLATFORM_HINT,auto"
|
||||||
|
# "GTK_THEME,FlatColor:dark"
|
||||||
|
# "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
|
||||||
|
"__GL_GSYNC_ALLOWED,0"
|
||||||
|
"__GL_VRR_ALLOWED,0"
|
||||||
|
"DISABLE_QT5_COMPAT,0"
|
||||||
|
"DIRENV_LOG_FORMAT,"
|
||||||
|
"WLR_DRM_NO_ATOMIC,1"
|
||||||
|
"WLR_BACKEND,vulkan"
|
||||||
|
"WLR_RENDERER,vulkan"
|
||||||
|
"WLR_NO_HARDWARE_CURSORS,1"
|
||||||
|
"XDG_SESSION_TYPE,wayland"
|
||||||
|
"SDL_VIDEODRIVER,wayland"
|
||||||
|
"CLUTTER_BACKEND,wayland"
|
||||||
|
"AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU
|
||||||
|
];
|
||||||
|
|
||||||
|
cursor = {
|
||||||
|
no_hardware_cursors = true;
|
||||||
|
default_monitor = "eDP-2";
|
||||||
|
};
|
||||||
|
|
||||||
|
general = {
|
||||||
|
resize_on_border = true;
|
||||||
|
gaps_in = gaps-in;
|
||||||
|
gaps_out = gaps-out;
|
||||||
|
border_size = border-size;
|
||||||
|
border_part_of_window = true;
|
||||||
|
layout = "master";
|
||||||
|
};
|
||||||
|
|
||||||
|
decoration = {
|
||||||
|
active_opacity = active-opacity;
|
||||||
|
inactive_opacity = inactive-opacity;
|
||||||
|
rounding = rounding;
|
||||||
|
shadow = {
|
||||||
|
enabled = true;
|
||||||
|
range = 20;
|
||||||
|
render_power = 3;
|
||||||
|
};
|
||||||
|
blur = {
|
||||||
|
enabled = if blur then "true" else "false";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
master = {
|
||||||
|
new_status = true;
|
||||||
|
allow_small_split = true;
|
||||||
|
mfact = 0.5;
|
||||||
|
};
|
||||||
|
|
||||||
|
gestures = {
|
||||||
|
workspace_swipe = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
misc = {
|
||||||
|
vfr = true;
|
||||||
|
disable_hyprland_logo = true;
|
||||||
|
disable_splash_rendering = true;
|
||||||
|
disable_autoreload = true;
|
||||||
|
focus_on_activate = true;
|
||||||
|
new_window_takes_over_fullscreen = 2;
|
||||||
|
};
|
||||||
|
|
||||||
|
windowrulev2 = [
|
||||||
|
"float, tag:modal"
|
||||||
|
"pin, tag:modal"
|
||||||
|
"center, tag:modal"
|
||||||
|
];
|
||||||
|
|
||||||
|
layerrule = [
|
||||||
|
"noanim, launcher"
|
||||||
|
"noanim, ^ags-.*"
|
||||||
|
];
|
||||||
|
|
||||||
|
input = {
|
||||||
|
# kb_layout = keyboardLayout;
|
||||||
|
|
||||||
|
kb_options = "caps:escape";
|
||||||
|
follow_mouse = 1;
|
||||||
|
sensitivity = 0.5;
|
||||||
|
repeat_delay = 300;
|
||||||
|
repeat_rate = 50;
|
||||||
|
numlock_by_default = true;
|
||||||
|
|
||||||
|
touchpad = {
|
||||||
|
natural_scroll = true;
|
||||||
|
clickfinger_behavior = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
};
|
||||||
|
systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
|
||||||
|
}
|
||||||
|
|
@ -106,7 +106,7 @@
|
||||||
"$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle
|
"$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle
|
||||||
"SUPER_SHIFT, SPACE, togglefloating"
|
"SUPER_SHIFT, SPACE, togglefloating"
|
||||||
# "$mod, F, fullscreen"
|
# "$mod, F, fullscreen"
|
||||||
"$mod,F, exec, hyprfocus-toggle" # Toggle HyprFocus
|
"$mod,F, exec, fullscreen"
|
||||||
"$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
"$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||||
"$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png"
|
"$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png"
|
||||||
"SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard
|
"SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
bind = [
|
bind = [
|
||||||
"$mod,TAB, overview:toggle" # Overview
|
"$mod,TAB, overview:toggle"
|
||||||
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
# Hyprpanel is the bar on top of the screen
|
# Hyprpanel is the bar on top of the screen
|
||||||
# Display informations like workspaces, battery, wifi, ...
|
# Display informations like workspaces, battery, wifi, ...
|
||||||
{ pkgs, config, ... }:
|
{ inputs, config, ... }:
|
||||||
let
|
let
|
||||||
transparentButtons = config.var.theme.bar.transparentButtons;
|
transparentButtons = config.var.theme.bar.transparentButtons;
|
||||||
|
|
||||||
location = config.var.location;
|
|
||||||
username = config.var.username;
|
|
||||||
|
|
||||||
accent = "#${config.lib.stylix.colors.base0D}";
|
accent = "#${config.lib.stylix.colors.base0D}";
|
||||||
accent-alt = "#${config.lib.stylix.colors.base03}";
|
accent-alt = "#${config.lib.stylix.colors.base03}";
|
||||||
background = "#${config.lib.stylix.colors.base00}";
|
background = "#${config.lib.stylix.colors.base00}";
|
||||||
|
|
@ -25,215 +22,164 @@ let
|
||||||
transparent = config.var.theme.bar.transparent;
|
transparent = config.var.theme.bar.transparent;
|
||||||
position = config.var.theme.bar.position;
|
position = config.var.theme.bar.position;
|
||||||
|
|
||||||
|
location = config.var.location;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
wayland.windowManager.hyprland.settings.exec-once = [ "${pkgs.hyprpanel}/bin/hyprpanel" ];
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
|
||||||
hyprpanel
|
|
||||||
libnotify
|
|
||||||
];
|
|
||||||
|
|
||||||
home.file.".cache/ags/hyprpanel/options.json" = {
|
programs.hyprpanel = {
|
||||||
text = # json
|
enable = true;
|
||||||
''
|
systemd.enable = true;
|
||||||
{
|
hyprland.enable = true;
|
||||||
"bar.layouts": {
|
overwrite.enable = true;
|
||||||
"0": {
|
overlay.enable = true;
|
||||||
"left": [
|
layout = {
|
||||||
"dashboard",
|
"bar.layouts" = {
|
||||||
"workspaces",
|
"0" = {
|
||||||
"windowtitle"
|
"left" = [
|
||||||
],
|
"dashboard"
|
||||||
"middle": [
|
"workspaces"
|
||||||
"media"
|
"windowtitle"
|
||||||
],
|
];
|
||||||
"right": [
|
"middle" = [ "media" ];
|
||||||
"systray",
|
"right" = [
|
||||||
"volume",
|
"systray"
|
||||||
"bluetooth",
|
"volume"
|
||||||
"battery",
|
"bluetooth"
|
||||||
"network",
|
"battery"
|
||||||
"clock",
|
"network"
|
||||||
"notifications"
|
"clock"
|
||||||
]
|
"notifications"
|
||||||
},
|
];
|
||||||
"1": {
|
};
|
||||||
"left": [
|
};
|
||||||
"dashboard",
|
};
|
||||||
"workspaces",
|
|
||||||
"windowtitle"
|
|
||||||
],
|
|
||||||
"middle": [
|
|
||||||
"media"
|
|
||||||
],
|
|
||||||
"right": [
|
|
||||||
"systray",
|
|
||||||
"volume",
|
|
||||||
"bluetooth",
|
|
||||||
"battery",
|
|
||||||
"network",
|
|
||||||
"clock",
|
|
||||||
"notifications"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"2": {
|
|
||||||
"left": [
|
|
||||||
"dashboard",
|
|
||||||
"workspaces",
|
|
||||||
"windowtitle"
|
|
||||||
],
|
|
||||||
"middle": [
|
|
||||||
"media"
|
|
||||||
],
|
|
||||||
"right": [
|
|
||||||
"systray",
|
|
||||||
"volume",
|
|
||||||
"bluetooth",
|
|
||||||
"battery",
|
|
||||||
"network",
|
|
||||||
"clock",
|
|
||||||
"notifications"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"theme.font.name": "${font}",
|
|
||||||
"theme.font.size": "${fontSize}px",
|
|
||||||
"theme.bar.outer_spacing": "${if floating && transparent then "0" else "8"}px",
|
|
||||||
"theme.bar.buttons.y_margins": "${if floating && transparent then "0" else "8"}px",
|
|
||||||
"theme.bar.buttons.spacing": "0.3em",
|
|
||||||
"theme.bar.buttons.radius": "${
|
|
||||||
if transparent then toString rounding else toString (rounding - 8)
|
|
||||||
}px",
|
|
||||||
"theme.bar.floating": ${if floating then "true" else "false"},
|
|
||||||
"theme.bar.buttons.padding_x": "0.8rem",
|
|
||||||
"theme.bar.buttons.padding_y": "0.4rem",
|
|
||||||
|
|
||||||
"theme.bar.buttons.workspaces.hover": "${accent-alt}",
|
override = {
|
||||||
"theme.bar.buttons.workspaces.active": "${accent}",
|
"theme.font.name" = "${font}";
|
||||||
"theme.bar.buttons.workspaces.available": "${accent-alt}",
|
"theme.font.size" = "${fontSize}px";
|
||||||
"theme.bar.buttons.workspaces.occupied": "${accent}",
|
"theme.bar.outer_spacing" = "${if floating && transparent then "0" else "8"}px";
|
||||||
|
"theme.bar.buttons.y_margins" = "${if floating && transparent then "0" else "8"}px";
|
||||||
|
"theme.bar.buttons.spacing" = "0.3em";
|
||||||
|
"theme.bar.buttons.radius" = "${
|
||||||
|
if transparent then toString rounding else toString (rounding - 8)
|
||||||
|
}px";
|
||||||
|
"theme.bar.floating" = "${if floating then "true" else "false"}";
|
||||||
|
"theme.bar.buttons.padding_x" = "0.8rem";
|
||||||
|
"theme.bar.buttons.padding_y" = "0.4rem";
|
||||||
|
"theme.bar.buttons.workspaces.hover" = "${accent-alt}";
|
||||||
|
"theme.bar.buttons.workspaces.active" = "${accent}";
|
||||||
|
"theme.bar.buttons.workspaces.available" = "${accent-alt}";
|
||||||
|
"theme.bar.buttons.workspaces.occupied" = "${accent-alt}";
|
||||||
|
"theme.bar.margin_top" = "${if position == "top" then toString (gaps-in * 2) else "0"}px";
|
||||||
|
"theme.bar.margin_bottom" = "${if position == "top" then "0" else toString (gaps-in * 2)}px";
|
||||||
|
"theme.bar.margin_sides" = "${toString gaps-out}px";
|
||||||
|
"theme.bar.border_radius" = "${toString rounding}px";
|
||||||
|
"bar.launcher.icon" = "";
|
||||||
|
"theme.bar.transparent" = "${if transparent then "true" else "false"}";
|
||||||
|
"bar.workspaces.show_numbered" = false;
|
||||||
|
"bar.workspaces.workspaces" = 5;
|
||||||
|
"bar.workspaces.hideUnoccupied" = false;
|
||||||
|
"bar.windowtitle.label" = true;
|
||||||
|
"bar.volume.label" = false;
|
||||||
|
"bar.network.truncation_size" = 12;
|
||||||
|
"bar.bluetooth.label" = false;
|
||||||
|
"bar.clock.format" = "%a %b %d %I:%M %p";
|
||||||
|
"bar.notifications.show_total" = true;
|
||||||
|
"theme.notification.border_radius" = "${toString rounding}px";
|
||||||
|
"theme.osd.enable" = true;
|
||||||
|
"theme.osd.orientation" = "vertical";
|
||||||
|
"theme.osd.location" = "left";
|
||||||
|
"theme.osd.radius" = "${toString rounding}px";
|
||||||
|
"theme.osd.margins" = "0px 0px 0px 10px";
|
||||||
|
"theme.osd.muted_zero" = true;
|
||||||
|
"menus.clock.weather.location" = "${location}";
|
||||||
|
"menus.clock.weather.unit" = "metric";
|
||||||
|
"menus.dashboard.powermenu.confirmation" = false;
|
||||||
|
|
||||||
"theme.bar.margin_top": "${if position == "top" then toString (gaps-in * 2) else "0"}px",
|
"menus.dashboard.shortcuts.left.shortcut1.icon" = "";
|
||||||
"theme.bar.margin_bottom": "${if position == "top" then "0" else toString (gaps-in * 2)}px",
|
"menus.dashboard.shortcuts.left.shortcut1.command" = "zen";
|
||||||
"theme.bar.margin_sides": "${toString gaps-out}px",
|
"menus.dashboard.shortcuts.left.shortcut1.tooltip" = "Zen";
|
||||||
"theme.bar.border_radius": "${toString rounding}px",
|
"menus.dashboard.shortcuts.left.shortcut2.icon" = "";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut2.command" = "caffeine";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut2.tooltip" = "Caffeine";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut3.icon" = "";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut3.command" = "night-shift";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut3.tooltip" = "Night-shift";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut4.icon" = "";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut4.command" = "menu";
|
||||||
|
"menus.dashboard.shortcuts.left.shortcut4.tooltip" = "Search Apps";
|
||||||
|
"menus.dashboard.shortcuts.right.shortcut1.icon" = "";
|
||||||
|
"menus.dashboard.shortcuts.right.shortcut1.command" = "hyprpicker -a";
|
||||||
|
"menus.dashboard.shortcuts.right.shortcut1.tooltip" = "Color Picker";
|
||||||
|
"menus.dashboard.shortcuts.right.shortcut3.icon" = "";
|
||||||
|
"menus.dashboard.shortcuts.right.shortcut3.command" = "screenshot region swappy";
|
||||||
|
"menus.dashboard.shortcuts.right.shortcut3.tooltip" = "Screenshot";
|
||||||
|
|
||||||
"bar.launcher.icon": "",
|
"theme.bar.menus.monochrome" = true;
|
||||||
"theme.bar.transparent": ${if transparent then "true" else "false"},
|
"wallpaper.enable" = false;
|
||||||
"bar.workspaces.show_numbered": false,
|
"theme.bar.menus.background" = "${background}";
|
||||||
"bar.workspaces.workspaces": 5,
|
"theme.bar.menus.cards" = "${background-alt}";
|
||||||
"bar.workspaces.monitorSpecific": true,
|
"theme.bar.menus.card_radius" = "${toString rounding}px";
|
||||||
"bar.workspaces.hideUnoccupied": false,
|
"theme.bar.menus.label" = "${foreground}";
|
||||||
"bar.windowtitle.label": true,
|
"theme.bar.menus.text" = "${foreground}";
|
||||||
"bar.volume.label": false,
|
"theme.bar.menus.border.size" = "${toString border-size}px";
|
||||||
"bar.network.truncation_size": 12,
|
"theme.bar.menus.border.color" = "${accent}";
|
||||||
"bar.bluetooth.label": false,
|
"theme.bar.menus.border.radius" = "${toString rounding}px";
|
||||||
"bar.clock.format": "%a %b %d %I:%M %p",
|
"theme.bar.menus.popover.text" = "${foreground}";
|
||||||
"bar.notifications.show_total": true,
|
"theme.bar.menus.popover.background" = "${background-alt}";
|
||||||
"theme.notification.border_radius": "${toString rounding}px",
|
"theme.bar.menus.listitems.active" = "${accent}";
|
||||||
"theme.osd.enable": true,
|
"theme.bar.menus.icons.active" = "${accent}";
|
||||||
"theme.osd.orientation": "vertical",
|
"theme.bar.menus.switch.enabled" = "${accent}";
|
||||||
"theme.osd.location": "left",
|
"theme.bar.menus.check_radio_button.active" = "${accent}";
|
||||||
"theme.osd.radius": "${toString rounding}px",
|
"theme.bar.menus.buttons.default" = "${accent}";
|
||||||
"theme.osd.margins": "0px 0px 0px 10px",
|
"theme.bar.menus.buttons.active" = "${accent}";
|
||||||
"theme.osd.muted_zero": true,
|
"theme.bar.menus.iconbuttons.active" = "${accent}";
|
||||||
"menus.clock.weather.location": "${location}",
|
"theme.bar.menus.progressbar.foreground" = "${accent}";
|
||||||
"menus.clock.weather.key": "myapikey",
|
"theme.bar.menus.slider.primary" = "${accent}";
|
||||||
"menus.clock.weather.unit": "metric",
|
"theme.bar.menus.tooltip.background" = "${background-alt}";
|
||||||
"menus.dashboard.powermenu.avatar.image": "/home/${username}/.profile_picture.png",
|
"theme.bar.menus.tooltip.text" = "${foreground}";
|
||||||
"menus.dashboard.powermenu.confirmation": false,
|
"theme.bar.menus.dropdownmenu.background" = "${background-alt}";
|
||||||
|
"theme.bar.menus.dropdownmenu.text" = "${foreground}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut1.icon": "",
|
"theme.bar.background" = "${background + (if transparentButtons && transparent then "00" else "")}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut1.command": "qutebrowser",
|
"theme.bar.buttons.style" = "default";
|
||||||
"menus.dashboard.shortcuts.left.shortcut1.tooltip": "Qutebrowser",
|
"theme.bar.buttons.monochrome" = true;
|
||||||
"menus.dashboard.shortcuts.left.shortcut2.icon": "",
|
"theme.bar.buttons.text" = "${foreground}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut2.command": "caffeine",
|
"theme.bar.buttons.background" = "${
|
||||||
"menus.dashboard.shortcuts.left.shortcut2.tooltip": "Caffeine",
|
(if transparent then background else background-alt) + (if transparentButtons then "00" else "")
|
||||||
"menus.dashboard.shortcuts.left.shortcut3.icon": "",
|
}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut3.command": "night-shift",
|
"theme.bar.buttons.icon" = "${accent}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut3.tooltip": "Night-shift",
|
"theme.bar.buttons.notifications.background" = "${background-alt}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut4.icon": "",
|
"theme.bar.buttons.hover" = "${background}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut4.command": "menu",
|
"theme.bar.buttons.notifications.hover" = "${background}";
|
||||||
"menus.dashboard.shortcuts.left.shortcut4.tooltip": "Search Apps",
|
"theme.bar.buttons.notifications.total" = "${accent}";
|
||||||
"menus.dashboard.shortcuts.right.shortcut1.icon": "",
|
"theme.bar.buttons.notifications.icon" = "${accent}";
|
||||||
"menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -a",
|
"theme.notification.background" = "${background-alt}";
|
||||||
"menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Picker",
|
"theme.notification.actions.background" = "${accent}";
|
||||||
"menus.dashboard.shortcuts.right.shortcut3.icon": "",
|
"theme.notification.actions.text" = "${foreground}";
|
||||||
"menus.dashboard.shortcuts.right.shortcut3.command": "screenshot region swappy",
|
"theme.notification.label" = "${accent}";
|
||||||
"menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot",
|
"theme.notification.border" = "${background-alt}";
|
||||||
|
"theme.notification.text" = "${foreground}";
|
||||||
"menus.dashboard.directories.left.directory1.label": " Downloads",
|
"theme.notification.labelicon" = "${accent}";
|
||||||
"menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"",
|
"theme.osd.bar_color" = "${accent}";
|
||||||
"menus.dashboard.directories.left.directory2.label": " Pictures",
|
"theme.osd.bar_overflow_color" = "${accent-alt}";
|
||||||
"menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"",
|
"theme.osd.icon" = "${background}";
|
||||||
"menus.dashboard.directories.left.directory3.label": " Documents",
|
"theme.osd.icon_container" = "${accent}";
|
||||||
"menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"",
|
"theme.osd.label" = "${accent}";
|
||||||
"menus.dashboard.directories.right.directory1.label": " Home",
|
"theme.osd.bar_container" = "${background-alt}";
|
||||||
"menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"",
|
"theme.bar.menus.menu.media.background.color" = "${background-alt}";
|
||||||
"menus.dashboard.directories.right.directory2.label": " Projects",
|
"theme.bar.menus.menu.media.card.color" = "${background-alt}";
|
||||||
"menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"",
|
"theme.bar.menus.menu.media.card.tint" = 90;
|
||||||
"menus.dashboard.directories.right.directory3.label": " Config",
|
"bar.customModules.updates.pollingInterval" = 1440000;
|
||||||
"menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"",
|
"bar.media.show_active_only" = true;
|
||||||
|
"theme.bar.location" = "${position}";
|
||||||
"theme.bar.menus.monochrome": true,
|
"bar.workspaces.numbered_active_indicator" = "color";
|
||||||
"wallpaper.enable": false,
|
"bar.workspaces.monitorSpecific" = false;
|
||||||
"theme.bar.menus.background": "${background}",
|
"bar.workspaces.applicationIconEmptyWorkspace" = "";
|
||||||
"theme.bar.menus.cards": "${background-alt}",
|
"bar.workspaces.showApplicationIcons" = true;
|
||||||
"theme.bar.menus.card_radius": "${toString rounding}px",
|
"bar.workspaces.showWsIcons" = true;
|
||||||
"theme.bar.menus.label": "${foreground}",
|
"theme.bar.dropdownGap" = "4.5em";
|
||||||
"theme.bar.menus.text": "${foreground}",
|
};
|
||||||
"theme.bar.menus.border.size": "${toString border-size}px",
|
|
||||||
"theme.bar.menus.border.color": "${accent}",
|
|
||||||
"theme.bar.menus.border.radius": "${toString rounding}px",
|
|
||||||
"theme.bar.menus.popover.text": "${foreground}",
|
|
||||||
"theme.bar.menus.popover.background": "${background-alt}",
|
|
||||||
"theme.bar.menus.listitems.active": "${accent}",
|
|
||||||
"theme.bar.menus.icons.active": "${accent}",
|
|
||||||
"theme.bar.menus.switch.enabled":"${accent}",
|
|
||||||
"theme.bar.menus.check_radio_button.active": "${accent}",
|
|
||||||
"theme.bar.menus.buttons.default": "${accent}",
|
|
||||||
"theme.bar.menus.buttons.active": "${accent}",
|
|
||||||
"theme.bar.menus.iconbuttons.active": "${accent}",
|
|
||||||
"theme.bar.menus.progressbar.foreground": "${accent}",
|
|
||||||
"theme.bar.menus.slider.primary": "${accent}",
|
|
||||||
"theme.bar.menus.tooltip.background": "${background-alt}",
|
|
||||||
"theme.bar.menus.tooltip.text": "${foreground}",
|
|
||||||
"theme.bar.menus.dropdownmenu.background":"${background-alt}",
|
|
||||||
"theme.bar.menus.dropdownmenu.text": "${foreground}",
|
|
||||||
"theme.bar.background": "${background + (if transparentButtons then "00" else "")}",
|
|
||||||
"theme.bar.buttons.style": "default",
|
|
||||||
"theme.bar.buttons.monochrome": true,
|
|
||||||
"theme.bar.buttons.text": "${foreground}",
|
|
||||||
"theme.bar.buttons.background": "${
|
|
||||||
(if transparent then background else background-alt) + (if transparentButtons then "00" else "")
|
|
||||||
}",
|
|
||||||
"theme.bar.buttons.icon": "${accent}",
|
|
||||||
"theme.bar.buttons.notifications.background": "${background-alt}",
|
|
||||||
"theme.bar.buttons.hover": "${background}",
|
|
||||||
"theme.bar.buttons.notifications.hover": "${background}",
|
|
||||||
"theme.bar.buttons.notifications.total": "${accent}",
|
|
||||||
"theme.bar.buttons.notifications.icon": "${accent}",
|
|
||||||
"theme.notification.background": "${background-alt}",
|
|
||||||
"theme.notification.actions.background": "${accent}",
|
|
||||||
"theme.notification.actions.text": "${foreground}",
|
|
||||||
"theme.notification.label": "${accent}",
|
|
||||||
"theme.notification.border": "${background-alt}",
|
|
||||||
"theme.notification.text": "${foreground}",
|
|
||||||
"theme.notification.labelicon": "${accent}",
|
|
||||||
"theme.osd.bar_color": "${accent}",
|
|
||||||
"theme.osd.bar_overflow_color": "${accent-alt}",
|
|
||||||
"theme.osd.icon": "${background}",
|
|
||||||
"theme.osd.icon_container": "${accent}",
|
|
||||||
"theme.osd.label": "${accent}",
|
|
||||||
"theme.osd.bar_container": "${background-alt}",
|
|
||||||
"theme.bar.menus.menu.media.background.color": "${background-alt}",
|
|
||||||
"theme.bar.menus.menu.media.card.color": "${background-alt}",
|
|
||||||
"theme.bar.menus.menu.media.card.tint": 90,
|
|
||||||
"bar.customModules.updates.pollingInterval": 1440000,
|
|
||||||
"bar.media.show_active_only": true,
|
|
||||||
"theme.bar.location": "${position}"
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,6 @@
|
||||||
"..." = "cd ../../../";
|
"..." = "cd ../../../";
|
||||||
"...." = "cd ../../../../";
|
"...." = "cd ../../../../";
|
||||||
|
|
||||||
ls = "ls | grid -c -i";
|
|
||||||
ll = "ls";
|
|
||||||
|
|
||||||
ps = "procs";
|
ps = "procs";
|
||||||
grep = "rg";
|
grep = "rg";
|
||||||
cat = "bat";
|
cat = "bat";
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,49 @@
|
||||||
fastfetch
|
fastfetch
|
||||||
'';
|
'';
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
c = "clear";
|
|
||||||
cd = "z";
|
cd = "z";
|
||||||
|
|
||||||
|
update = "sudo nixos-rebuild switch";
|
||||||
|
clean = "nix-collect-garbage -d";
|
||||||
|
repair = "nix-store --repair --verify --check-contents";
|
||||||
|
|
||||||
|
"." = "cd ../";
|
||||||
|
".." = "cd ../../";
|
||||||
|
"..." = "cd ../../../";
|
||||||
|
"...." = "cd ../../../../";
|
||||||
|
|
||||||
|
ps = "procs";
|
||||||
|
grep = "rg";
|
||||||
|
cat = "bat";
|
||||||
|
vim = "nvim";
|
||||||
|
|
||||||
|
# Default flags
|
||||||
|
rm = "rm -i";
|
||||||
|
chmod = "chmod -R";
|
||||||
|
cp = "cp -i -v";
|
||||||
|
mv = "mv -i -v";
|
||||||
|
mkdir = "mkdir -v";
|
||||||
|
df = "df -h";
|
||||||
|
du = "du -h";
|
||||||
|
dd = "dd status=progress bs=4M conv=fdatasync ";
|
||||||
|
wgetpaste = "wgetpaste -Xx";
|
||||||
|
sudo = "sudo "; # Makes sudo work with es
|
||||||
|
# ssh = "TERM=xterm ssh"; # Fixes some issues with ssh on some terminals
|
||||||
|
wget = "wget -c";
|
||||||
|
ping = "ping -c 5";
|
||||||
|
ftp = "ftp -p";
|
||||||
|
|
||||||
|
# Misc alieses I use often
|
||||||
|
|
||||||
|
ports = "ss -tulanp";
|
||||||
|
rmd = "rm -rf";
|
||||||
|
# mine = "sudo chown -R (whoami):users";
|
||||||
|
benchmark = "hyperfine --warmup 3 ";
|
||||||
|
c = "clear";
|
||||||
|
listen = "lsof -P -i -n";
|
||||||
|
octal = "stat -c '%a %n'";
|
||||||
|
l = "ls --all";
|
||||||
|
lt = "eza --tree --level=2 --long --icons --git";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
carapace.enable = true;
|
carapace.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,97 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
programs = {
|
||||||
|
nushell = {
|
||||||
|
enable = true;
|
||||||
|
# The config.nu can be anywhere you want if you like to edit your Nushell with Nu
|
||||||
|
# configFile.source = ./.../config.nu;
|
||||||
|
# for editing directly to config.nu
|
||||||
|
envFile.source = ./env.nu;
|
||||||
|
extraConfig = ''
|
||||||
|
let carapace_completer = {|spans|
|
||||||
|
carapace $spans.0 nushell $spans | from json
|
||||||
|
}
|
||||||
|
$env.config = {
|
||||||
|
show_banner: false,
|
||||||
|
completions: {
|
||||||
|
case_sensitive: false # case-sensitive completions
|
||||||
|
quick: true # set to false to prevent auto-selecting completions
|
||||||
|
partial: true # set to false to prevent partial filling of the prompt
|
||||||
|
algorithm: "fuzzy" # prefix or fuzzy
|
||||||
|
external: {
|
||||||
|
# set to false to prevent nushell looking into $env.PATH to find more suggestions
|
||||||
|
enable: true
|
||||||
|
# set to lower can improve completion performance at the cost of omitting some options
|
||||||
|
max_results: 100
|
||||||
|
completer: $carapace_completer # check 'carapace_completer'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$env.PATH = ($env.PATH |
|
||||||
|
split row (char esep) |
|
||||||
|
prepend /home/myuser/.apps |
|
||||||
|
append /usr/bin/env
|
||||||
|
)
|
||||||
|
fastfetch
|
||||||
|
'';
|
||||||
|
shellAliases = {
|
||||||
|
cd = "z";
|
||||||
|
|
||||||
|
update = "sudo nixos-rebuild switch";
|
||||||
|
clean = "nix-collect-garbage -d";
|
||||||
|
repair = "nix-store --repair --verify --check-contents";
|
||||||
|
|
||||||
|
"." = "cd ../";
|
||||||
|
".." = "cd ../../";
|
||||||
|
"..." = "cd ../../../";
|
||||||
|
"...." = "cd ../../../../";
|
||||||
|
|
||||||
|
ps = "procs";
|
||||||
|
grep = "rg";
|
||||||
|
cat = "bat";
|
||||||
|
vim = "nvim";
|
||||||
|
|
||||||
|
# Default flags
|
||||||
|
rm = "rm -i";
|
||||||
|
chmod = "chmod -R";
|
||||||
|
cp = "cp -i -v";
|
||||||
|
mv = "mv -i -v";
|
||||||
|
mkdir = "mkdir -v";
|
||||||
|
df = "df -h";
|
||||||
|
# du = "du -h";
|
||||||
|
dd = "dd status=progress bs=4M conv=fdatasync ";
|
||||||
|
wgetpaste = "wgetpaste -Xx";
|
||||||
|
sudo = "sudo "; # Makes sudo work with es
|
||||||
|
ssh = "TERM=xterm ssh"; # Fixes some issues with ssh on some terminals
|
||||||
|
wget = "wget -c";
|
||||||
|
ping = "ping -c 5";
|
||||||
|
ftp = "ftp -p";
|
||||||
|
|
||||||
|
# Misc alieses I use often
|
||||||
|
|
||||||
|
ports = "ss -tulanp";
|
||||||
|
rmd = "rm -rf";
|
||||||
|
# mine = "sudo chown -R (whoami):users";
|
||||||
|
benchmark = "hyperfine --warmup 3 ";
|
||||||
|
c = "clear";
|
||||||
|
listen = "lsof -P -i -n";
|
||||||
|
octal = "stat -c '%a %n'";
|
||||||
|
l = "ls --all";
|
||||||
|
lt = "eza --tree --level=2 --long --icons --git";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
carapace.enable = true;
|
||||||
|
carapace.enableNushellIntegration = true;
|
||||||
|
|
||||||
|
starship = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
add_newline = true;
|
||||||
|
# character = {
|
||||||
|
# success_symbol = "[➜](bold green)";
|
||||||
|
# error_symbol = "[➜](bold red)";
|
||||||
|
# };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
126
home-manager/modules/nushell/gitaliases.nix
Normal file
126
home-manager/modules/nushell/gitaliases.nix
Normal file
|
|
@ -0,0 +1,126 @@
|
||||||
|
{ }:
|
||||||
|
{
|
||||||
|
programs.nushell.aliases = {
|
||||||
|
|
||||||
|
s = "git status -sb";
|
||||||
|
g = "git";
|
||||||
|
ga = "git add";
|
||||||
|
gaa = "git add --all";
|
||||||
|
gapa = "git add --patch";
|
||||||
|
gau = "git add --update";
|
||||||
|
gb = "git branch";
|
||||||
|
gba = "git branch -a";
|
||||||
|
gbd = "git branch -d";
|
||||||
|
gbl = "git blame -b -w";
|
||||||
|
gbnm = "git branch --no-merged";
|
||||||
|
gbr = "git branch --remote";
|
||||||
|
gbs = "git bisect";
|
||||||
|
gbsb = "git bisect bad";
|
||||||
|
gbsg = "git bisect good";
|
||||||
|
gbsr = "git bisect reset";
|
||||||
|
gbss = "git bisect start";
|
||||||
|
gc = "git commit -v";
|
||||||
|
"gc!" = "git commit -v --amend";
|
||||||
|
gca = "git commit -v -a";
|
||||||
|
"gca!" = "git commit -v -a --amend";
|
||||||
|
gcam = "git commit -a -m";
|
||||||
|
"gcan!" = "git commit -v -a --no-edit --amend";
|
||||||
|
"gcans!" = "git commit -v -a -s --no-edit --amend";
|
||||||
|
gcb = "git checkout -b";
|
||||||
|
gcd = "git checkout develop";
|
||||||
|
gcf = "git config --list";
|
||||||
|
gcl = "git clone --recursive";
|
||||||
|
gclean = "git clean -fd";
|
||||||
|
gcm = "git checkout master";
|
||||||
|
gcmsg = "git commit -m";
|
||||||
|
"gcn!" = "git commit -v --no-edit --amend";
|
||||||
|
gco = "git checkout";
|
||||||
|
gcount = "git shortlog -sn";
|
||||||
|
gcp = "git cherry-pick";
|
||||||
|
gcpa = "git cherry-pick --abort";
|
||||||
|
gcpc = "git cherry-pick --continue";
|
||||||
|
gcs = "git commit -S";
|
||||||
|
gcsm = "git commit -s -m";
|
||||||
|
gd = "git diff";
|
||||||
|
gdca = "git diff --cached";
|
||||||
|
gdt = "git diff-tree --no-commit-id --name-only -r";
|
||||||
|
gdw = "git diff --word-diff";
|
||||||
|
gf = "git fetch";
|
||||||
|
gfa = "git fetch --all --prune";
|
||||||
|
gfo = "git fetch origin";
|
||||||
|
gg = "git gui citool";
|
||||||
|
gga = "git gui citool --amend";
|
||||||
|
ggpull = "git pull origin (git_current_branch)";
|
||||||
|
ggpush = "git push origin (git_current_branch)";
|
||||||
|
ggsup = "git branch --set-upstream-to=origin/(git_current_branch)";
|
||||||
|
ghh = "git help";
|
||||||
|
gignore = "git update-index --assume-unchanged";
|
||||||
|
gk = "gitk --all --branches";
|
||||||
|
gke = "gitk --all (git log -g --pretty=%h)";
|
||||||
|
gl = "git pull";
|
||||||
|
glg = "git log --stat";
|
||||||
|
glgg = "git log --graph";
|
||||||
|
glgga = "git log --graph --decorate --all";
|
||||||
|
glgm = "git log --graph --max-count=10";
|
||||||
|
glgp = "git log --stat -p";
|
||||||
|
glo = "git log --oneline --decorate";
|
||||||
|
globurl = "noglob urlglobber";
|
||||||
|
glog = "git log --oneline --decorate --graph";
|
||||||
|
gloga = "git log --oneline --decorate --graph --all";
|
||||||
|
glol = "git log --graph --pretty=%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset\\ --abbrev-commit";
|
||||||
|
glola = "git log --graph --pretty=%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset\\ --abbrev-commit --all";
|
||||||
|
glp = "_git_log_prettily";
|
||||||
|
glum = "git pull upstream master";
|
||||||
|
gm = "git merge";
|
||||||
|
gmom = "git merge origin/master";
|
||||||
|
gmt = "git mergetool --no-prompt";
|
||||||
|
gmtvim = "git mergetool --no-prompt --tool=vimdiff";
|
||||||
|
gmum = "git merge upstream/master";
|
||||||
|
gp = "git push";
|
||||||
|
gpd = "git push --dry-run";
|
||||||
|
gpoat = "git push origin --all && git push origin --tags";
|
||||||
|
gpristine = "git reset --hard && git clean -dfx";
|
||||||
|
gpsup = "git push --set-upstream origin (git_current_branch)";
|
||||||
|
gpu = "git push upstream";
|
||||||
|
gpv = "git push -v";
|
||||||
|
gr = "git remote";
|
||||||
|
gra = "git remote add";
|
||||||
|
grb = "git rebase";
|
||||||
|
grba = "git rebase --abort";
|
||||||
|
grbc = "git rebase --continue";
|
||||||
|
grbi = "git rebase -i";
|
||||||
|
grbm = "git rebase master";
|
||||||
|
grbs = "git rebase --skip";
|
||||||
|
grep = "grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn}";
|
||||||
|
grh = "git reset HEAD";
|
||||||
|
grhh = "git reset HEAD --hard";
|
||||||
|
grmv = "git remote rename";
|
||||||
|
grrm = "git remote remove";
|
||||||
|
grset = "git remote set-url";
|
||||||
|
grt = "cd (git rev-parse --show-toplevel || echo '.')";
|
||||||
|
gru = "git reset --";
|
||||||
|
grup = "git remote update";
|
||||||
|
grv = "git remote -v";
|
||||||
|
gsb = "git status -sb";
|
||||||
|
gsd = "git svn dcommit";
|
||||||
|
gsi = "git submodule init";
|
||||||
|
gsps = "git show --pretty=short --show-signature";
|
||||||
|
gsr = "git svn rebase";
|
||||||
|
gss = "git status -s";
|
||||||
|
gst = "git status";
|
||||||
|
gsta = "git stash save";
|
||||||
|
gstaa = "git stash apply";
|
||||||
|
gstc = "git stash clear";
|
||||||
|
gstd = "git stash drop";
|
||||||
|
gstl = "git stash list";
|
||||||
|
gstp = "git stash pop";
|
||||||
|
gsts = "git stash show --text";
|
||||||
|
gsu = "git submodule update";
|
||||||
|
gts = "git tag -s";
|
||||||
|
gtv = "git tag | sort";
|
||||||
|
gunignore = "git update-index --no-assume-unchanged";
|
||||||
|
gup = "git pull --rebase";
|
||||||
|
gupv = "git pull --rebase -v";
|
||||||
|
gwch = "git whatchanged -p --abbrev-commit --pretty=medium";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
{
|
||||||
stylix.targets.tmux.enable = false;
|
stylix.targets.tmux.enable = false;
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -182,4 +183,16 @@
|
||||||
bindkey -M viins '\es' sesh-sessions
|
bindkey -M viins '\es' sesh-sessions
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.nushell = {
|
||||||
|
shellAliases = {
|
||||||
|
tx = "sesh connect /home/${config.home.username}";
|
||||||
|
ta = "tmux attach -t";
|
||||||
|
tad = "tmux attach -d -t";
|
||||||
|
ts = "tmux new-session -s";
|
||||||
|
tl = "tmux list-sessions";
|
||||||
|
tksv = "tmux kill-server";
|
||||||
|
tkss = "tmux kill-session -t";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
{pkgs, ...}: let
|
{ pkgs, ... }:
|
||||||
|
let
|
||||||
plugins-repo = pkgs.fetchFromGitHub {
|
plugins-repo = pkgs.fetchFromGitHub {
|
||||||
owner = "yazi-rs";
|
owner = "yazi-rs";
|
||||||
repo = "plugins";
|
repo = "plugins";
|
||||||
rev = "a3ee7173bff700214bc2d993ef605c3c41d800c9";
|
rev = "02d18be03812415097e83c6a912924560e4cec6d";
|
||||||
hash = "sha256-m2A/vIgGMzFzhaOgFL21cZua8h2XaYu7Jb6yuZQKiTw=";
|
hash = "sha256-1FZ8wcf2VVp6ZWY27vm1dUU1KAL32WwoYbNA/8RUAog=";
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
programs.yazi = {
|
programs.yazi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
|
|
@ -28,8 +30,8 @@ in {
|
||||||
starship = pkgs.fetchFromGitHub {
|
starship = pkgs.fetchFromGitHub {
|
||||||
owner = "Rolv-Apneseth";
|
owner = "Rolv-Apneseth";
|
||||||
repo = "starship.yazi";
|
repo = "starship.yazi";
|
||||||
rev = "dc9989c2bdd3d04e615d3bbb5f3bf99ed6ce1a35";
|
rev = "af8bf6f82165b83272b6501ce7445cf2c61fbf51";
|
||||||
sha256 = "sha256-AwBqOKWtz5BzY7Sye1JljWI2t+JQGGQfOT6oQN7YTOg=";
|
sha256 = "sha256-L7MkZZqJ+t+A61ceC4Q1joLF6ytoWdgx9BwZWAGAoCA=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -46,7 +48,10 @@ in {
|
||||||
desc = "Maximize or restore the preview pane";
|
desc = "Maximize or restore the preview pane";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
on = ["c" "m"];
|
on = [
|
||||||
|
"c"
|
||||||
|
"m"
|
||||||
|
];
|
||||||
run = "plugin chmod";
|
run = "plugin chmod";
|
||||||
desc = "Chmod on selected files";
|
desc = "Chmod on selected files";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -122,9 +122,13 @@
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
loginShellInit = ''
|
loginShellInit = ''
|
||||||
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
# if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
||||||
exec Hyprland
|
# exec Hyprland
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
|
if (empty $env.DISPLAY) && ($tty == '/dev/tty1') {
|
||||||
|
exec Hyprland
|
||||||
|
}
|
||||||
''; # Will automatically open Hyprland when logged into tty1
|
''; # Will automatically open Hyprland when logged into tty1
|
||||||
variables = {
|
variables = {
|
||||||
TERMINAL = "alacritty";
|
TERMINAL = "alacritty";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{pkgs, ...}: {
|
{ pkgs, ... }:
|
||||||
boot.kernelPackages = pkgs.linuxPackages_hardened;
|
{
|
||||||
|
# boot.kernelPackages = pkgs.linuxPackages_hardened;
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
# Disable slab merging to prevent heap exploitation
|
# Disable slab merging to prevent heap exploitation
|
||||||
"slab_nomerge"
|
"slab_nomerge"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue