Compare commits

..

1 commit

Author SHA1 Message Date
0ac851f2d7 flake.lock: Update
Some checks failed
EVAL aarch64-linux.sisko
BUILD aarch64-linux.sisko
UPLOAD aarch64-linux.sisko
DOWNLOAD aarch64-linux.sisko
CACHIX aarch64-linux.sisko
ATTIC aarch64-linux.sisko
/ test (push) Successful in 12m38s
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/ee8442abce734e9a1d0e5824818062bcbf358e73' (2025-02-27)
  → 'github:nix-community/emacs-overlay/6429ee53a1c1199637602275c00aca475d8e8057' (2025-03-05)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24)
  → 'github:NixOS/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b' (2025-02-25)
  → 'github:NixOS/nixpkgs/1546c45c538633ae40b93e2d14e0bb6fd8f13347' (2025-03-02)
• Updated input 'flakeParts':
    'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd' (2025-02-01)
  → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764' (2025-03-01)
• Updated input 'flakeParts/nixpkgs-lib':
    '072a6db25e.tar.gz?narHash=sha256-vJzFZGaCpnmo7I6i416HaBLpC%2BhvcURh/BQwROcGIp8%3D' (2025-02-01)
  → '6d37022434.tar.gz?narHash=sha256-3wHafybyRfpUCLoE8M%2BuPVZinImg3xX%2BNm6gEfN3G8I%3D' (2025-03-01)
• Updated input 'git-hooks-nix':
    'github:cachix/git-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17' (2025-01-21)
  → 'github:cachix/git-hooks.nix/42b1ba089d2034d910566bf6b40830af6b8ec732' (2025-03-02)
• Updated input 'homeManager':
    'github:nix-community/home-manager/b8869e4ead721bbd4f0d6b927e8395705d4f16e6' (2025-02-27)
  → 'github:nix-community/home-manager/def0dbbcea715d4514ca343ab4d6d7f3a1742da0' (2025-03-05)
• Updated input 'lanzaboote':
    'github:nix-community/lanzaboote/6321bc060d757c137c1fbae2057c7e941483878f' (2025-02-24)
  → 'github:nix-community/lanzaboote/cc9786aa8158437facead0d8e21ac0c03be91dc8' (2025-03-03)
• Updated input 'lanzaboote/crane':
    'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08)
  → 'github:ipetkov/crane/19de14aaeb869287647d9461cbd389187d8ecdb7' (2025-02-19)
• Updated input 'lanzaboote/flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
  → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04)
• Updated input 'lanzaboote/flake-parts':
    'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01)
  → 'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd' (2025-02-01)
• Updated input 'lanzaboote/pre-commit-hooks-nix':
    'github:cachix/pre-commit-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11)
  → 'github:cachix/pre-commit-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17' (2025-01-21)
• Removed input 'lanzaboote/pre-commit-hooks-nix/nixpkgs-stable'
• Updated input 'lanzaboote/rust-overlay':
    'github:oxalica/rust-overlay/0be641045af6d8666c11c2c40e45ffc9667839b5' (2024-11-18)
  → 'github:oxalica/rust-overlay/7c5892ad87b90d72668964975eebd4e174ff6204' (2025-02-24)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=8082f0b8434a81db309ac8abf1cf32532ba9168e' (2025-02-27)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=ca89e431a31527a014bfd0d529da2a8099027a5f' (2025-03-04)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/1498c4d7fd59026479469efdbfe30c78a7300d89' (2025-01-20)
  → 'github:NixOS/mobile-nixos/8956d72cf8fa9110dcc5fcbc537adee45a8014f5' (2025-03-04)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/d58f642ddb23320965b27beb0beba7236e9117b5' (2025-02-24)
  → 'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24)
  → 'github:NixOS/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03)
2025-03-05 15:01:31 +00:00
16 changed files with 96 additions and 197 deletions

82
flake.lock generated
View file

