From 6b2b079a18214aa0277459af4a669e2e67dfff67 Mon Sep 17 00:00:00 2001 From: atagen Date: Tue, 9 Sep 2025 08:05:23 +1000 Subject: [PATCH] various tweaks, bw->kpxc temporarily --- common/terminal.nix | 5 +- flake.lock | 138 +++++++++--------- flake.nix | 7 +- graphical/browser.nix | 3 +- .../desktop/quickshell/logout/Logout.qml | 85 +++++------ .../quickshell/logout/LogoutButton.qml | 20 +++ graphical/desktop/quickshell/shell.qml | 24 ++- graphical/dev.nix | 2 +- graphical/network.nix | 7 +- graphical/password-manager.nix | 18 ++- graphical/quick-services.nix | 2 + graphical/shell.nix | 17 +-- graphical/sync.nix | 1 + hosts/quiver/hw.nix | 4 +- lib/create.nix | 4 + 15 files changed, 180 insertions(+), 157 deletions(-) create mode 100644 graphical/desktop/quickshell/logout/LogoutButton.qml create mode 100644 graphical/sync.nix diff --git a/common/terminal.nix b/common/terminal.nix index 6bff4af..fbe21d7 100644 --- a/common/terminal.nix +++ b/common/terminal.nix @@ -42,6 +42,10 @@ in comma = lib.getExe' (getFlakePkg' inputs.nix-index-database "comma-with-db") "comma"; in '' + function fish_greeting + ${./rice/header.sh} + echo "" + end function fish_title set -q argv[1]; or set argv fish echo (fish_prompt_pwd_dir_length=100 prompt_pwd): $argv; @@ -54,7 +58,6 @@ in ${comma} "$argv[1]" end end - ${./rice/header.sh} ''; }; programs.command-not-found.enable = false; diff --git a/flake.lock b/flake.lock index 95d2334..037660d 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1755274779, - "narHash": "sha256-HmWJrp84DyjdWptzL8wxpbGc1X6DrDfbguLWZJ3U3kI=", + "lastModified": 1756724874, + "narHash": "sha256-Ihd/TzxCU+2KlFWSxdE03mnVsdw5m5la+Pu4mwekWTg=", "owner": "linyinfeng", "repo": "angrr", - "rev": "6438d0436c8ad95f9d5ef4a4bfcb39939b602da3", + "rev": "cdbef4467651a9b53414ef0aa86be594544d7a4d", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "arbys": { "locked": { - "lastModified": 1754630947, - "narHash": "sha256-u1lLQRE56WhhgLM351RjRigFWIDKtQdrn/82kV3k278=", + "lastModified": 1756449827, + "narHash": "sha256-Z/O9W0A0SG/cZiiviNPfmciqvI6a3giCLFt/ElwtLCs=", "ref": "refs/heads/meats", - "rev": "b72a62e2020924d087b3c0aedbf5c9ec47cc262a", - "revCount": 6, + "rev": "cc1e2613fbbb0ed98bb4ce0d52c6e99bb8f98055", + "revCount": 9, "type": "git", "url": "https://git.atagen.co/atagen/arbys" }, @@ -55,11 +55,11 @@ }, "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1756705356, + "narHash": "sha256-dpBFe8SqYKr7W6KN5QOVCr8N76SBKwTslzjw+4BVBVs=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "305707bbc27d83aa1039378e91d7dd816f4cac10", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755641984, - "narHash": "sha256-0d8tolDnYHOMR/KnhuHuilhfqs8OgOPIpIgKzXGTkVk=", + "lastModified": 1756821375, + "narHash": "sha256-36z6zq2g1+RAjWdoypR34F1ClRn5Fgy7iTuVV1m19so=", "owner": "helix-editor", "repo": "helix", - "rev": "74bb02ffe7b62d5f96f1a20ead70859c330eb849", + "rev": "68f11f9324e529b678206b84a15b4c9481d0df11", "type": "github" }, "original": { @@ -345,11 +345,11 @@ "smfh": "smfh" }, "locked": { - "lastModified": 1755630157, - "narHash": "sha256-4XnVeNej5FJLBavw3qxoHI01ojmryeNzT6Mk9Q0nDXQ=", + "lastModified": 1756255328, + "narHash": "sha256-WJ70Dv+tJjIl7mMOqUgcdcz+RrujDRoeKptiU6oh1lI=", "owner": "feel-co", "repo": "hjem", - "rev": "565a15366d7b5aa5483ebe101fbc0ea27f0516b7", + "rev": "2426d6ad20e767895e936ed0c9563cc4e2b6c96f", "type": "github" }, "original": { @@ -412,11 +412,11 @@ ] }, "locked": { - "lastModified": 1755491080, - "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1756201372, + "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", "type": "github" }, "original": { @@ -574,11 +574,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755826888, - "narHash": "sha256-Z/ZAOQSLY9Tl73+DwSToBnzRRRkqD6vNp0w1I8VmdIo=", + "lastModified": 1756801989, + "narHash": "sha256-eOIQ1CUMHwU4zsBGaCj9jCgNTxzyq2aeHuwgx0xLFwo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b954d36801da047fbf563cdb94493b23d745a487", + "rev": "d6a98b86d86b512c6167601ea646ab785137bada", "type": "github" }, "original": { @@ -590,16 +590,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -628,11 +628,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755761324, - "narHash": "sha256-LtVHjAqm35txelJtz/7FI5n9o2YyJ+BZ23XC5l/GWes=", + "lastModified": 1756728273, + "narHash": "sha256-7tYNlNO/qVRA6shdWxNuBMYOE+pGgxqE0f54S4Wr9PE=", "owner": "YaLTeR", "repo": "niri", - "rev": "05337ce85560efc4d20cc23e9452a1e1f360007d", + "rev": "77465e11fe36fdd9bc0a304b96bb2558116568af", "type": "github" }, "original": { @@ -685,11 +685,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1756612744, + "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", "type": "github" }, "original": { @@ -753,11 +753,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -829,11 +829,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1756754095, + "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", "type": "github" }, "original": { @@ -845,16 +845,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1756754095, + "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -877,11 +877,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -924,11 +924,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -940,11 +940,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -1068,11 +1068,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1755785370, - "narHash": "sha256-oA3H94jjm+Ju6m2iNv03v6/R42jven8vhIm9heGEGzo=", + "lastModified": 1756606761, + "narHash": "sha256-lcHMwq0LVcS1mP9o0pq00Von8PsXMsFPPo3ZXGWa7DU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d92228471fabcb46147cdbda83c6476928c4aebd", + "rev": "9e9e58125b4ba190658235106858f9733b25a1b4", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ ] }, "locked": { - "lastModified": 1755485198, - "narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", + "lastModified": 1756434910, + "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", + "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", "type": "github" }, "original": { @@ -1376,11 +1376,11 @@ ] }, "locked": { - "lastModified": 1754847726, - "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -1449,11 +1449,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "lastModified": 1756679414, + "narHash": "sha256-yQGJ/n6mRwoIQnaL5oV2TGOHg4SEHpINTaoHrvkjr1Q=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "rev": "c0497c990d46fcc012d9deff885bbe533e91e044", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0ad13ad..b7f7131 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; helix.url = "github:helix-editor/helix"; @@ -31,11 +31,6 @@ hudcore.url = "git+https://git.atagen.co/atagen/hudcore-plymouth.git"; - # quickshell = { - # url = "git+https://git.outfoxxed.me/quickshell/quickshell.git"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # smooooth.url = "path:/home/bolt/code/smooooth"; diff --git a/graphical/browser.nix b/graphical/browser.nix index f91d12b..59ca9ce 100644 --- a/graphical/browser.nix +++ b/graphical/browser.nix @@ -55,7 +55,8 @@ scope "programs.firefox" { "vimium-c@gdh1995.cn" = officialAddon "vimium-c"; "{b86e4813-687a-43e6-ab65-0bde4ab75758}" = officialAddon "localcdn-fork-of-decentraleyes"; "jid1-5Fs7iTLscUaZBgwr@jetpack" = officialAddon "happy-bonobo-disable-webrtc"; - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = officialAddon "bitwarden-password-mananger"; + "keepassxc-browser@keepassxc.org" = officialAddon "keepassxc-browser"; + # "{446900e4-71c2-419f-a6a7-df9c091e268b}" = officialAddon "bitwarden-password-mananger"; }; Preferences = { diff --git a/graphical/desktop/quickshell/logout/Logout.qml b/graphical/desktop/quickshell/logout/Logout.qml index 3de1223..2f14c19 100644 --- a/graphical/desktop/quickshell/logout/Logout.qml +++ b/graphical/desktop/quickshell/logout/Logout.qml @@ -11,13 +11,16 @@ Singleton { required property real width required property real height property real openTime: 600 + default property list buttons Timer { id: closeTimer interval: topLevel.openTime running: false repeat: false - onTriggered: logoutData.active = false + onTriggered: { + logoutData.active = false; + } } PersistentProperties { @@ -25,32 +28,7 @@ Singleton { property bool open: false property bool active: false property real openness: 0 - property var buttons: [ - { - name: "Logout", - icon: "", - key: "e", - action: ["loginctl", "terminate-user", "1000"] - }, - { - name: "Suspend", - icon: "", - key: "s", - action: ["systemctl", "suspend"] - }, - { - name: "Shutdown", - icon: "", - key: "d", - action: ["systemctl", "poweroff"] - }, - { - name: "Reboot", - icon: "", - key: "r", - action: ["systemctl", "reboot"] - } - ] + property int selected: -1 onOpenChanged: { if (open) { @@ -103,12 +81,28 @@ Singleton { keyboardFocus: WlrKeyboardFocus.Exclusive focusable: true exclusionMode: ExclusionMode.Ignore - Item { + contentItem { + focus: true Keys.onPressed: event => { - console.log(event); + if (event.key == Qt.Key_Escape) { + logoutData.open = false; + } else { + for (let i = 0; i < topLevel.buttons.length; ++i) { + let button = topLevel.buttons[i]; + if (event.key == button.keybind) { + logoutData.open = false; + button.exec(); + } + } + } } } + MouseArea { + anchors.fill: parent + onClicked: logoutData.open = false + } + Rectangle { id: gridParent radius: 24 @@ -134,37 +128,24 @@ Singleton { bottomRightRadius: 0 topRightRadius: 10 bottomLeftRadius: 10 - Keys.onPressed: event => { - console.log(event); - if (event.key == Qt.Key_Escape) { - logoutData.open = false; - } - } + Column { spacing: gridParent.margins.v padding: gridParent.margins.v - - // horizontalItemAlignment: Grid.AlignHCenter - // verticalItemAlignment: Grid.AlignVCenter anchors { - fill: parent + centerIn: parent alignWhenCentered: true verticalCenter: parent.verticalCenter - // topMargin: gridParent.margins.v - // bottomMargin: gridParent.margins.v } + width: parent.width / 3 * 2 + height: parent.height / 6 * 5 Repeater { - model: logoutData.buttons.length + model: topLevel.buttons.length Button { id: button required property int index anchors.horizontalCenter: parent.horizontalCenter - Process { - id: thisProcess - running: false - command: logoutData.buttons[button.index].action - } implicitWidth: gridParent.dims.h implicitHeight: gridParent.dims.v @@ -175,14 +156,20 @@ Singleton { } background: Rectangle { color: button.hovered ? "#ffb852" : "#272a2a" + Behavior on color { + ColorAnimation { + duration: 150 + } + } border.color: "#ffab5b" border.width: 2 radius: 6 } - text: logoutData.buttons[index].name + text: topLevel.buttons[index].text onClicked: { logoutData.open = false; - thisProcess.running = true; + logoutData.selected = index; + topLevel.buttons[index].exec(); } } } diff --git a/graphical/desktop/quickshell/logout/LogoutButton.qml b/graphical/desktop/quickshell/logout/LogoutButton.qml new file mode 100644 index 0000000..56e1128 --- /dev/null +++ b/graphical/desktop/quickshell/logout/LogoutButton.qml @@ -0,0 +1,20 @@ +import QtQuick +import Quickshell.Io + +QtObject { + required property string command + required property string text + // required property string icon + property var keybind: null + + id: button + + readonly property var process: Process { + command: ["sh", "-c", button.command] + } + + function exec() { + process.startDetached(); + } +} + diff --git a/graphical/desktop/quickshell/shell.qml b/graphical/desktop/quickshell/shell.qml index 1697888..b53bd87 100644 --- a/graphical/desktop/quickshell/shell.qml +++ b/graphical/desktop/quickshell/shell.qml @@ -35,7 +35,7 @@ ShellRoot { } } } - + // rhs main Variants { model: Quickshell.screens @@ -196,7 +196,7 @@ ShellRoot { } border { width: 1 - color: tag.urgent ? Colours.c.red_b : Colours.c.yellow_b + color: tag.urgent ? Colours.c.red_b : Colours.c.yellow_b Behavior on color { ColorAnimation { duration: 300 @@ -238,5 +238,25 @@ ShellRoot { Logout.Logout { width: 2560 height: 1440 + Logout.LogoutButton { + text: "Logout" + keybind: Qt.Key_E + command: "loginctl terminate-user 1000" + } + Logout.LogoutButton { + text: "Suspend" + keybind: Qt.Key_S + command: "systemctl suspend" + } + Logout.LogoutButton { + text: "Shutdown" + keybind: Qt.Key_D + command: "systemctl poweroff" + } + Logout.LogoutButton { + text: "Reboot" + keybind: Qt.Key_R + command: "systemctl reboot" + } } } diff --git a/graphical/dev.nix b/graphical/dev.nix index 9cbf4fb..fa5d9d7 100644 --- a/graphical/dev.nix +++ b/graphical/dev.nix @@ -29,7 +29,7 @@ scope "user" { "https://git.atagen.co/".insteadOf = "atagen:"; "https://codeberg.org/".insteadOf = "codeberg:"; }; - credential.helper = "rbw"; + credential.helper = "keepassxc --git-groups"; }; integrations = { difftastic.enable = true; diff --git a/graphical/network.nix b/graphical/network.nix index 0be4ebe..d53f1c1 100644 --- a/graphical/network.nix +++ b/graphical/network.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +_: { networking.networkmanager.enable = true; systemd.services.NetworkManager-wait-online.enable = true; services.resolved = { @@ -12,5 +11,9 @@ dnssec = "false"; }; services.mullvad-vpn.enable = true; + services.tailscale = { + enable = true; + useRoutingFeatures = "client"; + }; } diff --git a/graphical/password-manager.nix b/graphical/password-manager.nix index a3061ea..48d27dd 100644 --- a/graphical/password-manager.nix +++ b/graphical/password-manager.nix @@ -1,15 +1,17 @@ { pkgs, lib, ... }: { - user.xdg.config.files."rbw/config.json" = { - generator = lib.generators.toJSON { }; - value = { - email = "boss@atagen.co"; - pinentry = lib.getExe pkgs.pinentry-qt; - base_url = "https://v.atagen.co"; - }; - }; + # user.xdg.config.files."rbw/config.json" = { + # generator = lib.generators.toJSON { }; + # value = { + # email = "boss@atagen.co"; + # pinentry = lib.getExe pkgs.pinentry-qt; + # base_url = "https://v.atagen.co"; + # }; + # }; apps = with pkgs; { + migration = keepassxc; + migrationCli = git-credential-keepassxc; passwordManager = bitwarden; passwordCli = rbw; }; diff --git a/graphical/quick-services.nix b/graphical/quick-services.nix index 2389fea..b64f750 100644 --- a/graphical/quick-services.nix +++ b/graphical/quick-services.nix @@ -1,6 +1,7 @@ { config, lib, + mainUser, ... }: { @@ -24,6 +25,7 @@ config = { systemd.user.services = builtins.mapAttrs (name: cmd: { + environment.PATH = lib.mkForce "/run/current-system/sw/bin:/run/current-system/sw/sbin:/etc/profiles/per-user/${mainUser}/bin:/etc/profiles/per-user/${mainUser}/sbin"; unitConfig = { Description = "${name}"; Requires = [ diff --git a/graphical/shell.nix b/graphical/shell.nix index f47213e..214541f 100644 --- a/graphical/shell.nix +++ b/graphical/shell.nix @@ -17,24 +17,9 @@ in inherit (pkgs) wl-clipboard quickshell; }; - systemd.user.services.quickshell = { - environment.PATH = lib.mkForce "/run/current-system/sw/bin:/run/current-system/sw/sbin:/etc/profiles/per-user/bolt/bin:/etc/profiles/per-user/bolt/sbin"; - unitConfig = { - Description = "Quickshell"; - Requires = [ - "graphical-session.target" - ]; - After = [ - "graphical-session.target" - "niri.target" - ]; - }; - wantedBy = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${getExe pkgs.quickshell}"; - }; - quick.services = { swaync = "${getExe pkgs.swaynotificationcenter}"; + quickshell = "${getExe pkgs.quickshell}"; swayidle = let niri = getFlakePkg' inputs.niri "niri-unstable"; diff --git a/graphical/sync.nix b/graphical/sync.nix new file mode 100644 index 0000000..a1e2ece --- /dev/null +++ b/graphical/sync.nix @@ -0,0 +1 @@ +{ scope, ... }: scope "services.syncthing.enable" <| true diff --git a/hosts/quiver/hw.nix b/hosts/quiver/hw.nix index 3be5935..df600c8 100644 --- a/hosts/quiver/hw.nix +++ b/hosts/quiver/hw.nix @@ -12,8 +12,8 @@ package = config.boot.kernelPackages.nvidiaPackages.latest; modesetting.enable = true; powerManagement.enable = true; - nvidiaPersistenced = true; - open = false; + # nvidiaPersistenced = true; + open = true; }; hardware.graphics.enable = true; diff --git a/lib/create.nix b/lib/create.nix index cf8dbf7..61ef7f7 100644 --- a/lib/create.nix +++ b/lib/create.nix @@ -24,6 +24,10 @@ in getFlakePkg' = p: n: p.packages.${info.system}.${n}; }; modules = [ + (_: { + disabledModules = [ "services/misc/open-webui.nix" ]; + imports = [ "${inputs.nixpkgs-stable}/nixos/modules/services/misc/open-webui.nix" ]; + }) inputs.arbys.nixosModules.arbys inputs.hjem.nixosModules.hjem (