diff --git a/system/global/home.nix b/system/global/home.nix index 8ead5fc..ba3022c 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -64,21 +64,6 @@ in home.homeDirectory = "/home/tristan"; xdg.userDirs.enable = true; - xdg.mimeApps = { - enable = true; - associations.added = { - "inode/directory" = "lf.desktop;vscodium.desktop;pcmanfm.desktop"; - }; - defaultApplications = { - "image/png" = "imv.desktop"; - "image/jpeg" = "imv.desktop"; - "image/jpg" = "imv.desktop"; - "inode/directory" = "lf.desktop"; - "text/html" = "brave-browser.desktop"; - "x-scheme-handler/http" = "brave-browser.desktop"; - "x-scheme-handler/https" = "brave-browser.desktop"; - }; - }; home.packages = (with pkgs; [ libnotify @@ -764,12 +749,26 @@ color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a- "text/html" = "html | colorize"; }; + home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = '' + context.modules = [ + { + name = libpipewire-module-raop-discover + args = { } + } + ] + ''; + systemd.user.services = { + snapclient = { + Unit = { + Description = "Snapclient"; + }; + Service = { + ExecStart = "${pkgs.snapcast}/bin/snapclient -h music.local"; + }; + }; + }; + }; } - - - - - diff --git a/system/global/system.nix b/system/global/system.nix index 41a33ae..32f3c2c 100644 --- a/system/global/system.nix +++ b/system/global/system.nix @@ -1,4 +1,3 @@ - # https://search.nixos.org/options { config, pkgs, ... }: @@ -9,7 +8,7 @@ }; nix.settings.trusted-users = [ "root" "tristan" ]; - + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -17,7 +16,7 @@ programs.nm-applet.enable = true; time.timeZone = "Europe/London"; - + console = { font = "Lat2-Terminus16"; useXkbConfig = true; @@ -33,10 +32,12 @@ pulse.enable = true; jack.enable = true; }; + # pipewire raop + networking.firewall.allowedUDPPorts = [ 6002 6001 ]; - security.pam.services.swaylock = {}; + services.avahi.enable = true; - security.doas.enable = true; + security.pam.services.swaylock = { }; i18n.defaultLocale = "en_GB.UTF-8"; @@ -75,10 +76,6 @@ VISUAL = "nvim"; TERMINAL = "foot"; }; - - environment.shellAliases = { - code = "codium"; - }; services.gvfs.enable = true; environment.systemPackages = with pkgs; [ @@ -96,7 +93,7 @@ configure = { packages.myPlugins = with pkgs.vimPlugins; { start = [ vim-surround vim-commentary vim-nix ]; - opt = []; + opt = [ ]; }; customRC = '' vnoremap * y/\V=escape(@",'/\') diff --git a/system/work/home.nix b/system/work/home.nix index 867039f..13b5963 100644 --- a/system/work/home.nix +++ b/system/work/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, user, name, ... }: +{ config, pkgs, user, name, lib, ... }: # https://nix-community.github.io/home-manager/options.html let brave-nightly = pkgs.callPackage ../../custom/brave-nightly/. { }; @@ -13,6 +13,8 @@ in kubectl awscli2 docker-compose + minikube + kubernetes-helm gimp libreoffice ansible @@ -23,6 +25,12 @@ in exec = "${brave-nightly}/opt/brave.com/brave-nightly/brave-browser-nightly --app-id=cifhbcnohmdccbgoicgdjpfamggdegmo --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations"; icon = "brave-cifhbcnohmdccbgoicgdjpfamggdegmo-Default"; }) + (pkgs.makeDesktopItem { + name = "slack"; + desktopName = "Slack"; + exec = "${brave}/opt/brave.com/brave/brave-browser --app-id=dgboickhmnkjicgoildlenjnlaokbiib --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations"; + icon = "brave-dgboickhmnkjicgoildlenjnlaokbiib-Default"; + }) (pkgs.makeDesktopItem { name = "logseq"; desktopName = "Logseq"; @@ -61,4 +69,15 @@ in programs.firefox.enable = true; + programs.vscode = { + package = lib.mkForce pkgs.vscode; + extensions = with pkgs; [ + vscode-extensions.ms-azuretools.vscode-docker + ]; + userSettings = { + "aws.telemetry" = false; + "gitlens.telemetry.enabled" = false; + }; + }; + } diff --git a/system/work/system.nix b/system/work/system.nix index 9687f90..69d4e79 100644 --- a/system/work/system.nix +++ b/system/work/system.nix @@ -1,6 +1,6 @@ # https://search.nixos.org/options -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { networking.hostName = "FCS-Tristan-Nixbook"; @@ -16,6 +16,12 @@ openvpn3 ]; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + # nonfree vscode required for dev containers + "vscode" + ]; + + networking.firewall.allowedTCPPorts = [ ]; system.stateVersion = "22.11"; # do not change