@ -26,11 +26,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1741287139, "lastModified": 1739934729,
"narHash": "sha256-lpSXdmXj6fEo3DwImX6+R/cSakuIHWJ+gLGw1ZcVOXs=", "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "2884670e4deddc862988ba25548211ff13a5a742", "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1741148495, "lastModified": 1739936662,
"narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1741310221, "lastModified": 1741149197,
"narHash": "sha256-R2HrOkqshpuPlUE2480xCPAf4xuHaXWdGtM0bByigYE=", "narHash": "sha256-ctL0hvG9EMNW60Uz/EOX7QpmbDHBji4WtAgKl83E7t4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "cb747e4bc76c308d2ece3721bf07f534d10cb196", "rev": "6429ee53a1c1199637602275c00aca475d8e8057",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,11 +191,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740872218, "lastModified": 1738453229,
"narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3876f6b87db82f33775b1ef5ea343986105db764", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741217763, "lastModified": 1741174782,
"narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", "narHash": "sha256-dYRebJk58/d5Ej1G6xTOadTfG6tU5zFgXYrLsRJlrgw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", "rev": "def0dbbcea715d4514ca343ab4d6d7f3a1742da0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1741259028, "lastModified": 1741001137,
"narHash": "sha256-QWgGXe9Ai8+hSwNEAqLjZoAvLwV3ywDzT+XBpfMOzuU=", "narHash": "sha256-XxWib5eI3rgMPA4VzDHOx89WT76IN/ZNb+votz5gakw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "3a3ed972151121c8b159eb40e0be21146270e73b", "rev": "cc9786aa8158437facead0d8e21ac0c03be91dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +464,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1741212440, "lastModified": 1741082941,
"narHash": "sha256-UrNM90hCGa4Ee8R7v6oyBL9Mqi5XbyNdUAireOzgzGs=", "narHash": "sha256-mxMbmNSXLZ0G+4uPEXCodjRJffqh/Jq4X5pgFuQFZB0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08", "rev": "ca89e431a31527a014bfd0d529da2a8099027a5f",
"revCount": 17618, "revCount": 17577,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -569,11 +569,11 @@
}, },
"nixosHardware": { "nixosHardware": {
"locked": { "locked": {
"lastModified": 1741325094, "lastModified": 1740646007,
"narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -644,11 +644,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1741196730, "lastModified": 1740932899,
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +692,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741173522, "lastModified": 1741010256,
"narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -723,17 +723,17 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1736701207, "lastModified": 1741010256,
"narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github" "type": "github"
} }
}, },
@ -802,11 +802,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740915799, "lastModified": 1737465171,
"narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -886,11 +886,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741228283, "lastModified": 1740364262,
"narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "narHash": "sha256-X5EtT29uEtXN2E4bDiDU2HGBdmFHjHf1KbP6iKP0cmg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "rev": "7c5892ad87b90d72668964975eebd4e174ff6204",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,7 +3,7 @@
inputs = { inputs = {
flakeParts.url = "github:hercules-ci/flake-parts"; flakeParts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6"; # FIXME update (check if screen sharing works!) nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixosHardware.url = "github:NixOS/nixos-hardware"; nixosHardware.url = "github:NixOS/nixos-hardware";
homeManager = { homeManager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";

View file

@ -733,7 +733,7 @@
:hook ((org-mode . variable-pitch-mode) :hook ((org-mode . variable-pitch-mode)
(org-mode . visual-line-mode) (org-mode . visual-line-mode)
(org-mode . visual-fill-column-mode)) (org-mode . visual-fill-column-mode))
:custom ((org-log-done nil) :custom ((org-log-done 'time)
(org-return-follows-link t) (org-return-follows-link t)
(org-hide-emphasis-markers t) (org-hide-emphasis-markers t)
(visual-fill-column-center-text t) (visual-fill-column-center-text t)
@ -758,6 +758,7 @@
(org-ellipsis "") (org-ellipsis "")
) )
:bind (("C-c o l" . org-store-link) :bind (("C-c o l" . org-store-link)
("C-c o a" . org-agenda)
("C-c o c" . org-capture) ("C-c o c" . org-capture)
("C-c b o" . org-switchb)) ("C-c b o" . org-switchb))
:config :config
@ -786,7 +787,6 @@ This is meant to be an helper to be called from the window manager."
(add-hook 'org-attach-after-change-hook #'ccr/org-attach-save-file-list-to-property)) (add-hook 'org-attach-after-change-hook #'ccr/org-attach-save-file-list-to-property))
(use-package org-agenda (use-package org-agenda
:after org-super-agenda
:custom :custom
(org-agenda-files '("~/org")) (org-agenda-files '("~/org"))
(org-agenda-tags-column 0) (org-agenda-tags-column 0)
@ -797,51 +797,7 @@ This is meant to be an helper to be called from the window manager."
" ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄")) " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄"))
(org-agenda-current-time-string (org-agenda-current-time-string
"◀── now ─────────────────────────────────────────────────") "◀── now ─────────────────────────────────────────────────")
(org-super-agenda-groups :bind (("C-c o a" . org-agenda)))
'(;; Each group has an implicit boolean OR operator between its selectors.
(:name "Today" ; Optionally specify section name
:time-grid t ; Items that appear on the time grid
:todo "TODAY") ; Items that have this TODO keyword
(:name "Important"
;; Single arguments given alone
:tag "bills"
:priority "A")
;; Set order of multiple groups at once
(:order-multi (2 (:name "Shopping in town"
;; Boolean AND group matches items that match all subgroups
:and (:tag "shopping" :tag "@town"))
(:name "Food-related"
;; Multiple args given in list with implicit OR
:tag ("food" "dinner"))
(:name "Personal"
:habit t
:tag "personal")
(:name "Space-related (non-moon-or-planet-related)"
;; Regexps match case-insensitively on the entire entry
:and (:regexp ("space" "NASA")
;; Boolean NOT also has implicit OR between selectors
:not (:regexp "moon" :tag "planet")))))
;; Groups supply their own section names when none are given
(:todo "WAITING" :order 8) ; Set order of this section
(:todo ("SOMEDAY" "TO-READ" "CHECK" "TO-WATCH" "WATCHING")
;; Show this group at the end of the agenda (since it has the
;; highest number). If you specified this group last, items
;; with these todo keywords that e.g. have priority A would be
;; displayed in that group instead, because items are grouped
;; out in the order the groups are listed.
:order 9)
(:priority<= "B"
;; Show this section after "Today" and "Important", because
;; their order is unspecified, defaulting to 0. Sections
;; are displayed lowest-number-first.
:order 1)
;; After the last group, the agenda will display items that didn't
;; match any of these groups, with the default order position of 99
))
:bind (("C-c o a" . org-agenda))
:config
(org-super-agenda-mode)
)
(use-package org-modern (use-package org-modern
:after org :after org

View file

@ -222,17 +222,6 @@ layout {
// top 64 // top 64
// bottom 64 // bottom 64
} }
// shadow {
// on
// }
}
layer-rule {
match namespace="^rofi$"
// shadow {
// on
// }
} }
// Add lines like this to spawn processes at startup. // Add lines like this to spawn processes at startup.

