faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switching to helix complete

Browse source
This commit is contained in:
Charlie Root 2024-07-30 21:04:27 +02:00
commit 5ec00a83b5
8 changed files with 250 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
assets/wallpapers/wholefoods.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 391 KiB

277
flake.lock generated
View file

@ -210,6 +210,27 @@
}
},
"crane": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709610799,
"narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
"owner": "ipetkov",
"repo": "crane",
"rev": "81c393c776d5379c030607866afef6406ca1be57",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"inputs": {
"nixpkgs": [
"schizofox",
@ -589,14 +610,14 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_6"
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
@ -624,23 +645,8 @@
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_9"
"systems": "systems_8"
},
"locked": {
"lastModified": 1710146030,
@ -656,9 +662,42 @@
"type": "github"
}
},
"flake-utils_5": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"inputs": {
"systems": "systems_11"
"systems": "systems_10"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_7": {
"inputs": {
"systems": "systems_12"
},
"locked": {
"lastModified": 1685518550,
@ -771,6 +810,27 @@
"type": "github"
}
},
"helix": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1722305447,
"narHash": "sha256-2jG85FHBhKeoF8vNUkCHflrliuC8HCaMOzmERct9imc=",
"owner": "helix-editor",
"repo": "helix",
"rev": "ce809fb9ef4c5af59b5401419a2e8ae6964c8229",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_5",
@ -937,8 +997,8 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4",
"systems": "systems_5",
"nixpkgs": "nixpkgs_5",
"systems": "systems_6",
"xdph": "xdph"
},
"locked": {
@ -1095,7 +1155,7 @@
},
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_6",
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
@ -1128,7 +1188,7 @@
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
@ -1187,7 +1247,7 @@
"neovim-flake": {
"inputs": {
"flake-parts": "flake-parts_3",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_4",
"mnw": "mnw",
"nil": "nil",
"nixpkgs": [
@ -1294,7 +1354,7 @@
"plugin-vim-vsnip": "plugin-vim-vsnip",
"plugin-which-key": "plugin-which-key",
"rnix-lsp": "rnix-lsp",
"systems": "systems_8",
"systems": "systems_9",
"zig": "zig"
},
"locked": {
@ -1318,7 +1378,7 @@
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1722299518,
@ -1360,7 +1420,7 @@
"neovim-flake",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1714571717,
@ -1380,7 +1440,7 @@
"inputs": {
"flake-parts": "flake-parts_7",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_10",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -1566,7 +1626,7 @@
"flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1722346555,
@ -1583,6 +1643,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1720781449,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
@ -1598,7 +1674,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@ -1614,7 +1690,7 @@
"type": "github"
}
},
"nixpkgs_12": {
"nixpkgs_13": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -1630,7 +1706,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_14": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
@ -1679,6 +1755,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
@ -1694,7 +1786,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@ -1710,7 +1802,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1702350026,
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
@ -1726,7 +1818,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1722141560,
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
@ -1742,7 +1834,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
@ -1758,22 +1850,6 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1720781449,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
@ -3398,7 +3474,7 @@
"rnix-lsp": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"utils": "utils"
},
"locked": {
@ -3423,6 +3499,7 @@
"devshell": "devshell",
"emacs-overlay": "emacs-overlay",
"flake-parts": "flake-parts_2",
"helix": "helix",
"home-manager": "home-manager_2",
"hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
@ -3431,7 +3508,7 @@
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos-hardware": "nixos-hardware",
"nixpak": "nixpak",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_9",
"nixpkgs-wayland": "nixpkgs-wayland",
"quickshell": "quickshell",
"schizofox": "schizofox",
@ -3442,6 +3519,31 @@
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"helix",
"flake-utils"
],
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709604635,
"narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"neovim-flake",
@ -3480,7 +3582,7 @@
"nixpkgs"
],
"searx-randomizer": "searx-randomizer",
"systems": "systems_10"
"systems": "systems_11"
},
"locked": {
"lastModified": 1719058240,
@ -3498,7 +3600,7 @@
},
"searx-randomizer": {
"inputs": {
"crane": "crane",
"crane": "crane_2",
"flake-parts": "flake-parts_9",
"nixpkgs": [
"schizofox",
@ -3521,8 +3623,8 @@
},
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_11"
"flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1704167711,
@ -3571,7 +3673,7 @@
"flake-compat": "flake-compat_6",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_4",
"nixpkgs": "nixpkgs_12"
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1722295291,
@ -3603,6 +3705,21 @@
}
},
"systems_10": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_11": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -3617,7 +3734,7 @@
"type": "github"
}
},
"systems_11": {
"systems_12": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -3678,21 +3795,6 @@
}
},
"systems_5": {
"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_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -3707,6 +3809,21 @@
"type": "github"
}
},
"systems_6": {
"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_7": {
"locked": {
"lastModified": 1681028828,
@ -3776,7 +3893,7 @@
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_14"
},
"locked": {
"lastModified": 1722330636,
@ -3840,8 +3957,8 @@
"zig": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_6"
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1716725305,

2
flake.nix
View file

@ -43,6 +43,8 @@
# Hardware for my laptop
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# Helix my beloved
helix.url = "github:helix-editor/helix";
# Secret management
agenix.url = "github:ryantm/agenix";

2
hosts/vali/temperance/configuration.nix
View file

@ -79,7 +79,7 @@
popups = 14;
applications = 14;
};
image = ../../../assets/wallpapers/tiredgod.png;
image = ../../../assets/wallpapers/wholefoods.jpg;
};
};
};

3
hosts/vali/temperance/programs.nix
View file

@ -16,8 +16,6 @@ in {
cmus
difftastic
dig
digikam
easyeffects
element-desktop
evince
eza
@ -65,7 +63,6 @@ in {
nixpkgs-wayland.swww
nmap
nodejs_20
notesnook
obsidian
onlyoffice-bin
pamixer

39
modules/editors/helix.nix
View file

@ -2,18 +2,39 @@
config,
lib,
pkgs,
inputs',
...
}: let
cfg = config.modules.system.programs.editors.helix;
inherit (config.modules.other.system) username;
inherit (lib) mkIf;
inherit (lib) mkIf getExe makeBinPath;
in {
config = mkIf cfg.enable {
home-manager.users.${username} = {
programs.helix = {
enable = true;
package = inputs'.helix.packages.default.overrideAttrs (previousAttrs: {
makeWrapperArgs = with pkgs;
previousAttrs.makeWrapperArgs
or []
++ [
"--suffix"
"PATH"
":"
(makeBinPath [
clang-tools
marksman
nil
bash-language-server
shellcheck
])
];
});
settings = {
theme = "catppuccin_mocha";
editor = {
indent-guides.render = true;
lsp.display-inlay-hints = true;
line-number = "relative";
mouse = false;
bufferline = "multiple";
@ -30,14 +51,14 @@ in {
A-w = ":buffer-close";
};
};
languages.language = [
{
name = "nix";
auto-format = true;
formatter.command = "${pkgs.alejandra}/bin/alejandra";
language-servers = ["${pkgs.nil}/bin/nil"];
}
];
languages = {
language-server = {
nil = {
command = getExe pkgs.nil;
config.nil.formatting.command = ["${getExe pkgs.alejandra}" "-q"];
};
};
};
};
};
};

17
modules/styling/stylix.nix
View file

@ -7,6 +7,7 @@
}: let
cfg = config.modules.usrEnv.style.stylix;
inherit (config.modules.usrEnv.style.stylix) scheme image cursor fontsizes;
inherit (config.modules.other.system) username;
inherit (lib) mkIf;
in {
imports = [inputs.stylix.nixosModules.stylix];
@ -66,13 +67,25 @@ in {
fish.enable = true;
grub.enable = false;
grub.useImage = true;
#gtk.enable = true;
gtk.enable = true;
lightdm.enable = true;
nixos-icons.enable = true;
nixvim.enable = true;
plymouth.enable = true;
plymouth.logoAnimated = true;
};
};
home-manager.users.${username} = {
stylix.targets = {
btop.enable = true;
helix.enable = false;
dunst.enable = true;
firefox.enable = true;
foot.enable = true;
fzf.enable = true;
hyprland.enable = true;
lazygit.enable = true;
zellij.enable = true;
};
};
};
}

10
modules/wms/wayland/hypr/land.nix
View file

@ -124,11 +124,11 @@ in {
];
# Input settings
input = {
kb_layout = "de,us";
kb_variant = ",cmk_ed_dh";
kb_model = ",pc105awide";
kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu";
kb_rules = ",evdev";
kb_layout = "de";
kb_variant = "";
kb_model = "";
# kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu";
# kb_rules = ",evdev";
follow_mouse = true;