mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 11:17:17 +00:00
Compare commits
8 commits
a3a0fde5b7
...
478c415bfe
Author | SHA1 | Date | |
---|---|---|---|
478c415bfe | |||
862bed2aff | |||
25543f4967 | |||
c552e15697 | |||
96a78829d5 | |||
a0f1f85cf7 | |||
3fdd749ca2 | |||
90802a1130 |
8 changed files with 194 additions and 87 deletions
175
flake.lock
generated
175
flake.lock
generated
|
@ -174,11 +174,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709360582,
|
||||
"narHash": "sha256-fdHoIO3N/NsvyJtRMYDgydduezk0aGBT1/cQSHxy69E=",
|
||||
"lastModified": 1710483719,
|
||||
"narHash": "sha256-Ev/hJ59IAA3dWfTB3CWxMv/V/owO1yKyq0nwsek/d9o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "f70eee0e38bc2287687c853df9b4ed6f6a028eb0",
|
||||
"rev": "d0439c495e5cd13ff252ade520ca620f52abb40b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -254,7 +254,7 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701680307,
|
||||
|
@ -331,11 +331,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709204054,
|
||||
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
|
||||
"lastModified": 1710506163,
|
||||
"narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2f3367769a93b226c467551315e9e270c3f78b15",
|
||||
"rev": "dc2f3812b41f825ed466c24c4211160d75cb890c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -365,21 +365,48 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprcursor": {
|
||||
"inputs": {
|
||||
"hyprlang": "hyprlang",
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710257359,
|
||||
"narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland": {
|
||||
"inputs": {
|
||||
"hyprcursor": "hyprcursor",
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprlang": "hyprlang_2",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems",
|
||||
"systems": "systems_2",
|
||||
"wlroots": "wlroots",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709413495,
|
||||
"narHash": "sha256-cAMzSA9IzCPhL3ToHEqYTQuA0cRMyBHFm9rSobiU024=",
|
||||
"lastModified": 1710512894,
|
||||
"narHash": "sha256-oJgscD3uuqww42yfdXJBkmZqYTs69xAwHbqLKBhcYD0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "d72ea5f2a7fdb0d0a7bf914412327195b05199b0",
|
||||
"rev": "bc15a8f60028539690cccdb78eed7fc9175fe792",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -414,6 +441,29 @@
|
|||
}
|
||||
},
|
||||
"hyprlang": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"hyprcursor",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709914708,
|
||||
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprlang_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
|
@ -425,11 +475,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708787654,
|
||||
"narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
|
||||
"lastModified": 1709914708,
|
||||
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "0fce791ba2334aca183f2ed42399518947550d0d",
|
||||
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -465,11 +515,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708830466,
|
||||
"narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
|
||||
"lastModified": 1710120787,
|
||||
"narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
|
||||
"rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -478,6 +528,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixd": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710491893,
|
||||
"narHash": "sha256-MYgirhR9kW+6mM7er0pJ+z50djUycS2r9lEUyKKmkRc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixd",
|
||||
"rev": "6800a8f74a9c97b4c5a4eaf544befa1a13d07794",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixd",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-apple-silicon": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
@ -487,11 +560,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709186902,
|
||||
"narHash": "sha256-0gMwtZDBSJEG23R/84XRLJNydRCwOYAg6ola2bYqSv8=",
|
||||
"lastModified": 1710209440,
|
||||
"narHash": "sha256-1JwFo3u2aVrvpz12OotjCK51EQ0hEDI7xSG7CEvTSk8=",
|
||||
"owner": "tpwrules",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"rev": "9ccf1cb93bdaa96294598bef8a7ffaa72226b0fb",
|
||||
"rev": "bdc68b494d6a26c9457f4841ab1a6109b12a33e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -502,11 +575,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1709237383,
|
||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -552,11 +625,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1708807242,
|
||||
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -568,11 +641,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1709237383,
|
||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
||||
"lastModified": 1710451336,
|
||||
"narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
|
||||
"rev": "d691274a972b3165335d261cc4671335f5c67de9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -615,6 +688,7 @@
|
|||
"hyprland": "hyprland",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixd": "nixd",
|
||||
"nixos-apple-silicon": "nixos-apple-silicon",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
|
@ -624,11 +698,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709318088,
|
||||
"narHash": "sha256-guGsgYj2p2Bzj7GrqdYm5XMrVYVtJ8SUfZZF5OSpXZ0=",
|
||||
"lastModified": 1710430493,
|
||||
"narHash": "sha256-KfmUsf/d62ANcFhSTR3BDIpk2ww0AcxXdi9lpZJ5UtQ=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "79e0fee6a30a5f563e9b709cc5959694709e19c4",
|
||||
"rev": "14558af15ee3d471bf8f4212f7609ae1f9647bc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -673,11 +747,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708896938,
|
||||
"narHash": "sha256-oMjkMjeNhDUEpKIofo9+9RdUnmmZ4h0sm+kf6XKdy6k=",
|
||||
"lastModified": 1710420453,
|
||||
"narHash": "sha256-F/JfpPRpIkFqvYEtt55lZyaFd+/vhn9SrcQrXIZCkOU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "fcff15ac5ffbe81f1c66e352f3167c270d79cdab",
|
||||
"rev": "eb64377e66122de7a36ca7a611aa97ddf4c8e5e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -702,6 +776,21 @@
|
|||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
@ -720,18 +809,18 @@
|
|||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"lastModified": 1708558866,
|
||||
"narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
|
||||
"lastModified": 1709983277,
|
||||
"narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
|
||||
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
|
||||
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
|
@ -755,11 +844,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708696469,
|
||||
"narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
|
||||
"lastModified": 1709299639,
|
||||
"narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
|
||||
"rev": "2d2fb547178ec025da643db57d40a971507b82fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -30,6 +30,10 @@
|
|||
|
||||
stylix.url = "github:danth/stylix";
|
||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nixd.url = "github:nix-community/nixd";
|
||||
nixd.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixd.inputs.flake-parts.follows = "flake-parts";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
home.file.".gnupg/gpg-agent.conf" = {
|
||||
text = ''
|
||||
pinentry-program "${pkgs.pinentry.out}/bin/pinentry"
|
||||
pinentry-program "${pkgs.pinentry-curses}/bin/curses"
|
||||
default-cache-ttl 30
|
||||
max-cache-ttl 600
|
||||
'';
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
enableZshIntegration = true;
|
||||
defaultCacheTtl = 30;
|
||||
maxCacheTtl = 600;
|
||||
pinentryFlavor = "curses";
|
||||
pinentryPackage = pkgs.pinentry-curses;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
node-packages = with pkgs.nodePackages; [
|
||||
|
@ -11,6 +12,7 @@
|
|||
latest.toolchain
|
||||
targets.thumbv7em-none-eabihf.latest.rust-std
|
||||
]);
|
||||
nixd-upstream = inputs.nixd.packages.${pkgs.system}.default;
|
||||
in {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
|
@ -32,15 +34,14 @@ in {
|
|||
nix-tree
|
||||
nix-zsh-completions
|
||||
nixfmt
|
||||
nixd-upstream
|
||||
nixpkgs-fmt
|
||||
nmap
|
||||
nodejs
|
||||
openssh
|
||||
pass-git-helper
|
||||
pinentry
|
||||
pv
|
||||
ripgrep
|
||||
rnix-lsp
|
||||
rsync
|
||||
shellcheck
|
||||
shfmt
|
||||
|
|
|
@ -1,52 +1,17 @@
|
|||
{
|
||||
inputs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./helix.nix
|
||||
./ssh.nix
|
||||
./zsh.nix
|
||||
];
|
||||
|
||||
programs = {
|
||||
helix = {
|
||||
enable = true;
|
||||
settings.editor.line-number = "relative";
|
||||
settings.keys = {
|
||||
normal = {
|
||||
space.w = ":w";
|
||||
space.q = ":q";
|
||||
|
||||
/*
|
||||
remap for colemak
|
||||
*/
|
||||
n = "move_line_down";
|
||||
N = "keep_selections";
|
||||
k = "search_next";
|
||||
K = "search_prev";
|
||||
# E <=> J (swap actions)
|
||||
j = "move_next_word_end";
|
||||
J = "move_next_long_word_end";
|
||||
e = "move_line_up";
|
||||
E = "join_selections";
|
||||
# ILU loop
|
||||
# I => L
|
||||
i = "move_char_right";
|
||||
I = "no_op";
|
||||
# U => I (QWERTY position)
|
||||
u = "insert_mode";
|
||||
U = "insert_at_line_start";
|
||||
# L => U (QWERTY position)
|
||||
l = "undo";
|
||||
L = "redo";
|
||||
/*
|
||||
end colemak remap
|
||||
*/
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nix-index-database.comma.enable = true;
|
||||
|
||||
bash.enableCompletion = true;
|
||||
|
@ -70,7 +35,6 @@
|
|||
|
||||
eza = {
|
||||
enable = true;
|
||||
enableAliases = true;
|
||||
};
|
||||
|
||||
fzf = {
|
||||
|
|
51
home/programs/helix.nix
Normal file
51
home/programs/helix.nix
Normal file
|
@ -0,0 +1,51 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
languages.language = [
|
||||
{
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
language-servers = ["nixd-lsp"];
|
||||
formatter = {command = "${pkgs.alejandra}/bin/alejandra";};
|
||||
}
|
||||
];
|
||||
languages.language-server.nixd-lsp.command = "${inputs.nixd.packages.${pkgs.system}.default}/bin/nixd";
|
||||
settings.editor.line-number = "relative";
|
||||
settings.keys = {
|
||||
normal = {
|
||||
space.w = ":w";
|
||||
space.q = ":q";
|
||||
|
||||
/*
|
||||
remap for colemak
|
||||
*/
|
||||
n = "move_line_down";
|
||||
N = "keep_selections";
|
||||
k = "search_next";
|
||||
K = "search_prev";
|
||||
# E <=> J (swap actions)
|
||||
j = "move_next_word_end";
|
||||
J = "move_next_long_word_end";
|
||||
e = "move_line_up";
|
||||
E = "join_selections";
|
||||
# ILU loop
|
||||
# I => L
|
||||
i = "move_char_right";
|
||||
I = "no_op";
|
||||
# U => I (QWERTY position)
|
||||
u = "insert_mode";
|
||||
U = "insert_at_line_start";
|
||||
# L => U (QWERTY position)
|
||||
l = "undo";
|
||||
L = "redo";
|
||||
/*
|
||||
end colemak remap
|
||||
*/
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -7,8 +7,6 @@
|
|||
pkgs,
|
||||
...
|
||||
}: {
|
||||
boot.initrd.kernelModules = ["vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd"];
|
||||
|
||||
imports = [
|
||||
../profiles/desktop.nix
|
||||
../profiles/nvidiagpu.nix
|
||||
|
|
Loading…
Add table
Reference in a new issue