Compare commits
No commits in common. "aef8d0d80d3a62542e8f8dbb80f2632575445e86" and "f1dde2b278e6217196d25a1b7f66b0689126b0c2" have entirely different histories.
aef8d0d80d
...
f1dde2b278
5 changed files with 8 additions and 62 deletions
43
flake.lock
generated
43
flake.lock
generated
|
|
@ -135,27 +135,6 @@
|
||||||
"url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
|
"url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733312601,
|
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"git-hooks-nix": {
|
"git-hooks-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -462,27 +441,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nur": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1779470870,
|
|
||||||
"narHash": "sha256-h511LYfVIXNpTd8C/p1cMW2AVrFEjMy104XxPRIzrL0=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "NUR",
|
|
||||||
"rev": "5ea6f8868ce8f1ed17ce6da66abe084dfe3501e0",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "NUR",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
|
@ -496,7 +454,6 @@
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nixpkgs-last-building": "nixpkgs-last-building",
|
"nixpkgs-last-building": "nixpkgs-last-building",
|
||||||
"nur": "nur",
|
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
10
flake.nix
10
flake.nix
|
|
@ -3,15 +3,11 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixos.url = "github:NixOS/nixpkgs/nixos-25.11";
|
nixos.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-last-building.url = "github:NixOS/nixpkgs/59e69648d345d6e8fef86158c555730fa12af9de";
|
nixpkgs-last-building.url = "github:NixOS/nixpkgs/59e69648d345d6e8fef86158c555730fa12af9de";
|
||||||
|
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
||||||
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
|
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
|
||||||
nur = {
|
|
||||||
url = "github:nix-community/NUR";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
agenix = {
|
agenix = {
|
||||||
url = "github:ryantm/agenix";
|
url = "github:ryantm/agenix";
|
||||||
inputs.darwin.follows = "";
|
inputs.darwin.follows = "";
|
||||||
|
|
@ -46,7 +42,6 @@
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-last-building,
|
nixpkgs-last-building,
|
||||||
nur,
|
|
||||||
nixos-facter-modules,
|
nixos-facter-modules,
|
||||||
nixos-hardware,
|
nixos-hardware,
|
||||||
determinate,
|
determinate,
|
||||||
|
|
@ -105,7 +100,6 @@
|
||||||
./extras/dev.nix
|
./extras/dev.nix
|
||||||
./extras/gaming.nix
|
./extras/gaming.nix
|
||||||
lsfg-vk-flake.nixosModules.default
|
lsfg-vk-flake.nixosModules.default
|
||||||
nur.modules.nixos.default
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
NOmom = nixpkgs.lib.nixosSystem {
|
NOmom = nixpkgs.lib.nixosSystem {
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,10 @@
|
||||||
nix.package = lib.mkIf (config.networking.hostName == "NOcomputer") pkgs.lixPackageSets.stable.lix;
|
nix.package = lib.mkIf (config.networking.hostName == "NOcomputer") pkgs.lixPackageSets.stable.lix;
|
||||||
|
|
||||||
programs.pmount.enable = true;
|
programs.pmount.enable = true;
|
||||||
services.eternal-terminal.enable = true;
|
|
||||||
programs.mosh.enable = true;
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
eternal-terminal
|
|
||||||
# keep-sorted start
|
# keep-sorted start
|
||||||
bat
|
bat
|
||||||
bottom
|
bottom
|
||||||
cachix
|
|
||||||
cifs-utils
|
cifs-utils
|
||||||
dumbpipe
|
dumbpipe
|
||||||
dust
|
dust
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,7 @@
|
||||||
"amdgpu"
|
"amdgpu"
|
||||||
];
|
];
|
||||||
|
|
||||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.kernelPackages = pkgs.nur.repos.Ev357.linux-patched;
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"amdgpu.abmlevel=1"
|
"amdgpu.abmlevel=1"
|
||||||
# amd doesn't have deep
|
# amd doesn't have deep
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@
|
||||||
{
|
{
|
||||||
name = "python";
|
name = "python";
|
||||||
auto-format = true;
|
auto-format = true;
|
||||||
language-servers = [/* "basedpyright" */ "ty" "ruff"];
|
language-servers = ["basedpyright" "ty" "ruff"];
|
||||||
# formatter = {
|
# formatter = {
|
||||||
# command = "ruff";
|
# command = "ruff";
|
||||||
# args = ["format"];
|
# args = ["format"];
|
||||||
|
|
@ -268,10 +268,10 @@
|
||||||
command = "microcad-lsp";
|
command = "microcad-lsp";
|
||||||
};
|
};
|
||||||
|
|
||||||
# basedpyright = {
|
basedpyright = {
|
||||||
# command = "basedpyright-langserver";
|
command = "basedpyright-langserver";
|
||||||
# args = ["--stdio"];
|
args = ["--stdio"];
|
||||||
# };
|
};
|
||||||
rust-analyzer.config.check.command = "clippy";
|
rust-analyzer.config.check.command = "clippy";
|
||||||
# gas = {
|
# gas = {
|
||||||
# command = "asm-lsp";
|
# command = "asm-lsp";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue