Merge branch 'master' of ssh://narwhal/nix-config
commit
191f6b979d
27
capibara.nix
27
capibara.nix
|
|
@ -7,7 +7,8 @@
|
|||
let
|
||||
home-manager = builtins.fetchTarball {
|
||||
url =
|
||||
"https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz";
|
||||
# "https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz";
|
||||
"https://github.com/nix-community/home-manager/archive/master.tar.gz";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
|
|
@ -18,18 +19,18 @@ in {
|
|||
|
||||
home-manager.users.rilla = import home/capibara.nix;
|
||||
|
||||
fileSystems = {
|
||||
"/home/rilla/Music" = {
|
||||
device = "narwhal:/music";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"nfsvers=4"
|
||||
"noauto"
|
||||
"x-systemd.automount"
|
||||
"x-systemd.idle-timeout=1min"
|
||||
];
|
||||
};
|
||||
};
|
||||
#fileSystems = {
|
||||
# "/home/rilla/Music" = {
|
||||
# device = "narwhal:/music";
|
||||
# fsType = "nfs";
|
||||
# options = [
|
||||
# "nfsvers=4"
|
||||
# "noauto"
|
||||
# "x-systemd.automount"
|
||||
# "x-systemd.idle-timeout=1min"
|
||||
# ];
|
||||
# };
|
||||
#};
|
||||
|
||||
environment.variables.NIXOS_CONFIG =
|
||||
"/home/rilla/configs/nix-config/capibara.nix";
|
||||
|
|
|
|||
|
|
@ -14,9 +14,13 @@ in {
|
|||
# environment.systemPackages = [ ];
|
||||
environment.systemPackages = [
|
||||
choose-pass
|
||||
pkgs.ansible
|
||||
pkgs.cheat
|
||||
pkgs.coreutils-full
|
||||
pkgs.csvkit
|
||||
pkgs.curl
|
||||
pkgs.docker-client
|
||||
pkgs.docker-machine
|
||||
pkgs.fzf
|
||||
pkgs.gnupg
|
||||
pkgs.google-cloud-sdk
|
||||
|
|
@ -24,8 +28,10 @@ in {
|
|||
pkgs.jq
|
||||
pkgs.mosh
|
||||
pkgs.pass
|
||||
pkgs.pipenv
|
||||
pkgs.ripgrep
|
||||
pkgs.terraform
|
||||
pkgs.vagrant
|
||||
pkgs.wireguard
|
||||
pkgs.yubikey-personalization
|
||||
];
|
||||
|
|
@ -33,6 +39,7 @@ in {
|
|||
# Use a custom configuration.nix location.
|
||||
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
|
||||
environment.darwinConfig = "/Users/rilla/configs/nix-config/echidna.nix";
|
||||
# environment.variables.DOCKER_HOST = "tcp://localhost:2375";
|
||||
|
||||
# Auto upgrade nix package and the daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
|
|
@ -58,7 +65,7 @@ in {
|
|||
brewfile = true;
|
||||
noLock = true;
|
||||
};
|
||||
casks = [ "kmbmpdc" "librewolf" ];
|
||||
casks = [ "kmbmpdc" "librewolf" "virtualbox" ];
|
||||
brews = [ "mpd" "choose-gui" "vitetris" ];
|
||||
taps =
|
||||
[ "homebrew/bundle" "homebrew/cask" "homebrew/core" "homebrew/services" ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
background_opacity = 0.9;
|
||||
window.opacity = 0.9;
|
||||
colors = {
|
||||
primary = {
|
||||
background = "#282828";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./nixos-common.nix ./desktop-sway ./alacritty ./theming ];
|
||||
imports =
|
||||
[ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ in {
|
|||
".cache"
|
||||
".config/Nextcloud"
|
||||
".config/chromium"
|
||||
".config/kdeconnect"
|
||||
".config/whatsapp-for-linux"
|
||||
".gnupg/private-keys-v1.d"
|
||||
".local/share/keyrings"
|
||||
|
|
@ -119,7 +120,9 @@ in {
|
|||
file
|
||||
gimp
|
||||
gnumake
|
||||
html-tidy
|
||||
htop
|
||||
j2cli
|
||||
jq
|
||||
killall
|
||||
libnotify
|
||||
|
|
@ -131,8 +134,10 @@ in {
|
|||
networkmanagerapplet
|
||||
nextcloud-client
|
||||
pandoc
|
||||
#pinentry
|
||||
pv
|
||||
ripgrep
|
||||
sassc
|
||||
signify
|
||||
sxiv
|
||||
telnet
|
||||
|
|
@ -142,7 +147,10 @@ in {
|
|||
|
||||
services.syncthing.enable = true;
|
||||
|
||||
services.kdeconnect.enable = true;
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
indicator = true;
|
||||
};
|
||||
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
|
|
@ -168,6 +176,8 @@ in {
|
|||
startInBackground = true;
|
||||
};
|
||||
|
||||
services.network-manager-applet.enable = true;
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
|
|
|
|||
|
|
@ -28,8 +28,20 @@ in {
|
|||
interfaces = { };
|
||||
|
||||
firewall = {
|
||||
|
||||
# 51820 is used by wireguard
|
||||
allowedUDPPorts = [ 51820 ];
|
||||
|
||||
# 1714 - 1764 is used by kdeconnect
|
||||
allowedTCPPortRanges = [{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
}];
|
||||
allowedUDPPortRanges = [{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
}];
|
||||
|
||||
# if packets are still dropped, they will show up in dmesg
|
||||
logReversePathDrops = true;
|
||||
# wireguard trips rpfilter up
|
||||
|
|
@ -278,7 +290,6 @@ in {
|
|||
"/etc/nixos"
|
||||
"/var/lib/libvirt"
|
||||
];
|
||||
files = [ "/etc/wireguard/wg0" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,10 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
impermanence = builtins.fetchTarball {
|
||||
url = "https://github.com/nix-community/impermanence/archive/master.tar.gz";
|
||||
};
|
||||
home-manager = builtins.fetchTarball {
|
||||
url =
|
||||
"https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz";
|
||||
# "https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz";
|
||||
"https://github.com/nix-community/home-manager/archive/master.tar.gz";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
|
|
|
|||
Loading…
Reference in New Issue