From fd0d7b5f9a8a1b2d62352f67e1dc4a7543c4a9fd Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Mon, 31 Jan 2022 11:03:32 +0100 Subject: [PATCH 1/5] misc changes --- home/capibara.nix | 3 ++- home/nixos-common.nix | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/home/capibara.nix b/home/capibara.nix index 288c36b..5914f16 100644 --- a/home/capibara.nix +++ b/home/capibara.nix @@ -1,5 +1,6 @@ { config, pkgs, ... }: { - imports = [ ./nixos-common.nix ./desktop-sway ./alacritty ./theming ]; + imports = + [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ]; } diff --git a/home/nixos-common.nix b/home/nixos-common.nix index b62146f..851c0a8 100644 --- a/home/nixos-common.nix +++ b/home/nixos-common.nix @@ -119,7 +119,9 @@ in { file gimp gnumake + html-tidy htop + j2cli jq killall libnotify @@ -131,8 +133,10 @@ in { networkmanagerapplet nextcloud-client pandoc + #pinentry pv ripgrep + sassc signify sxiv telnet From 2062fbe024f18977ec6e3c838e624a033ebfba26 Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Mon, 31 Jan 2022 11:53:42 +0100 Subject: [PATCH 2/5] docker stuff --- echidna.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/echidna.nix b/echidna.nix index ddcae5a..c0c7ace 100644 --- a/echidna.nix +++ b/echidna.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" ]; From c2c078dbabb08fc2999b828c67339420c0b97b2b Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Mon, 31 Jan 2022 13:06:18 +0100 Subject: [PATCH 3/5] misc changes --- capibara.nix | 24 ++++++++++++------------ home/nixos-common.nix | 7 ++++++- nixos/common.nix | 12 ++++++++++++ 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/capibara.nix b/capibara.nix index b41ebff..002b599 100644 --- a/capibara.nix +++ b/capibara.nix @@ -18,18 +18,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"; diff --git a/home/nixos-common.nix b/home/nixos-common.nix index 851c0a8..d21212d 100644 --- a/home/nixos-common.nix +++ b/home/nixos-common.nix @@ -146,7 +146,10 @@ in { services.syncthing.enable = true; - services.kdeconnect.enable = true; + services.kdeconnect = { + enable = true; + indicator = true; + }; programs.bat = { enable = true; @@ -172,6 +175,8 @@ in { startInBackground = true; }; + services.network-manager-applet.enable = true; + xdg.mimeApps = { enable = true; defaultApplications = { diff --git a/nixos/common.nix b/nixos/common.nix index d7804b2..386d874 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -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 From e2f0ecd47e8b9c7b931183814ffbb63ad9470f9e Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Tue, 1 Feb 2022 13:33:46 +0100 Subject: [PATCH 4/5] misc changes --- home/nixos-common.nix | 2 ++ nixos/common.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/nixos-common.nix b/home/nixos-common.nix index d21212d..c4a5f1a 100644 --- a/home/nixos-common.nix +++ b/home/nixos-common.nix @@ -50,6 +50,7 @@ in { ".cache" ".config/Nextcloud" ".config/chromium" + ".config/kdeconnect" ".config/whatsapp-for-linux" ".gnupg/private-keys-v1.d" ".local/share/keyrings" @@ -58,6 +59,7 @@ in { ".mozilla" ".newsboat" ".vdirsyncer" + ".local/var/pmbootstrap" ]; files = [ ".gnupg/pubring.kbx" diff --git a/nixos/common.nix b/nixos/common.nix index 386d874..4c421ed 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -290,7 +290,6 @@ in { "/etc/nixos" "/var/lib/libvirt" ]; - files = [ "/etc/wireguard/wg0" ]; }; }; From 5ec54fbaecc0de40e10ba1f17f3d52e4e92d9f78 Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Tue, 1 Feb 2022 19:43:12 +0100 Subject: [PATCH 5/5] moved to unstable --- capibara.nix | 3 ++- home/alacritty/common.nix | 2 +- home/nixos-common.nix | 1 - trantor.nix | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/capibara.nix b/capibara.nix index 002b599..ae75029 100644 --- a/capibara.nix +++ b/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 = [ diff --git a/home/alacritty/common.nix b/home/alacritty/common.nix index 7ee1f71..75891d2 100644 --- a/home/alacritty/common.nix +++ b/home/alacritty/common.nix @@ -4,7 +4,7 @@ programs.alacritty = { enable = true; settings = { - background_opacity = 0.9; + window.opacity = 0.9; colors = { primary = { background = "#282828"; diff --git a/home/nixos-common.nix b/home/nixos-common.nix index c4a5f1a..04c4c78 100644 --- a/home/nixos-common.nix +++ b/home/nixos-common.nix @@ -59,7 +59,6 @@ in { ".mozilla" ".newsboat" ".vdirsyncer" - ".local/var/pmbootstrap" ]; files = [ ".gnupg/pubring.kbx" diff --git a/trantor.nix b/trantor.nix index c33d5e4..122dd5c 100644 --- a/trantor.nix +++ b/trantor.nix @@ -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 = [