reorganise

This commit is contained in:
tristan 2023-04-15 13:55:16 +01:00
parent 98af4d5664
commit 744f70fc87
14 changed files with 72 additions and 64 deletions

View file

@ -0,0 +1,123 @@
exec-once= ~/.local/scripts/autostart
monitor=,preferred,auto,1
input {
kb_file=
kb_layout=gb
kb_variant=dvorak
kb_model=
kb_options=caps:escape
kb_rules=
follow_mouse=1
touchpad {
natural_scroll=yes
}
sensitivity=0
accel_profile=flat
}
general {
gaps_in=5
gaps_out=20
border_size=2
col.active_border=0x66ee1111
col.inactive_border=0x66333333
apply_sens_to_raw=0
layout = master
}
decoration {
rounding=5
blur=0
blur_size=3 # minimum 1
blur_passes=1 # minimum 1
blur_new_optimizations=1
}
bezier=overshot, 0.05, 0.9, 0.1, 1.1
animations {
enabled=1
animation=windows,1,5,default
animation=border,1,5,default
animation=fade,1,10,default
animation=workspaces,1,3,overshot
}
dwindle {
pseudotile=0 # enable pseudotiling on dwindle
}
gestures {
workspace_swipe=yes
}
bindm=SUPER,mouse:272,movewindow
bindm=SUPER,mouse:273,resizewindow
bind=SUPER,RETURN,exec,foot
bind=SUPER_SHIFT,Q,killactive,
bind=SUPER,M,exec,foot -e ncmpcpp
bind=SUPER,E,exec,foot -e neomutt
bind=SUPER,O,exec,pcmanfm
bind=SUPER,y,exec,foot -e ytui
bind=SUPER,Z,exec,swaylock -f
bind=SUPER,T,exec,notify-send "$(date)"
bind=SUPER_SHIFT,S,exec,~/.local/scripts/screenshot
bind=SUPERCTRL_SHIFT,S,exec,qrcode.sh
bind=SUPER,p,exec,hyprpicker | wl-copy; wl-paste | xargs notify-send Copied
bind=SUPER,slash,exec,brave
bind=SUPER,V,togglefloating,
bind=SUPER,F,fullscreen,
bind=SUPER,d,exec,wofi --show drun
bind=SUPER_SHIFT,P,exec,~/.local/scripts/bwmenu
bind=SUPER,apostrophe,exec,notify-send -i mpv "$(playerctl metadata --format '{{title}}')" "$(playerctl metadata --format '{{album}}')" -t 3000
bind=SUPER_SHIFT,E,exit,
bind=,XF86AudioRaiseVolume,exec,amixer -D pulse sset Master 5%+ && amixer sset Master unmute
bind=,XF86AudioLowerVolume,exec,amixer -D pulse sset Master 5%-
bind=,XF86AudioPlay,exec,~/.local/scripts/play-pause
bind=,XF86AudioNext,exec,playerctl next
bind=,XF86AudioPrev,exec,playerctl previous
bind=SUPER,h,movefocus,l
bind=SUPER,l,movefocus,r
bind=SUPER,j,layoutmsg,cyclenext
bind=SUPER,k,layoutmsg,cycleprev
bind=SUPER,space,layoutmsg,swapwithmaster
master {
new_is_master= true
new_on_top= true
}
bind=SUPER,1,workspace,1
bind=SUPER,2,workspace,2
bind=SUPER,3,workspace,3
bind=SUPER,4,workspace,4
bind=SUPER,5,workspace,5
bind=SUPER,6,workspace,6
bind=SUPER,7,workspace,7
bind=SUPER,8,workspace,8
bind=SUPER,9,workspace,9
bind=SUPER,0,workspace,10
bind=SUPER_SHIFT,1,movetoworkspace,1
bind=SUPER_SHIFT,2,movetoworkspace,2
bind=SUPER_SHIFT,3,movetoworkspace,3
bind=SUPER_SHIFT,4,movetoworkspace,4
bind=SUPER_SHIFT,5,movetoworkspace,5
bind=SUPER_SHIFT,6,movetoworkspace,6
bind=SUPER_SHIFT,7,movetoworkspace,7
bind=SUPER_SHIFT,8,movetoworkspace,8
bind=SUPER_SHIFT,9,movetoworkspace,9
bind=SUPER_SHIFT,0,movetoworkspace,10
bind=SUPER,mouse_down,workspace,e+1
bind=SUPER,mouse_up,workspace,e-1

48
system/work/hardware.nix Normal file
View file

@ -0,0 +1,48 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/48a07e82-1090-448c-a751-3a410afba0f7";
fsType = "btrfs";
options = [ "subvol=@" "compress=zstd" "autodefrag" ];
};
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/570cc51f-bd5c-4bee-a18f-f6aabaf60881";
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/48a07e82-1090-448c-a751-3a410afba0f7";
fsType = "btrfs";
options = [ "subvol=@home" "compress=zstd" "autodefrag" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/EED9-A165";
fsType = "vfat";
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp53s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp54s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

56
system/work/home.nix Normal file
View file

@ -0,0 +1,56 @@
{ config, pkgs, user, name, ... }:
# https://nix-community.github.io/home-manager/options.html
{
# don't change
home.stateVersion = "22.05";
home.packages = with pkgs; [
];
programs.git = {
enable = true;
userName = "tristan";
userEmail = "tristan@tristans.cloud";
aliases = {
graph = "log --oneline --all --graph";
amend = "commit --amend --no-edit";
};
};
accounts.email.accounts."tristan@tristans.cloud" = {
notmuch.enable = true;
neomutt.enable = true;
mbsync.enable = true;
mbsync.create = "maildir";
userName = "tristan@tristans.cloud";
realName = "Tristan";
address = "tristan@tristans.cloud";
primary = true;
passwordCommand = "rbw get privateemail";
smtp = {
host = "mail.privateemail.com";
port = 465;
tls.enable = true;
};
imap = {
host = "mail.privateemail.com";
port = 993;
tls.enable = true;
};
};
programs.notmuch.enable = true;
programs.neomutt = {
enable = true;
vimKeys = true;
sort = "reverse-date";
sidebar.enable = true;
};
programs.mbsync.enable = true;
services.mbsync.enable = true;
home.file.".config/hypr/hyprland.conf" = {
source = ./config/hypr.conf;
};
}

19
system/work/system.nix Normal file
View file

@ -0,0 +1,19 @@
# https://search.nixos.org/options
{ config, pkgs, ... }:
{
networking.hostName = "FCS-Tristan-Nixbook";
services.xserver = {
layout = "gb";
xkbVariant = "dvorak";
xkbOptions = "caps:escape";
};
networking.firewall.allowedTCPPorts = [ ];
system.stateVersion = "22.11"; # do not change
}