helix git
This commit is contained in:
parent
f2c2dd1998
commit
6a73955468
6 changed files with 125 additions and 46 deletions
|
|
@ -1,5 +1,6 @@
|
|||
{ pkgs, aagl, ... }: {
|
||||
imports = [ aagl.nixosModules.default ];
|
||||
# { pkgs, aagl, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
# imports = [ aagl.nixosModules.default ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
heroic
|
||||
|
|
@ -19,8 +20,8 @@
|
|||
programs.gamemode.enable = true;
|
||||
programs.gamescope.enable = true;
|
||||
|
||||
nix.settings = aagl.nixConfig;
|
||||
programs.honkers-railway-launcher.enable = true;
|
||||
# nix.settings = aagl.nixConfig;
|
||||
# programs.honkers-railway-launcher.enable = true;
|
||||
|
||||
users = { groups.game = { }; };
|
||||
security.pam.loginLimits = [
|
||||
|
|
|
|||
123
flake.lock
generated
123
flake.lock
generated
|
|
@ -1,41 +1,64 @@
|
|||
{
|
||||
"nodes": {
|
||||
"aagl": {
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700088598,
|
||||
"narHash": "sha256-lK66mu2vi2/rXm13+lh/Gwi2asQiEU7a91ZoP4dFdNE=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "ee7b773dd7d028ad1b185cdf72bc16ce69ac0288",
|
||||
"lastModified": 1701025348,
|
||||
"narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "ee7b773dd7d028ad1b185cdf72bc16ce69ac0288",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"lastModified": 1694529238,
|
||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"helix": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706750333,
|
||||
"narHash": "sha256-wTwzj5W7zyCC7v0jIko4FBWa+E+n0Pe3QZbcEI7IK8Q=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "dbac78bb3c06717f1f83984da3035e28f39d49a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -46,11 +69,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706435589,
|
||||
"narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=",
|
||||
"lastModified": 1706798041,
|
||||
"narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e",
|
||||
"rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -61,11 +84,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1706182238,
|
||||
"narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
|
||||
"lastModified": 1706782449,
|
||||
"narHash": "sha256-8hEkOJDqR+7gJvXzwIM/VhR9iQzZyrNeh68u+Et2TzA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
|
||||
"rev": "cc65e27670abccced5997d4a93c4c930aef6fd0b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -125,11 +148,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1706371002,
|
||||
"narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=",
|
||||
"lastModified": 1706550542,
|
||||
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c002c6aa977ad22c60398daaa9be52f2203d0006",
|
||||
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -140,12 +163,52 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"aagl": "aagl",
|
||||
"helix": "helix",
|
||||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"helix",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701137803,
|
||||
"narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "9dd940c967502f844eacea52a61e9596268d4f70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
19
flake.nix
19
flake.nix
|
|
@ -8,25 +8,30 @@
|
|||
nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
helix.url = "github:helix-editor/helix";
|
||||
helix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# hyprland.url = "github:hyprwm/Hyprland";
|
||||
# aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
||||
# aagl.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# prescurve.url = "github:taotien/prescurve";
|
||||
# prescurve.inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.hyprland.url = "github:hyprwm/Hyprland";
|
||||
# aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
||||
aagl.url = "github:ezKEa/aagl-gtk-on-nix/ee7b773dd7d028ad1b185cdf72bc16ce69ac0288";
|
||||
aagl.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
# extra-substituters = [ "https://hyprland.cachix.org" "https://ezkea.cachix.org" ];
|
||||
# extra-trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ];
|
||||
extra-substituters = [ "https://hyprland.cachix.org" ];
|
||||
extra-trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, aagl, ... }@attrs:
|
||||
# outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, helix, aagl, ... }@inputs:
|
||||
outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, helix, ... }@inputs:
|
||||
{
|
||||
nixosConfigurations = {
|
||||
NOcomputer = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = attrs;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.common-cpu-amd
|
||||
nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
|
||||
|
|
@ -41,7 +46,7 @@
|
|||
};
|
||||
NOlaptop = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = attrs;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
# inputs.nixos-hardware.nixosModules.framework
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, pkgs, modulesPath, ... }: {
|
||||
{ inputs, lib, pkgs, modulesPath, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# xorg.xkill
|
||||
bat
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
ffmpeg
|
||||
firefox
|
||||
git
|
||||
helix
|
||||
inputs.helix.packages.${pkgs.system}.default
|
||||
libthai
|
||||
localsend
|
||||
macchina
|
||||
|
|
@ -84,6 +84,7 @@
|
|||
nix.settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
auto-optimise-store = true;
|
||||
trusted-users = [ "root" "@wheel" ];
|
||||
};
|
||||
nixpkgs.config = { allowUnfree = true; };
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,15 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
grammar = [
|
||||
{
|
||||
name = "nix";
|
||||
source = {
|
||||
git = "https://github.com/nix-community/tree-sitter-nix";
|
||||
rev = "763168fa916a333a459434f1424b5d30645f015d";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
let
|
||||
enablePrograms = programs: builtins.mapAttrs (_: program: { enable = true; }) programs;
|
||||
in
|
||||
# let
|
||||
# enablePrograms = programs: builtins.mapAttrs (_: program: { enable = true; }) programs;
|
||||
# in
|
||||
{
|
||||
imports = [
|
||||
./helix.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue