From 9bc6da0b8b61809e1e6f478e0b6424dea0b46641 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Fri, 20 Sep 2024 16:34:35 +0200 Subject: add bash config and wofi-pass --- common/default.nix | 2 ++ common/home/default.nix | 1 + common/home/hyprland/default.nix | 2 ++ common/home/programs/bash/default.nix | 8 ++++++++ 4 files changed, 13 insertions(+) create mode 100644 common/home/programs/bash/default.nix (limited to 'common') diff --git a/common/default.nix b/common/default.nix index b5ad77c..8441030 100644 --- a/common/default.nix +++ b/common/default.nix @@ -4,12 +4,14 @@ home-manager, nixvim, webtray, + wofi-pass, ... }: { imports = [ home-manager.nixosModules.default webtray.outputs.nixosModules.default + wofi-pass.outputs.nixosModules.default ]; environment.systemPackages = with pkgs; [ diff --git a/common/home/default.nix b/common/home/default.nix index c98267b..33bde9b 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -13,6 +13,7 @@ let "hyprlock" "waybar" "zsh" + "bash" "btop" "wofi" "password-store" diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix index 9d9749f..d92c27b 100644 --- a/common/home/hyprland/default.nix +++ b/common/home/hyprland/default.nix @@ -8,6 +8,8 @@ "$mod+Shift, Return, exec, alacritty" "$mod+Shift, Q, exit" "$mod+Shift, B, exec, firefox" + "$mod+Shift, P, exec, wofi-pass" + "$mod+Shift, O, exec, wofi-pass otp" "$mod, Escape, exec, hyprlock" "$mod, Space, exec, wofi --show run" "$mod, C, killactive," diff --git a/common/home/programs/bash/default.nix b/common/home/programs/bash/default.nix new file mode 100644 index 0000000..31677af --- /dev/null +++ b/common/home/programs/bash/default.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + enable = true; + + bashrcExtra = '' + . "/home/n8/.nix-profile/etc/profile.d/hm-session-vars.sh" + ''; +} -- cgit v1.2.3-70-g09d2 From 12e7d1c1951af7f0e1739d5b004805b70d7a04d6 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Fri, 20 Sep 2024 17:01:23 +0200 Subject: add mpv --- common/home/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'common') diff --git a/common/home/default.nix b/common/home/default.nix index 33bde9b..7fdee8c 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -23,6 +23,7 @@ let "mbsync" "msmtp" "direnv" + "mpv" ]; services = [ "syncthing" -- cgit v1.2.3-70-g09d2 From 53cecfc224beefb12176feaf70e9441903f845ea Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Fri, 20 Sep 2024 20:03:48 +0200 Subject: enable desktop portal --- common/home/default.nix | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'common') diff --git a/common/home/default.nix b/common/home/default.nix index 7fdee8c..cc624d2 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -37,7 +37,7 @@ let pkgs.pavucontrol pkgs.wl-clipboard pkgs.virt-manager - pkgs.wev + pkgs.wevhome pkgs.signal-desktop ]; in @@ -111,16 +111,23 @@ in }; }; - xdg.userDirs = { - enable = true; - download = "${config.home-manager.users.n8.home.homeDirectory}"; - desktop = null; - documents = "${config.home-manager.users.n8.home.homeDirectory}/global/docs"; - music = "${config.home-manager.users.n8.home.homeDirectory}/global/media/audio"; - pictures = "${config.home-manager.users.n8.home.homeDirectory}/global/media/photos"; - publicShare = null; - templates = null; - videos = "${config.home-manager.users.n8.home.homeDirectory}/global/media/videos"; + xdg = { + portal = { + enable = true; + xdgOPenUsePortal = true; + }; + + userDirs = { + enable = true; + download = "${config.home-manager.users.n8.home.homeDirectory}"; + desktop = null; + documents = "${config.home-manager.users.n8.home.homeDirectory}/global/docs"; + music = "${config.home-manager.users.n8.home.homeDirectory}/global/media/audio"; + pictures = "${config.home-manager.users.n8.home.homeDirectory}/global/media/photos"; + publicShare = null; + templates = null; + videos = "${config.home-manager.users.n8.home.homeDirectory}/global/media/videos"; + }; }; home.stateVersion = "24.05"; -- cgit v1.2.3-70-g09d2 From e49a1a704d7e82bb2a19376a87d624490ee72c17 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Fri, 20 Sep 2024 20:04:24 +0200 Subject: fix typos --- common/home/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/home/default.nix b/common/home/default.nix index cc624d2..8aa1764 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -114,7 +114,7 @@ in xdg = { portal = { enable = true; - xdgOPenUsePortal = true; + xdgOpenUsePortal = true; }; userDirs = { -- cgit v1.2.3-70-g09d2 From 914af98449e074bf44ee8e310679ea44d1ca8f4b Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 21 Sep 2024 08:52:39 +0200 Subject: update inputs --- common/default.nix | 4 --- common/home/default.nix | 10 ++++++- common/home/hyprland/default.nix | 5 +++- common/services/default.nix | 5 +--- flake.lock | 56 ++++++++++++++++++++-------------------- 5 files changed, 42 insertions(+), 38 deletions(-) (limited to 'common') diff --git a/common/default.nix b/common/default.nix index 8441030..8b21089 100644 --- a/common/default.nix +++ b/common/default.nix @@ -51,10 +51,6 @@ hardware.bluetooth.enable = true; - environment.shellAliases = { - dmenu-wl = "wofi --show dmenu"; - }; - nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/common/home/default.nix b/common/home/default.nix index 8aa1764..e4780d6 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -37,8 +37,9 @@ let pkgs.pavucontrol pkgs.wl-clipboard pkgs.virt-manager - pkgs.wevhome + pkgs.wev pkgs.signal-desktop + pkgs.unzip ]; in { @@ -115,6 +116,13 @@ in portal = { enable = true; xdgOpenUsePortal = true; + config = { + common = { + default = [ "wlr" ]; + }; + }; + configPackages = [ pkgs.xdg-desktop-portal-wlr ]; + extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; }; userDirs = { diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix index d92c27b..0cef02b 100644 --- a/common/home/hyprland/default.nix +++ b/common/home/hyprland/default.nix @@ -1,6 +1,9 @@ { enable = true; - systemd.variables = [ "--all" ]; + systemd = { + enable = true; + variables = [ "--all" ]; + }; xwayland.enable = true; settings = { "$mod" = "SUPER"; diff --git a/common/services/default.nix b/common/services/default.nix index 2b1b73a..d8a2a4d 100644 --- a/common/services/default.nix +++ b/common/services/default.nix @@ -1,9 +1,6 @@ { pkgs, ... }: let - services = [ - "greetd" - "pipewire" - ]; + services = [ "pipewire" ]; in builtins.listToAttrs ( map (n: { diff --git a/flake.lock b/flake.lock index 5dc83fa..90eb691 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1726357542, - "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", + "lastModified": 1726825546, + "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", + "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1726742753, + "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1726688310, + "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -236,11 +236,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726801057, - "narHash": "sha256-r3ZoJ30X38nqw+SBYwYgArTUyYL3mB0Wpb2c2fSs1As=", + "lastModified": 1726846628, + "narHash": "sha256-0CH44sEwiljiN2q7eIFCvabyUm1WeEiF8ofP/z5ca0Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "c2080ede4f0e6b838f1437c128e684004776afe3", + "rev": "3211ce356be612ae89a38c60799992bde8a47127", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1726392886, - "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", + "lastModified": 1726816132, + "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", "owner": "NuschtOS", "repo": "search", - "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", + "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1725271838, - "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "lastModified": 1726734507, + "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1726843875, - "narHash": "sha256-uL64n+PRclbPNluk+ePMZ2HRQDV8MLytRUIEtvrB7bg=", + "lastModified": 1726901476, + "narHash": "sha256-6Mdb+x9dQgMVipHTmVqGdKdkLzWgarHV4IHoHlZE+AE=", "ref": "refs/heads/master", - "rev": "5048096504a70453925448f5545d0369e94bd1c8", - "revCount": 31, + "rev": "121297159b40b9cd8d5016893e83e9f01d0795ec", + "revCount": 32, "type": "git", "url": "https://git.nathanreiner.xyz/webtray" }, -- cgit v1.2.3-70-g09d2 From c77b57313c0f4b085d27d326abb89e68b57adbe9 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 21 Sep 2024 12:56:30 +0200 Subject: update webtray --- common/default.nix | 11 +++++++++++ common/home/default.nix | 8 +++++--- common/services/default.nix | 5 ++++- flake.lock | 14 +++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) (limited to 'common') diff --git a/common/default.nix b/common/default.nix index 8b21089..8baaf5c 100644 --- a/common/default.nix +++ b/common/default.nix @@ -51,6 +51,17 @@ hardware.bluetooth.enable = true; + xdg.portal = { + enable = true; + config = { + common = { + default = [ "hyprland" ]; + }; + }; + configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + }; + nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/common/home/default.nix b/common/home/default.nix index e4780d6..139b3ec 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -118,11 +118,11 @@ in xdgOpenUsePortal = true; config = { common = { - default = [ "wlr" ]; + default = [ "hyprland" ]; }; }; - configPackages = [ pkgs.xdg-desktop-portal-wlr ]; - extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; + configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; userDirs = { @@ -142,6 +142,8 @@ in }; + useGlobalPkgs = true; + useUserPackages = true; backupFileExtension = "backup"; sharedModules = [ nixvim.homeManagerModules.nixvim ]; } diff --git a/common/services/default.nix b/common/services/default.nix index d8a2a4d..bc1c9ec 100644 --- a/common/services/default.nix +++ b/common/services/default.nix @@ -1,6 +1,9 @@ { pkgs, ... }: let - services = [ "pipewire" ]; + services = [ + "pipewire" + "greetd" + ]; in builtins.listToAttrs ( map (n: { diff --git a/flake.lock b/flake.lock index 90eb691..4cef719 100644 --- a/flake.lock +++ b/flake.lock @@ -191,11 +191,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726688310, - "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1726901476, - "narHash": "sha256-6Mdb+x9dQgMVipHTmVqGdKdkLzWgarHV4IHoHlZE+AE=", + "lastModified": 1726916137, + "narHash": "sha256-isknI2AkrBdV6Bkbm/ytbBYbm0motJvB9wPqT1sSO1k=", "ref": "refs/heads/master", - "rev": "121297159b40b9cd8d5016893e83e9f01d0795ec", - "revCount": 32, + "rev": "21afec7d459855808444ef8157a2249b2fb2782c", + "revCount": 33, "type": "git", "url": "https://git.nathanreiner.xyz/webtray" }, -- cgit v1.2.3-70-g09d2 From 8f02589b784f2130ec248fbcfdb24039cd728503 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Wed, 25 Sep 2024 17:17:02 +0200 Subject: add qt pinentry as package to home --- common/home/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'common') diff --git a/common/home/default.nix b/common/home/default.nix index 139b3ec..fb8967c 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -33,6 +33,7 @@ let "mbsync" ]; packages = [ + pkgs.pinentry-qt pkgs.networkmanagerapplet pkgs.pavucontrol pkgs.wl-clipboard -- cgit v1.2.3-70-g09d2