View file

@ -1,27 +1,13 @@
{ pkgs, lib, ... }:
{ {
services.pantalaimon = { services.pantalaimon = {
enable = true; enable = true;
package = pkgs.pantalaimon.overrideAttrs {
pytestCheckPhase = "echo skip pytest";
};
settings = { settings = {
Default = {
LogLevel = "Debug";
SSL = true;
};
local-matrix = { local-matrix = {
Homeserver = "https://matrix.aciceri.dev"; Homeserver = "https://nixos.dev";
# Homeserver = "https://matrix.nixos.dev/_matrix/client"; ListenAddress = "127.0.0.1";
# Homeserver = "https://matrix.nixos.dev";
ListenAddress = "localhost";
ListenPort = 8008; ListenPort = 8008;
# SSL = false;
UseKeyring = false;
# IgnoreVerification = true;
}; };
}; };
}; };
systemd.user.services.pantalaimon.Unit.Requires = [ "dbus.socket" ]; systemd.user.services.pantalaimon.Unit.Requires = [ "dbus.socket" ];
} }

View file

@ -117,7 +117,6 @@
group = "forgejo"; group = "forgejo";
}; };
"firefly-app-key".owner = "firefly-iii"; "firefly-app-key".owner = "firefly-iii";
"matrix-registration-shared-secret".owner = "matrix-synapse";
}; };
}; };

