diff options
| -rw-r--r-- | flake.lock | 96 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | modules/common/emacs/default.nix | 3 | ||||
| -rw-r--r-- | modules/common/vscode.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/kde.nix | 5 |
5 files changed, 45 insertions, 63 deletions
diff --git a/flake.lock b/flake.lock index 0a6c0fd..48939a7 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1677705275, - "narHash": "sha256-MQJrvVNnGkm/1I21e164p5pXRMbMhsr7dACcklKSdTU=", + "lastModified": 1706248872, + "narHash": "sha256-4V1e06DmT1ScuXstgSEmCRXn1sdWqf/oQ0Q/3ktqLng=", "owner": "pinpox", "repo": "alertmanager-ntfy", - "rev": "48cf8171715955c23365af54efc296fac77a4712", + "rev": "23fa2327bef937de7ae2184b51d387736ab5c130", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1705452289, - "narHash": "sha256-i/WodLabBcmRr9hdSv5jzDigL1hRYuI8vNh+xTbGt+g=", + "lastModified": 1706581965, + "narHash": "sha256-1H7dRdK9LJ7+2X1XQtbwXr+QMqtVVo/ZF0/LIvkjdK8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "74ab0227ee495e526f2dd57ea684b34f6396445a", + "rev": "91b9daf672c957ef95a05491a75f62e6a01d5aaf", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1705708511, - "narHash": "sha256-3f4BkRY70Fj7yvuo87c4QQPAjnt571g2wJ50jY7hnYc=", + "lastModified": 1706473109, + "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "ce4b88c465d928f4f8b75d0920f1788d5b65ca94", + "rev": "d634c3abafa454551f2083b054cd95c3f287be61", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "impermanence": { "locked": { - "lastModified": 1703656108, - "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", + "lastModified": 1706639736, + "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", "owner": "nix-community", "repo": "impermanence", - "rev": "033643a45a4a920660ef91caa391fbffb14da466", + "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", "type": "github" }, "original": { @@ -277,10 +277,10 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_11": [ + "nixpkgs-23_05": [ "nixpkgs-stable" ], - "nixpkgs-23_05": [ + "nixpkgs-23_11": [ "nixpkgs-stable" ], "utils": [ @@ -288,11 +288,11 @@ ] }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", "type": "gitlab" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1705713628, - "narHash": "sha256-Z4AxGE1tFSZfj5Xy2/C396h8MqhWkKQSFFZpTz8K/40=", + "lastModified": 1706577305, + "narHash": "sha256-if+l5DvLWECQJ41hgVTwRs/1j6hl/dbIAO+CnUI/0vY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ca0510895503f8151dd0e9d38e05c183848a1e62", + "rev": "f6ba9302d15e038c1f46141e3d95081f7abf5603", "type": "github" }, "original": { @@ -329,11 +329,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1705312285, - "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", + "lastModified": 1706182238, + "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", + "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705666311, - "narHash": "sha256-VYdSQm7zq3AStyHhRr3SBCTA8fVzrl6WtIlXTs2Wlts=", + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a455c5fb3ee513e2f443838a0e84d52b035adb67", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1705740246, - "narHash": "sha256-APl3uibJr7dWxzSa17VCY1IceWz9UT1ySehju8SIYYM=", + "lastModified": 1706651650, + "narHash": "sha256-cKIZc/8tzCIw1P42ehR+Uq8tlBnyuavdR/qGTE1/vs8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a268720526d5a602e902b68b27667b1e7eec8e48", + "rev": "5b5e6f990070ec0c5c343ff9160554866ecd23c2", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705736500, - "narHash": "sha256-63GKAub3O5JtzcMDgidEKOU5+2jjXlhc1n8aVxv0pbk=", + "lastModified": 1706650719, + "narHash": "sha256-etJntLA3PC/q7i/7Ki6aFpgE/mR4FqvowX/OvFx5Fm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e31f16e3f93c25159b02627198d065ad6480c19a", + "rev": "fa38ab91f9565c14f8e8928f97a8f73166d54947", "type": "github" }, "original": { @@ -390,22 +390,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nmap-vulners": { "flake": false, "locked": { @@ -452,14 +436,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": [ + "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1705229514, - "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=", + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", "type": "github" }, "original": { @@ -524,11 +510,11 @@ ] }, "locked": { - "lastModified": 1705713606, - "narHash": "sha256-8VYBrwOxaofT+GAxQ5Z1wYF22KHOPwTrfliDTuOrNEc=", + "lastModified": 1706577474, + "narHash": "sha256-wP5vL/lZjQtMTcQ9F0rWd2zxUARtwnXmLFnS4vBiRac=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "8430e52a88282c7295c409ba315f6e0967403f39", + "rev": "73948c64e9cf186f779208d56cff401dd6e1928e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f41d90f..884d9a3 100644 --- a/flake.nix +++ b/flake.nix @@ -46,8 +46,8 @@ url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs = { flake-compat.follows = "flake-compat"; - nixpkgs-22_11.follows = "nixpkgs-stable"; nixpkgs-23_05.follows = "nixpkgs-stable"; + nixpkgs-23_11.follows = "nixpkgs-stable"; nixpkgs.follows = "nixpkgs"; utils.follows = "flake-utils"; }; @@ -118,6 +118,7 @@ flake-compat.follows = "flake-compat"; flake-utils.follows = "flake-utils"; nixpkgs.follows = "nixpkgs"; + nixpkgs-stable.follows = "nixpkgs-stable"; }; }; diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index d16d168..082b3c3 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -81,7 +81,6 @@ in { gnutar # :tools tree-sitter gnutls # doom! :app irc go # :lang go - gocode # :lang go org godef # :lang go gomodifytags # :lang go gopls # :lang (go +lsp) @@ -133,7 +132,7 @@ in { texlab # lang (tex +lsp) texlive.combined.scheme-full # :lang org tex unzip # :tools debugger - # wordnet # :tools (lookup +dictionary +offline) + wordnet # :tools (lookup +dictionary +offline) yaml-language-server # :lang (yaml +lsp) zig # :lang zig :editor format zls # :lang (zig +lsp) diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix index 074f6f2..10d4bf6 100644 --- a/modules/common/vscode.nix +++ b/modules/common/vscode.nix @@ -56,6 +56,7 @@ in { redhat.vscode-xml redhat.vscode-yaml rust-lang.rust + signageos.signageos-vscode-sops skellock.just streetsidesoftware.code-spell-checker streetsidesoftware.code-spell-checker-british-english diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index a7b2c19..adec490 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -24,11 +24,6 @@ in { "widget.use-xdg-desktop-portal.file-picker" = 1; "widget.use-xdg-desktop-portal.mime-handler" = 1; }; - - services.kdeconnect = { - enable = true; - indicator = true; - }; }; services.xserver = { |