Format files
This commit is contained in:
parent
40a4e0e21f
commit
8f204d6f50
18 changed files with 161 additions and 95 deletions
3
extern/default.nix
vendored
3
extern/default.nix
vendored
|
@ -25,6 +25,5 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# passed to all home-manager modules
|
# passed to all home-manager modules
|
||||||
userSpecialArgs = {
|
userSpecialArgs = { };
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,8 @@
|
||||||
tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
|
tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
|
||||||
(import ./tests { inherit self pkgs; });
|
(import ./tests { inherit self pkgs; });
|
||||||
deployHosts = nixos.lib.filterAttrs
|
deployHosts = nixos.lib.filterAttrs
|
||||||
(n: _: self.nixosConfigurations.${n}.config.nixpkgs.system == system) self.deploy.nodes;
|
(n: _: self.nixosConfigurations.${n}.config.nixpkgs.system == system)
|
||||||
|
self.deploy.nodes;
|
||||||
deployChecks = deploy.lib.${system}.deployChecks { nodes = deployHosts; };
|
deployChecks = deploy.lib.${system}.deployChecks { nodes = deployHosts; };
|
||||||
in
|
in
|
||||||
nixos.lib.recursiveUpdate tests deployChecks;
|
nixos.lib.recursiveUpdate tests deployChecks;
|
||||||
|
|
|
@ -19,18 +19,19 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/75b8df4a-8839-40cd-92ad-dc83007199f4";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/75b8df4a-8839-40cd-92ad-dc83007199f4";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/B940-3C52";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/B940-3C52";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/1b49df34-6db0-487a-9bb1-306ede0245b0"; }
|
[{ device = "/dev/disk/by-uuid/1b49df34-6db0-487a-9bb1-306ede0245b0"; }];
|
||||||
];
|
|
||||||
|
|
||||||
boot.kernelParams = [ "intel_pstate=no_hwp" ];
|
boot.kernelParams = [ "intel_pstate=no_hwp" ];
|
||||||
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
|
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
|
||||||
|
|
46
hosts/tesco.nix
Normal file
46
hosts/tesco.nix
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{ suites, ... }@inputs:
|
||||||
|
{
|
||||||
|
imports = builtins.trace (builtins.attrNames inputs) (suites.desktop ++ suites.amd);
|
||||||
|
|
||||||
|
# This value determines the NixOS release from which the default
|
||||||
|
# settings for stateful data, like file locations and database versions
|
||||||
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
# this value at the release version of the first install of this system.
|
||||||
|
# Before changing this value read the documentation for this option
|
||||||
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
|
system.stateVersion = "20.09"; # Did you read the comment?
|
||||||
|
|
||||||
|
# Use the systemd-boot EFI boot loader.
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
networking.hostName = "tesco"; # Define your hostname.
|
||||||
|
networking.useDHCP = false;
|
||||||
|
networking.interfaces.enp6s0.useDHCP = true;
|
||||||
|
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{
|
||||||
|
device = "/dev/disk/by-uuid/71831856-336e-43b5-9ed8-a657939f95a9";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{
|
||||||
|
device = "/dev/disk/by-uuid/3B73-1D5D";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/home/mae" =
|
||||||
|
{
|
||||||
|
device = "/dev/disk/by-uuid/d7e91b96-f7e1-4feb-84d4-4e024746d73e";
|
||||||
|
fsType = "btrfs";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices =
|
||||||
|
[{ device = "/dev/disk/by-uuid/99d35be0-8935-4cec-bf58-4f666db922f0"; }];
|
||||||
|
|
||||||
|
}
|
13
profiles/amd/default.nix
Normal file
13
profiles/amd/default.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
hardware.opengl.driSupport = true;
|
||||||
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
rocm-opencl-icd
|
||||||
|
rocm-opencl-runtime
|
||||||
|
amdvlk
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
|
}
|
|
@ -27,6 +27,7 @@ in
|
||||||
manix
|
manix
|
||||||
moreutils
|
moreutils
|
||||||
nix-index
|
nix-index
|
||||||
|
tmux
|
||||||
nmap
|
nmap
|
||||||
ripgrep
|
ripgrep
|
||||||
whois
|
whois
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
networking.interfaces.enp0s31f6.useDHCP = true;
|
|
||||||
networking.interfaces.wlp3s0.useDHCP = true;
|
|
||||||
|
|
||||||
xdg.portal.enable = true;
|
xdg.portal.enable = true;
|
||||||
|
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
{
|
{
|
||||||
system = with profiles; rec {
|
system = with profiles; rec {
|
||||||
base = [ users.mae users.root ];
|
base = [ users.mae users.root ];
|
||||||
|
amd = [ profiles.amd ];
|
||||||
desktop = base ++ [ sway develop game workstation ssh users.mae users.root ];
|
desktop = base ++ [ sway develop game workstation ssh users.mae users.root ];
|
||||||
lap = desktop ++ [ laptop bluetooth print networkmanager ];
|
lap = desktop ++ [ laptop bluetooth print networkmanager ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
withNodeJs = true;
|
withNodeJs = true;
|
||||||
|
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with pkgs.vimPlugins; [
|
||||||
{ plugin = coc-nvim;
|
{
|
||||||
|
plugin = coc-nvim;
|
||||||
config = ''
|
config = ''
|
||||||
nmap <silent> <F2> <Plug>(coc-rename)
|
nmap <silent> <F2> <Plug>(coc-rename)
|
||||||
|
|
||||||
|
@ -24,21 +25,26 @@
|
||||||
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
|
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
|
||||||
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
|
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
|
||||||
endif
|
endif
|
||||||
''; }
|
'';
|
||||||
|
}
|
||||||
fzf-vim
|
fzf-vim
|
||||||
{ plugin = iceberg-vim;
|
{
|
||||||
config = "colorscheme iceberg";}
|
plugin = iceberg-vim;
|
||||||
|
config = "colorscheme iceberg";
|
||||||
|
}
|
||||||
vim-sleuth
|
vim-sleuth
|
||||||
coc-json
|
coc-json
|
||||||
coc-html
|
coc-html
|
||||||
coc-tsserver
|
coc-tsserver
|
||||||
neoformat
|
neoformat
|
||||||
undotree
|
undotree
|
||||||
{ plugin = vim-jsdoc;
|
{
|
||||||
|
plugin = vim-jsdoc;
|
||||||
config = ''
|
config = ''
|
||||||
let g:jsdoc_formatter = "tsdoc"
|
let g:jsdoc_formatter = "tsdoc"
|
||||||
let g:typescript_indent_disable = 1
|
let g:typescript_indent_disable = 1
|
||||||
'';}
|
'';
|
||||||
|
}
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set background=dark
|
set background=dark
|
||||||
|
|
Loading…
Reference in a new issue