diff options
| -rw-r--r-- | common/variables.nix | 13 | ||||
| -rw-r--r-- | home-manager/stvnliu/home.nix | 16 | ||||
| -rw-r--r-- | home-manager/stvnliu/hypr/hyprland/binds.nix | 2 | ||||
| -rw-r--r-- | home-manager/stvnliu/hypr/hyprland/default.nix | 7 | ||||
| -rw-r--r-- | nixos/configuration.nix | 15 |
5 files changed, 39 insertions, 14 deletions
diff --git a/common/variables.nix b/common/variables.nix index 5a148ab..acabdfc 100644 --- a/common/variables.nix +++ b/common/variables.nix @@ -28,17 +28,16 @@ myWallPaperPathString = "/home/${myUserName}/wallpaper.jpg"; myDisplayName = "Zhongheng Liu"; myEmail = "z.liu@outlook.com.gr"; + specialisation."powersave".configuration = { + myAutostartCommands = ["${pkgs.brightnessctl}/bin/brightnessctl s 64"]; + }; + myConfigLocation = "/home/${myUserName}/nix-conf"; + desktopFontFullName = "BlexMono Nerd Font"; myAutostartCommands = [ "fcitx5" + "${pkgs.foot}/bin/foot --server -f \"${desktopFontFullName}:size=12\" -o colors.alpha=0.85" "${pkgs.udiskie}/bin/udiskie" "${pkgs.pa-notify}/bin/pa-notify" ]; - specialisation."powersave".configuration = { - myAutostartCommands = [ - "${pkgs.brightnessctl}/bin/brightnessctl s 64" - ]; - }; - myConfigLocation = "/home/${myUserName}/nix-conf"; - desktopFontFullName = "BlexMono Nerd Font"; }; } diff --git a/home-manager/stvnliu/home.nix b/home-manager/stvnliu/home.nix index 8998cab..b175532 100644 --- a/home-manager/stvnliu/home.nix +++ b/home-manager/stvnliu/home.nix @@ -51,7 +51,6 @@ protonvpn-gui devenv vlc - zed-editor rhythmbox qq shotwell @@ -78,7 +77,20 @@ home-manager.enable = true; firefox = { enable = true; - package = pkgs.firefox-devedition; + package = with pkgs; (firefox-devedition.override { + nativeMessagingHosts = [ + (passff-host.overrideAttrs (old: { + dontStrip = true; + patchPhase = ''sed -i 's#COMMAND = "pass"#COMMAND = "${ + pass.withExtensions (ext: + with ext; [ + pass-otp + pass-import + ]) + }/bin/pass"#' src/passff.py''; + })) + ]; + }); }; thunderbird = { enable = true; diff --git a/home-manager/stvnliu/hypr/hyprland/binds.nix b/home-manager/stvnliu/hypr/hyprland/binds.nix index d7c503a..f7fbc3a 100644 --- a/home-manager/stvnliu/hypr/hyprland/binds.nix +++ b/home-manager/stvnliu/hypr/hyprland/binds.nix @@ -2,7 +2,7 @@ config, pkgs, }: let - terminalCmd = "${pkgs.foot}/bin/foot -f '${config.desktopFontFullName}:size=16' -o colors.alpha=0.80"; + terminalCmd = "${pkgs.foot}/bin/footclient"; screenshotLocation = "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png"; in [ diff --git a/home-manager/stvnliu/hypr/hyprland/default.nix b/home-manager/stvnliu/hypr/hyprland/default.nix index ef204de..9d6f1ac 100644 --- a/home-manager/stvnliu/hypr/hyprland/default.nix +++ b/home-manager/stvnliu/hypr/hyprland/default.nix @@ -17,8 +17,9 @@ xwayland = {force_zero_scaling = true;}; monitor = [ #"eDP-1, 1920x1080@165,0x0,1" - "HDMI-A-1, 1920x1080@75, 2560x0, 1" - "eDP-2,preferred, auto, ${builtins.toString config.displayScale}" + "desc:XMI Mi 27 NFGL 3215000032603, 1920x1080@75, 2560x0, 1" + "desc:BOE 0x0B40,preferred, auto, ${builtins.toString config.displayScale}" + ", preferred, auto, 1" # wildcard definition ]; general = { border_size = 1; @@ -40,7 +41,7 @@ exec-once = config.myAutostartCommands ++ [ - "[workspace special silent] ${pkgs.foot}/bin/foot -f '${config.desktopFontFullName}:size=16' -o colors.alpha=0.80 ${config.myShells.defaultShell}" + "[workspace special silent] ${pkgs.foot}/bin/footclient ${config.myShells.defaultShell}" ]; misc = { disable_hyprland_logo = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 57b5b02..fe01c16 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -22,6 +22,13 @@ FLAKE = config.myConfigLocation; GTK_IM_MODULE = lib.mkForce ""; }; + + services.pcscd.enable = true; + programs.gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-curses; + enableSSHSupport = true; + }; programs.gamescope = { enable = true; capSysNice = true; @@ -82,6 +89,12 @@ }; security.polkit.enable = true; environment.systemPackages = with pkgs; [ + (pass-wayland.withExtensions (exts: [ + exts.pass-otp + exts.pass-import + ])) + gparted + zed-editor libsForQt5.qt5.qtquickcontrols2 libsForQt5.qt5.qtgraphicaleffects ]; @@ -138,7 +151,7 @@ initialPassword = "stevenpassword"; isNormalUser = true; openssh.authorizedKeys.keys = []; - packages = with pkgs; [nh gparted]; + packages = with pkgs; [nh]; extraGroups = ["wheel" "input" "networkmanager"]; }; }; |