View file

@ -95,7 +95,6 @@
"discord" "discord"
"ib-tws" "ib-tws"
"zoom" "zoom"
"pantalaimon"
]; ];
extraGroups = [ "plugdev" ]; extraGroups = [ "plugdev" ];
backupPaths = [ ]; backupPaths = [ ];

View file

@ -33,7 +33,6 @@
"atticd" "atticd"
"jellyfin" "jellyfin"
"firefly" "firefly"
"matrix"
] ]
++ [ ++ [
./disko.nix ./disko.nix

View file

@ -17,7 +17,6 @@
"jelly.aciceri.dev" "jelly.aciceri.dev"
"firefly.aciceri.dev" "firefly.aciceri.dev"
"import.firefly.aciceri.dev" "import.firefly.aciceri.dev"
"matrix.aciceri.dev"
]; ];
apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path; apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path;
}; };

View file

@ -1,7 +1,6 @@
{ {
lib, lib,
fleetModules, fleetModules,
pkgs,
... ...
}: }:
{ {
@ -16,12 +15,4 @@
users.mutableUsers = false; users.mutableUsers = false;
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
nixpkgs.config.allowUnfree = true; # Forgive me Mr. Stallman :( nixpkgs.config.allowUnfree = true; # Forgive me Mr. Stallman :(
system.switch.enableNg = true;
environment.systemPackages = [ pkgs.btop ];
# FIXME not the best place
nixpkgs.config.permittedInsecurePackages = [
"olm-3.2.16"
];
} }

View file

