reformat code

This commit is contained in:
Charlotte 🦝 Delenk 2022-01-19 09:28:39 +01:00
parent 345c716052
commit 296434cb93
Signed by: darkkirb
GPG key ID: 015E3768A70AFBC5
10 changed files with 49 additions and 30 deletions

View file

@ -11,5 +11,5 @@ desktop: { pkgs, ... }: {
../programs/ims.nix ../programs/ims.nix
../programs/syncthing.nix ../programs/syncthing.nix
../programs/mpd.nix ../programs/mpd.nix
] else []); ] else [ ]);
} }

View file

@ -30,79 +30,92 @@
}; };
fileSystems."/" = fileSystems."/" =
{ device = "ssd/nixos"; {
device = "ssd/nixos";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "ssd/nixos/nix"; {
device = "ssd/nixos/nix";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/etc" = fileSystems."/etc" =
{ device = "ssd/nixos/etc"; {
device = "ssd/nixos/etc";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/var" = fileSystems."/var" =
{ device = "ssd/nixos/var"; {
device = "ssd/nixos/var";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/var/lib" = fileSystems."/var/lib" =
{ device = "ssd/nixos/var/lib"; {
device = "ssd/nixos/var/lib";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/var/log" = fileSystems."/var/log" =
{ device = "ssd/nixos/var/log"; {
device = "ssd/nixos/var/log";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/var/spool" = fileSystems."/var/spool" =
{ device = "ssd/nixos/var/spool"; {
device = "ssd/nixos/var/spool";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "ssd/userdata/home"; {
device = "ssd/userdata/home";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/root" = fileSystems."/root" =
{ device = "ssd/userdata/home/root"; {
device = "ssd/userdata/home/root";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/home/tank" = fileSystems."/home/tank" =
{ device = "ssd/userdata/home/tank"; {
device = "ssd/userdata/home/tank";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/home/darkkirb/hdd" = fileSystems."/home/darkkirb/hdd" =
{ device = "hdd/userdata/home/darkkirb/hdd"; {
device = "hdd/userdata/home/darkkirb/hdd";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/root/hdd" = fileSystems."/root/hdd" =
{ device = "hdd/userdata/home/root/hdd"; {
device = "hdd/userdata/home/root/hdd";
fsType = "zfs"; fsType = "zfs";
options = [ "zfsutil" ]; options = [ "zfsutil" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CA0B-E049"; {
device = "/dev/disk/by-uuid/CA0B-E049";
fsType = "vfat"; fsType = "vfat";
}; };
@ -119,7 +132,7 @@
networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:47e6:24d4:2acb:9437/64" ]; networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:47e6:24d4:2acb:9437/64" ];
home-manager.users.darkkirb = import ./home-manager/darkkirb.nix true; home-manager.users.darkkirb = import ./home-manager/darkkirb.nix true;
networking.nameservers = ["192.168.2.1"]; networking.nameservers = [ "192.168.2.1" ];
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
} }

View file

@ -23,9 +23,11 @@
subpixel = "rgb"; subpixel = "rgb";
}; };
}; };
keybindings = let keybindings =
let
modifier = config.wayland.windowManager.sway.config.modifier; modifier = config.wayland.windowManager.sway.config.modifier;
in lib.mkOptionDefault { in
lib.mkOptionDefault {
"${modifier}+Return" = "exec ${pkgs.alacritty}/bin/alacritty"; "${modifier}+Return" = "exec ${pkgs.alacritty}/bin/alacritty";
"${modifier}+d" = "exec ${pkgs.wofi}/bin/wofi --show drun"; "${modifier}+d" = "exec ${pkgs.wofi}/bin/wofi --show drun";
}; };

View file

@ -1,4 +1,6 @@
{ pkgs, ... }: let dsquotes = "''"; in { { pkgs, ... }:
let dsquotes = "''"; in
{
programs.neovim = { programs.neovim = {
enable = true; enable = true;
coc = { coc = {
@ -187,7 +189,9 @@
''; '';
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nerdtree nerdtree-git-plugin vim-devicons nerdtree
nerdtree-git-plugin
vim-devicons
ctrlp-vim ctrlp-vim
vim-nix vim-nix
tagbar tagbar

View file

@ -18,7 +18,7 @@
slurp slurp
wl-clipboard wl-clipboard
wf-recorder wf-recorder
(python38.withPackages(ps: with ps; [ i3pystatus keyring ])) (python38.withPackages (ps: with ps; [ i3pystatus keyring ]))
]; ];
extraSessionCommands = '' extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland