From f5f53226223a3c0ab1a08a0c19bc36252a50bb48 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 18 Mar 2022 21:14:51 +0100 Subject: [PATCH] Updates --- flake.lock | 8 +- flake.nix | 14 ++-- home-manager/modules/alacritty/default.nix | 10 +-- home-manager/modules/emacs/default.nix | 6 ++ home-manager/modules/firefox/default.nix | 24 ++++-- home-manager/modules/sway/default.nix | 2 +- home-manager/modules/vscode/default.nix | 1 + krops.nix | 2 +- modules/base/default.nix | 1 + modules/desktop/default.nix | 31 +++---- modules/greetd/default.nix | 95 +++++++++++----------- modules/networking/default.nix | 34 ++++---- overlays/default.nix | 9 +- 13 files changed, 128 insertions(+), 109 deletions(-) diff --git a/flake.lock b/flake.lock index 8f40784..615021a 100644 --- a/flake.lock +++ b/flake.lock @@ -151,12 +151,12 @@ "rev": "bbef9ba8195a85022a5aa19a988872b6b7036836", "revCount": 21, "type": "git", - "url": "ssh://git@git.datarift.nl/erwin/ha-now-playing.git" + "url": "https://git.datarift.nl/erwin/ha-now-playing.git" }, "original": { "ref": "main", "type": "git", - "url": "ssh://git@git.datarift.nl/erwin/ha-now-playing.git" + "url": "https://git.datarift.nl/erwin/ha-now-playing.git" } }, "home-manager": { @@ -319,12 +319,12 @@ "rev": "7c037fef4cdc5933a70694d8c743b5439c8354ea", "revCount": 4, "type": "git", - "url": "ssh://git@git.datarift.nl/erwin/pamedia-rs.git" + "url": "https://git.datarift.nl/erwin/pamedia-rs.git" }, "original": { "ref": "main", "type": "git", - "url": "ssh://git@git.datarift.nl/erwin/pamedia-rs.git" + "url": "https://git.datarift.nl/erwin/pamedia-rs.git" } }, "pybind11-stubgen-src": { diff --git a/flake.nix b/flake.nix index 579afa2..73a9020 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ }; ha-now-playing = { - url = "git+ssh://git@git.datarift.nl/erwin/ha-now-playing.git?ref=main"; + url = "git+https://git.datarift.nl/erwin/ha-now-playing.git?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "flake-utils"; inputs.naersk.follows = "naersk"; @@ -62,7 +62,7 @@ }; pamedia = { - url = "git+ssh://git@git.datarift.nl/erwin/pamedia-rs.git?ref=main"; + url = "git+https://git.datarift.nl/erwin/pamedia-rs.git?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "flake-utils"; inputs.naersk.follows = "naersk"; @@ -150,11 +150,11 @@ # }; nixosModules = builtins.listToAttrs (map - (x: { - name = x; - value = import (./modules + "/${x}"); - }) - (builtins.attrNames (builtins.readDir ./modules))); + (x: { + name = x; + value = import (./modules + "/${x}"); + }) + (builtins.attrNames (builtins.readDir ./modules))); nixosConfigurations = { vm1 = defSystem "x86_64-linux" { diff --git a/home-manager/modules/alacritty/default.nix b/home-manager/modules/alacritty/default.nix index cc286de..445c94b 100644 --- a/home-manager/modules/alacritty/default.nix +++ b/home-manager/modules/alacritty/default.nix @@ -7,11 +7,11 @@ with lib; let cfg = config.eboskma.programs.alacritty; importYAML = name: yamlFile: (lib.importJSON ((pkgs.runCommandNoCC name {} '' - mkdir -p $out - ${pkgs.yaml2json}/bin/yaml2json < ${yamlFile} | ${pkgs.jq}/bin/jq -a '.' > $out/tmp.json - '') - .outPath - + "/tmp.json")); + mkdir -p $out + ${pkgs.yaml2json}/bin/yaml2json < ${yamlFile} | ${pkgs.jq}/bin/jq -a '.' > $out/tmp.json + '') + .outPath + + "/tmp.json")); theme = importYAML "theme" (builtins.fetchurl { url = "https://raw.githubusercontent.com/dracula/alacritty/05faff15c0158712be87d200081633d9f4850a7d/dracula.yml"; sha256 = "1366rvvni2shbqlcrbypjv4f7p7ccdr6bvr685jnj8ipwqjjb6rn"; diff --git a/home-manager/modules/emacs/default.nix b/home-manager/modules/emacs/default.nix index 940a83a..8ddc9bf 100644 --- a/home-manager/modules/emacs/default.nix +++ b/home-manager/modules/emacs/default.nix @@ -21,5 +21,11 @@ in { # emacsPackage = pkgs.emacs-nox; # doomPrivateDir = ./doom.d; # }; + + home.packages = with pkgs; [ + (texlive.combine { + inherit (texlive) scheme-small wrapfig ulem capt-of; + }) + ]; }; } diff --git a/home-manager/modules/firefox/default.nix b/home-manager/modules/firefox/default.nix index 18acc54..fea82fa 100644 --- a/home-manager/modules/firefox/default.nix +++ b/home-manager/modules/firefox/default.nix @@ -24,20 +24,26 @@ with lib; let nonDefaultDesktop = pkgs.makeDesktopItem { name = "firefox-" - + (if cfg.work - then "private" - else "horus"); + + ( + if cfg.work + then "private" + else "horus" + ); desktopName = "Firefox (" - + (if cfg.work - then "Private" - else "Horus") + + ( + if cfg.work + then "Private" + else "Horus" + ) + ")"; exec = "firefox -P " - + (if cfg.work - then "private" - else "horus") + + ( + if cfg.work + then "private" + else "horus" + ) + " %u"; icon = "firefox"; categories = ["GNOME" "GTK" "Network" "WebBrowser"]; diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix index 091b6c5..084ff2c 100644 --- a/home-manager/modules/sway/default.nix +++ b/home-manager/modules/sway/default.nix @@ -257,7 +257,7 @@ in { xwayland = true; - systemdIntegration = false; + systemdIntegration = true; }; home = { diff --git a/home-manager/modules/vscode/default.nix b/home-manager/modules/vscode/default.nix index ec6710b..c72f3ea 100644 --- a/home-manager/modules/vscode/default.nix +++ b/home-manager/modules/vscode/default.nix @@ -28,6 +28,7 @@ in { denoland.vscode-deno # dlasagno.rasi # dprint.dprint + eamodio.gitlens editorconfig.editorconfig esbenp.prettier-vscode # EugenWiens.bitbake diff --git a/krops.nix b/krops.nix index 8e56ad2..9d7abcc 100644 --- a/krops.nix +++ b/krops.nix @@ -23,7 +23,7 @@ let pkgs.krops.writeCommand "deploy-${name}" { inherit command; source = source name; - target = target; + target = lib.mkTarget target; }; in rec { # Deployments diff --git a/modules/base/default.nix b/modules/base/default.nix index 2c62af8..67691ca 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -60,6 +60,7 @@ in { nix-template nvd usbutils + zip ]; services.udev = { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 51a269e..35cc09e 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -252,6 +252,7 @@ in { dbus.packages = [pkgs.gcr]; avahi.publish.workstation = true; gvfs.enable = true; + pcscd.enable = true; }; security = { @@ -269,21 +270,23 @@ in { pki.certificates = [(builtins.readFile ./horus-ca.pem)]; }; - environment.sessionVariables = { - _JAVA_AWT_WM_NONREPARENTING = "1"; - MOZ_ENABLE_WAYLAND = "1"; - MOZ_DBUS_REMOTE = "1"; - QT_QPA_PLATFORM = "wayland"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - QT_QPA_PLATFORMTHEME = "qt5ct"; - SDL_VIDEODRIVER = "wayland"; - SSH_AUTH_SOCK = ''''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh''; - AMD_VULKAN_ICD = "RADV"; - # NIXOS_OZONE_WL = "1"; - }; + environment = { + sessionVariables = { + _JAVA_AWT_WM_NONREPARENTING = "1"; + MOZ_ENABLE_WAYLAND = "1"; + MOZ_DBUS_REMOTE = "1"; + QT_QPA_PLATFORM = "wayland"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + SDL_VIDEODRIVER = "wayland"; + SSH_AUTH_SOCK = ''''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh''; + AMD_VULKAN_ICD = "RADV"; + # NIXOS_OZONE_WL = "1"; + }; - environment.etc = { - "X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + etc = { + "X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + }; }; }; } diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index 3f7130e..f3a47a1 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -11,58 +11,59 @@ in { enable = mkEnableOption "enable greetd"; }; - config = mkIf (cfg.enable) - { - services.greetd = { - enable = true; - restart = true; - settings = { - default_session = { - command = "${pkgs.sway}/bin/sway --config /etc/greetd/sway-config"; + config = + mkIf (cfg.enable) + { + services.greetd = { + enable = true; + restart = true; + settings = { + default_session = { + command = "${pkgs.sway}/bin/sway --config /etc/greetd/sway-config"; + }; }; }; - }; - environment.systemPackages = with pkgs; [greetd.gtkgreet quintom-cursor-theme papirus-icon-theme arc-theme]; + environment.systemPackages = with pkgs; [greetd.gtkgreet quintom-cursor-theme papirus-icon-theme arc-theme]; - environment.etc = { - "greetd/sway-config" = { - text = '' - # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. - exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit" - bindsym Mod4+shift+e exec swaynag \ - -t warning \ - -m 'What do you want to do?' \ - -b 'Poweroff' 'systemctl poweroff' \ - -b 'Reboot' 'systemctl reboot' - include /etc/sway/config.d/* - ''; - user = "greeter"; - group = "greeter"; - }; - "greetd/environments" = { - text = '' - ${pkgs.sway}/bin/sway - ${pkgs.bash}/bin/bash - ''; - user = "greeter"; - group = "greeter"; - }; - "sway/config.d/systemd-env.conf" = { - text = '' - exec_always --no-startup-id systemctl --user import-environment _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK - exec_always --no-startup-id dbus-update-activation-environment --systemd _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK - ''; - }; - "xdg/gtk-3.0/settings.ini" = { - text = generators.toINI {} { - Settings = { - gtk-theme-name = "Arc-Dark"; - gtk-icon-theme-name = "Papirus-Dark"; - gtk-cursor-theme-name = "Quintom_Ink"; - gtk-application-prefer-dark-theme = "true"; + environment.etc = { + "greetd/sway-config" = { + text = '' + # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. + exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit" + bindsym Mod4+shift+e exec swaynag \ + -t warning \ + -m 'What do you want to do?' \ + -b 'Poweroff' 'systemctl poweroff' \ + -b 'Reboot' 'systemctl reboot' + include /etc/sway/config.d/* + ''; + user = "greeter"; + group = "greeter"; + }; + "greetd/environments" = { + text = '' + ${pkgs.sway}/bin/sway + ${pkgs.bash}/bin/bash + ''; + user = "greeter"; + group = "greeter"; + }; + "sway/config.d/systemd-env.conf" = { + text = '' + exec_always --no-startup-id systemctl --user import-environment _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK + exec_always --no-startup-id dbus-update-activation-environment --systemd _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK + ''; + }; + "xdg/gtk-3.0/settings.ini" = { + text = generators.toINI {} { + Settings = { + gtk-theme-name = "Arc-Dark"; + gtk-icon-theme-name = "Papirus-Dark"; + gtk-cursor-theme-name = "Quintom_Ink"; + gtk-application-prefer-dark-theme = "true"; + }; }; }; }; }; - }; } diff --git a/modules/networking/default.nix b/modules/networking/default.nix index 5e5fada..181fda2 100644 --- a/modules/networking/default.nix +++ b/modules/networking/default.nix @@ -25,28 +25,28 @@ in { networking = { networkmanager.enable = true; interfaces = listToAttrs (builtins.map - (iface: { - name = iface; - value = {useDHCP = true;}; - }) - cfg.dhcpInterfaces); + (iface: { + name = iface; + value = {useDHCP = true;}; + }) + cfg.dhcpInterfaces); hosts = cfg.hosts; firewall = { trustedInterfaces = ["lo"]; interfaces = listToAttrs (builtins.map - (iface: { - name = iface; - value = { - allowedTCPPorts = [ - # Horus System V2 - 12345 - 5555 - 5556 - ]; - }; - }) - cfg.dhcpInterfaces); + (iface: { + name = iface; + value = { + allowedTCPPorts = [ + # Horus System V2 + 12345 + 5555 + 5556 + ]; + }; + }) + cfg.dhcpInterfaces); }; }; users.extraUsers.${config.eboskma.var.mainUser}.extraGroups = ["networkmanager"]; diff --git a/overlays/default.nix b/overlays/default.nix index 7770d1c..76443b8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,10 +2,11 @@ final: prev: rec { rofi-wayland = prev.pkgs.callPackage ../pkgs/rofi-wayland {}; nix-plugins = prev.pkgs.callPackage ../pkgs/nix-plugins {}; lunarvim = prev.pkgs.callPackage ../pkgs/lunarvim {}; - backscrub = prev.pkgs.callPackage ../pkgs/backscrub - { - inherit (prev.pkgs) gcc cmake opencv curl stdenv git tensorflow-lite flatbuffers; - }; + backscrub = + prev.pkgs.callPackage ../pkgs/backscrub + { + inherit (prev.pkgs) gcc cmake opencv curl stdenv git tensorflow-lite flatbuffers; + }; onnx-runtime = prev.pkgs.callPackage ../pkgs/onnx-runtime {inherit (prev.pkgs) stdenv;}; obs-backgroundremoval = prev.pkgs.callPackage ../pkgs/obs-backgroundremoval {inherit (prev.pkgs) stdenv fetchFromGitHub cmake obs-studio opencv onnx-runtime;}; }