@ -5,24 +5,24 @@
}: }:
let let
sessions = builtins.concatStringsSep ":" [ sessions = builtins.concatStringsSep ":" [
# (pkgs.writeTextFile { (pkgs.writeTextFile {
# name = "xorg-session.desktop"; name = "xorg-session.desktop";
# destination = "/hyprland-session.desktop"; destination = "/hyprland-session.desktop";
# text = '' text = ''
# [Desktop Entry] [Desktop Entry]
# Name=Hyprland Name=Hyprland
# Exec=Hyprland Exec=Hyprland
# ''; '';
# }) })
# (pkgs.writeTextFile { (pkgs.writeTextFile {
# name = "xorg-session.desktop"; name = "xorg-session.desktop";
# destination = "/cosmic-session.desktop"; destination = "/cosmic-session.desktop";
# text = '' text = ''
# [Desktop Entry] [Desktop Entry]
# Name=Cosmic Name=Cosmic
# Exec=cosmic-session Exec=cosmic-session
# ''; '';
# }) })
(pkgs.writeTextFile { (pkgs.writeTextFile {
name = "xorg-session.desktop"; name = "xorg-session.desktop";
destination = "/niri-session.desktop"; destination = "/niri-session.desktop";

View file

@ -7,7 +7,7 @@
let let
clientConfig = { clientConfig = {
"m.homeserver".base_url = "https://matrix.aciceri.dev"; "m.homeserver".base_url = "https://matrix.aciceri.dev";
# "org.matrix.msc3575.proxy".url = "https://syncv3.matrix.aciceri.dev"; "org.matrix.msc3575.proxy".url = "https://syncv3.matrix.aciceri.dev";
}; };
serverConfig."m.server" = "matrix.aciceri.dev:443"; serverConfig."m.server" = "matrix.aciceri.dev:443";
mkWellKnown = data: '' mkWellKnown = data: ''
@ -38,13 +38,13 @@ in
services.postgresql = { services.postgresql = {
enable = true; enable = true;
# initialScript = pkgs.writeText "synapse-init.sql" '' initialScript = pkgs.writeText "synapse-init.sql" ''
# CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
# CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
# TEMPLATE template0 TEMPLATE template0
# LC_COLLATE = "C" LC_COLLATE = "C"
# LC_CTYPE = "C"; LC_CTYPE = "C";
# ''; '';
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
@ -80,27 +80,27 @@ in
extraConfigFiles = [ config.age.secrets.matrix-registration-shared-secret.path ]; extraConfigFiles = [ config.age.secrets.matrix-registration-shared-secret.path ];
}; };
# backup.paths = [ backup.paths = [
# config.services.matrix-synapse.dataDir config.services.matrix-synapse.dataDir
# "/var/backup/postgresql/matrix-synapse.sql.gz" "/var/backup/postgresql/matrix-synapse.sql.gz"
# ]; ];
# services.postgresqlBackup = { services.postgresqlBackup = {
# enable = true; enable = true;
# databases = [ "matrix-synapse" ]; databases = [ "matrix-synapse" ];
# }; };
# services.matrix-sliding-sync = { services.matrix-sliding-sync = {
# enable = true; enable = true;
# environmentFile = config.age.secrets.matrix-sliding-sync-secret.path; environmentFile = config.age.secrets.matrix-sliding-sync-secret.path;
# settings = { settings = {
# SYNCV3_SERVER = "http://localhost:8008"; SYNCV3_SERVER = "http://localhost:8008";
# }; };
# }; };
# services.nginx.virtualHosts."syncv3.matrix.aciceri.dev" = { services.nginx.virtualHosts."syncv3.matrix.aciceri.dev" = {
# enableACME = true; enableACME = true;
# forceSSL = true; forceSSL = true;
# locations."/".proxyPass = config.services.matrix-sliding-sync.settings.SYNCV3_SERVER; locations."/".proxyPass = config.services.matrix-sliding-sync.settings.SYNCV3_SERVER;
# }; };
} }

View file

@ -1,11 +1,6 @@
{ lib, ... }: { lib, ... }:
{ {
services.pipewire = { services.pipewire.enable = true;
enable = true;
alsa.enable = true;
pulse.enable = true;
jack.enable = true;
};
services.pulseaudio = { services.pulseaudio = {
enable = false; enable = false;

View file

@ -20,7 +20,7 @@
]; ];
}; };
sisko = { sisko = {
id = "QE6V7PR-VHMAHHS-GHD4ZI3-IBB7FEM-M6EQZBX-YFCWDAK-YCYL6VO-NNRMXQK"; id = "TOC7QXZ-JLB4LYP-VNIJAV5-DCKVGFN-UE45SPX-PPFJHSG-O3UHFCK-2PEMAQ6";
addresses = [ addresses = [
"tcp://sisko.fleet" "tcp://sisko.fleet"
]; ];

View file

@ -10,8 +10,6 @@
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
xdg-desktop-portal xdg-desktop-portal
kdePackages.xdg-desktop-portal-kde kdePackages.xdg-desktop-portal-kde
libsForQt5.xdg-desktop-portal-kde
gnome-keyring
]; ];
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal-wlr xdg-desktop-portal-wlr
@ -20,7 +18,6 @@
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
xdg-desktop-portal xdg-desktop-portal
kdePackages.xdg-desktop-portal-kde kdePackages.xdg-desktop-portal-kde
gnome-keyring
]; ];
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
wlr.enable = true; wlr.enable = true;

View file

@ -148,17 +148,7 @@ let
embark embark
embark-consult embark-consult
magit magit
(magit-delta.override (old: { magit-delta
# FIXME why is this needed?
melpaBuild =
args:
old.melpaBuild (
args
// {
packageRequires = (args.packageRequires or [ ]) ++ [ dash ];
}
);
}))
magit-todos magit-todos
difftastic difftastic
with-editor with-editor
@ -205,7 +195,6 @@ let
aggressive-indent aggressive-indent
mixed-pitch mixed-pitch
visual-replace visual-replace
org-super-agenda
# org-re-reveal # FIXME very not nice hash mismatch when building # org-re-reveal # FIXME very not nice hash mismatch when building
] ]
) )