work
Matthew Ess 2020-11-15 00:08:06 -05:00
parent f104978e38
commit 1467c20e3d
3 changed files with 50 additions and 14 deletions

View File

@ -53,10 +53,14 @@
fira-code-symbols fira-code-symbols
font-awesome_4 font-awesome_4
aileron aileron
gohufont
spleen
tamsyn
siji
unscii
]; ];
fontconfig = { fontconfig = {
enable = true; enable = true;
penultimate.enable = true;
defaultFonts = { monospace = [ "Fira Code" ]; }; defaultFonts = { monospace = [ "Fira Code" ]; };
}; };
}; };
@ -95,7 +99,7 @@
services = { services = {
fprintd = { fprintd = {
enable = true; enable = true;
package = pkgs.fprintd-thinkpad; # package = pkgs.fprintd-thinkpad;
}; };
openssh.enable = true; openssh.enable = true;
clipmenu.enable = true; clipmenu.enable = true;
@ -132,8 +136,6 @@
}; };
displayManager = { displayManager = {
defaultSession = "home-manager"; defaultSession = "home-manager";
lightdm = {
enable = true;
autoLogin = { autoLogin = {
enable = true; enable = true;
user = "mat"; user = "mat";
@ -141,13 +143,16 @@
}; };
}; };
}; };
};
# Enable sound. # Enable sound.
sound.enable = true; sound.enable = true;
# Hardware switches # Hardware switches
hardware = { hardware = {
logitech.wireless = {
enable = true;
# enableGraphical = true;
};
opengl = { opengl = {
driSupport32Bit = true; driSupport32Bit = true;
extraPackages32 = [ pkgs.pkgsi686Linux.libva ]; extraPackages32 = [ pkgs.pkgsi686Linux.libva ];

View File

@ -7,6 +7,9 @@ let
lockCmd = "i3lock -i ~/.lockscreen-image"; lockCmd = "i3lock -i ~/.lockscreen-image";
statusCmd = "i3status-rs ~/.config/i3status.toml"; statusCmd = "i3status-rs ~/.config/i3status.toml";
nixpkgs-lldb = import <nixpkgs-vscode-lldb> {};
nixpkgs-ra = import <nixpkgs-ra> {};
in { in {
nixpkgs = { config = { allowUnfree = true; }; }; nixpkgs = { config = { allowUnfree = true; }; };
home = { home = {
@ -37,12 +40,15 @@ in {
discord discord
(dunst.override { dunstify = true; }) (dunst.override { dunstify = true; })
enpass enpass
fractal
firefox firefox
httpie httpie
kitty kitty
nheko signal-desktop
slack slack
steam steam
xfce.thunar
xfce.thunar-archive-plugin
# graphical utilities # graphical utilities
clipmenu clipmenu
clipnotify clipnotify
@ -50,6 +56,7 @@ in {
i3lock i3lock
i3status-rust i3status-rust
libnotify libnotify
lxappearance
rofi rofi
xclip xclip
]; ];
@ -58,7 +65,6 @@ in {
".lockscreen-image".source = ./assets/lockscreen-image; ".lockscreen-image".source = ./assets/lockscreen-image;
".config/fish/fishfile".text = '' ".config/fish/fishfile".text = ''
laughedelic/pisces laughedelic/pisces
sijad/gitignore
joehillen/to-fish joehillen/to-fish
jethrokuan/z jethrokuan/z
decors/fish-colored-man decors/fish-colored-man
@ -155,6 +161,8 @@ in {
alias i3="vim ~/dotfiles.nix/i3.nix +'cd %:p:h'" alias i3="vim ~/dotfiles.nix/i3.nix +'cd %:p:h'"
alias config="vim ~/dotfiles.nix/configuration.nix +'cd %:p:h'" alias config="vim ~/dotfiles.nix/configuration.nix +'cd %:p:h'"
alias vims="vim -S Session.vim" alias vims="vim -S Session.vim"
alias bigscreen="xrandr --output eDP1 --off --output HDMI2 --auto"
alias smallscreen="xrandr --output eDP1 --auto --output HDMI2 --off"
bind \cr 'fzy_select_history (commandline -b)' bind \cr 'fzy_select_history (commandline -b)'
bind -M insert \cr 'fzy_select_history (commandline -b)' bind -M insert \cr 'fzy_select_history (commandline -b)'
@ -169,12 +177,13 @@ in {
git = { git = {
enable = true; enable = true;
userName = "${name}"; userName = "${name}";
userEmail = "${workEmail}"; userEmail = "${email}";
ignores = [ ".*.sw[a-z]" "tags" ]; ignores = [ ".*.sw[a-z]" "tags" ];
extraConfig = { extraConfig = {
color.ui = true; color.ui = true;
core.editor = "vim"; core.editor = "vim";
push.default = "simple"; push.default = "simple";
init.defaultBranch = "main";
}; };
}; };
htop = { htop = {
@ -224,8 +233,22 @@ in {
starship.enable = true; starship.enable = true;
vscode = { vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium.overrideAttrs (_: {
# extensions = with pkgs.vscode-extensions; []; preFixupPhases = [ "preFixup" ];
preFixup = ''
sed -i "s#open-vsx.org/vscode/gallery#marketplace.visualstudio.com/_apis/public/gallery#" $out/lib/vscode/resources/app/product.json
sed -i "s#open-vsx.org/vscode/item#marketplace.visualstudio.com/items#" $out/lib/vscode/resources/app/product.json
sed -i "s#open-vsx.org#marketplace.visualstudio.com#" $out/lib/vscode/resources/app/product.json
'';
});
extensions = with pkgs.vscode-extensions; [
# matklad.rust-analyzer
nixpkgs-ra.vscode-extensions.matklad.rust-analyzer
ms-python.python
skyapps.fish-vscode
# vadimcn.vscode-lldb
nixpkgs-lldb.vscode-extensions.vadimcn.vscode-lldb
];
}; };
}; };
services = { services = {

10
i3.nix
View File

@ -89,6 +89,8 @@
"${modifier}+7" = "workspace number 7"; "${modifier}+7" = "workspace number 7";
"${modifier}+8" = "workspace number 8"; "${modifier}+8" = "workspace number 8";
"${modifier}+9" = "workspace number 9"; "${modifier}+9" = "workspace number 9";
# "${modifier}+Shift+Right" = "workspace next";
# "${modifier}+Shift+Left" = "workspace prev";
"${modifier}+d" = "exec --no-startup-id rofi -show run"; "${modifier}+d" = "exec --no-startup-id rofi -show run";
"XF86AudioRaiseVolume" = "exec --no-startup-id amixer sset Master 5%+"; "XF86AudioRaiseVolume" = "exec --no-startup-id amixer sset Master 5%+";
"XF86AudioLowerVolume" = "exec --no-startup-id amixer sset Master 5%-"; "XF86AudioLowerVolume" = "exec --no-startup-id amixer sset Master 5%-";
@ -98,11 +100,17 @@
workspaceLayout = "tabbed"; workspaceLayout = "tabbed";
assigns = { assigns = {
"1: web" = [{ class = "Firefox"; }]; "1: web" = [{ class = "Firefox"; }];
"2: devel" = [ { class = "(?i)kitty"; } { class = "(?i)(vsc|c)odium"; } ]; "2: devel" = [
{ class = "(?i)kitty"; }
{ class = "(?i)(vsc|c)odium"; }
{ class = "(?i)thunar"; }
];
"3: social" = [ "3: social" = [
{ class = "(?i)nheko"; } { class = "(?i)nheko"; }
{ class = "Slack"; } { class = "Slack"; }
{ class = "discord"; } { class = "discord"; }
{ class = "(?i)signal(-desktop)?"; }
{ class = "(?i)fractal"; }
]; ];
"4: other" = [{ class = ".*"; }]; "4: other" = [{ class = ".*"; }];
}; };