Compare commits

...

12 commits

Author SHA1 Message Date
82ac0622aa
Various
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 5m7s
2025-03-06 13:08:29 +01:00
f819c3bad6
gnome-keyring portal 2025-03-06 13:08:04 +01:00
1ba8ff0100
Lock nixpkgs commit 2025-03-06 13:07:59 +01:00
dd900e9377
Play with org agenda 2025-03-06 13:07:44 +01:00
c7dce3ab4c
Prepare for next niri release 2025-03-06 13:07:22 +01:00
25ce495599
Use pantalaimon 2025-03-06 13:07:17 +01:00
d5a1912ced
Re-enable personal Matrix home server 2025-03-06 13:06:44 +01:00
3c12cbec24
Comment out unsuded WMs 2025-03-06 13:06:09 +01:00
ff47e7ba4b
Refactor 2025-03-06 13:05:59 +01:00
75ab653451
Change syncthing id for sisko 2025-03-06 13:05:46 +01:00
9d6d17f2cf
Add org-super-agenda 2025-03-06 13:05:38 +01:00
f9e5be5864
Fix magit-delta build 2025-03-06 13:05:27 +01:00
16 changed files with 400 additions and 122 deletions

311
flake.lock generated
View file

@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1736955230,
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@ -23,14 +23,20 @@
},
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"catppuccin-v1_1": "catppuccin-v1_1",
"catppuccin-v1_2": "catppuccin-v1_2",
"home-manager": "home-manager_2",
"home-manager-stable": "home-manager-stable",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable",
"nuscht-search": "nuscht-search"
},
"locked": {
"lastModified": 1739934729,
"narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
"lastModified": 1736069220,
"narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
"owner": "catppuccin",
"repo": "nix",
"rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
"rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
"type": "github"
},
"original": {
@ -39,6 +45,34 @@
"type": "github"
}
},
"catppuccin-v1_1": {
"locked": {
"lastModified": 1734055249,
"narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=",
"rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7",
"revCount": 326,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz"
}
},
"catppuccin-v1_2": {
"locked": {
"lastModified": 1734728407,
"narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=",
"rev": "23ee86dbf4ed347878115a78971d43025362fab1",
"revCount": 341,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
}
},
"crane": {
"locked": {
"lastModified": 1731098351,
@ -83,11 +117,11 @@
]
},
"locked": {
"lastModified": 1740485968,
"narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"lastModified": 1736711425,
"narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=",
"owner": "nix-community",
"repo": "disko",
"rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"rev": "f720e64ec37fa16ebba6354eadf310f81555cc07",
"type": "github"
},
"original": {
@ -119,14 +153,14 @@
"emacs-overlay": {
"inputs": {
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable"
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1740622367,
"narHash": "sha256-7TpBfGb24DrQrdW94T5x0vHN0GF2I50fkP+YX5r6JqE=",
"lastModified": 1736759802,
"narHash": "sha256-XCaIRTC+YlL5nRi9WJHeftyfw2Z0YXwwzEmHThGuR3Q=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "ee8442abce734e9a1d0e5824818062bcbf358e73",
"rev": "244a2ab1459c72bac32a2db088549f8bc6d7a836",
"type": "github"
},
"original": {
@ -226,6 +260,24 @@
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
@ -245,11 +297,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
@ -282,11 +334,11 @@
]
},
"locked": {
"lastModified": 1737465171,
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"lastModified": 1735882644,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
@ -359,7 +411,50 @@
"type": "github"
}
},
"home-manager-stable": {
"inputs": {
"nixpkgs": [
"catppuccin",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1734366194,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"catppuccin",
"nixpkgs"
]
},
"locked": {
"lastModified": 1734622215,
"narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": {
"nixpkgs": [
"nix-on-droid",
@ -387,11 +482,11 @@
]
},
"locked": {
"lastModified": 1740624780,
"narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
"lastModified": 1736781604,
"narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
"rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c",
"type": "github"
},
"original": {
@ -423,11 +518,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1737831083,
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
"lastModified": 1736688610,
"narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
"rev": "c64bed13b562fc3bb454b48773d4155023ac31b7",
"type": "github"
},
"original": {
@ -436,6 +531,34 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"catppuccin",
"nuscht-search",
"flake-utils"
],
"nixpkgs": [
"catppuccin",
"nuscht-search",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
@ -448,11 +571,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1740440383,
"narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=",
"lastModified": 1734994463,
"narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "6321bc060d757c137c1fbae2057c7e941483878f",
"rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67",
"type": "github"
},
"original": {
@ -464,11 +587,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1740629216,
"narHash": "sha256-i6fadzFVD7B8XWXa2ycPoVlpSJ5SeWcZ8LLzfzYedKs=",
"lastModified": 1736680332,
"narHash": "sha256-gwidOezQ6FT5q4GHcpD6y2EwKcrtzjAoxaN/9bTGqQw=",
"ref": "refs/heads/main",
"rev": "8082f0b8434a81db309ac8abf1cf32532ba9168e",
"revCount": 17513,
"rev": "38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2",
"revCount": 16610,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -479,7 +602,7 @@
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
@ -489,11 +612,11 @@
]
},
"locked": {
"lastModified": 1738176840,
"narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
"lastModified": 1733522213,
"narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=",
"ref": "refs/heads/main",
"rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
"revCount": 133,
"rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea",
"revCount": 124,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@ -505,11 +628,11 @@
"mobile-nixos": {
"flake": false,
"locked": {
"lastModified": 1737346419,
"narHash": "sha256-YHByUFujAnfJJ2JnhHIJyohECr5o0EDmuRdyUcvnZGQ=",
"lastModified": 1736638789,
"narHash": "sha256-pkpOkSUNrSf5DePUtYYFt4wGODhY28RlQ4SIJ1e+15M=",
"owner": "NixOS",
"repo": "mobile-nixos",
"rev": "1498c4d7fd59026479469efdbfe30c78a7300d89",
"rev": "72a0601f36a1b424e8b72f17ff53509b990ee060",
"type": "github"
},
"original": {
@ -546,7 +669,7 @@
},
"nix-on-droid": {
"inputs": {
"home-manager": "home-manager_2",
"home-manager": "home-manager_3",
"nix-formatter-pack": "nix-formatter-pack",
"nixpkgs": "nixpkgs_5",
"nixpkgs-docs": "nixpkgs-docs",
@ -569,11 +692,11 @@
},
"nixosHardware": {
"locked": {
"lastModified": 1740387674,
"narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
"lastModified": 1736441705,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
"type": "github"
},
"original": {
@ -632,23 +755,23 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1738452942,
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"lastModified": 1735774519,
"narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1740463929,
"narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
"lastModified": 1734600368,
"narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
"rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
"type": "github"
},
"original": {
@ -659,6 +782,22 @@
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1736549401,
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
@ -676,11 +815,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1736012469,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github"
},
"original": {
@ -708,11 +847,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1740367490,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"lastModified": 1736523798,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"rev": "130595eba61081acde9001f43de3248d8888ac4a",
"type": "github"
},
"original": {
@ -739,17 +878,17 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1740367490,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"lastModified": 1736701207,
"narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github"
}
},
@ -805,6 +944,29 @@
"type": "gitlab"
}
},
"nuscht-search": {
"inputs": {
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"catppuccin",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733773348,
"narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
"owner": "NuschtOS",
"repo": "search",
"rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
@ -816,7 +978,7 @@
"lanzaboote",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1731363552,
@ -999,6 +1161,21 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -1006,11 +1183,11 @@
]
},
"locked": {
"lastModified": 1739829690,
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"lastModified": 1736154270,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github"
},
"original": {
@ -1021,7 +1198,7 @@
},
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_7"
},
"locked": {

View file

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

View file

@ -733,7 +733,7 @@
:hook ((org-mode . variable-pitch-mode)
(org-mode . visual-line-mode)
(org-mode . visual-fill-column-mode))
:custom ((org-log-done 'time)
:custom ((org-log-done nil)
(org-return-follows-link t)
(org-hide-emphasis-markers t)
(visual-fill-column-center-text t)
@ -758,7 +758,6 @@
(org-ellipsis "")
)
:bind (("C-c o l" . org-store-link)
("C-c o a" . org-agenda)
("C-c o c" . org-capture)
("C-c b o" . org-switchb))
:config
@ -787,6 +786,7 @@ 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))
(use-package org-agenda
:after org-super-agenda
:custom
(org-agenda-files '("~/org"))
(org-agenda-tags-column 0)
@ -797,7 +797,51 @@ This is meant to be an helper to be called from the window manager."
" ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄"))
(org-agenda-current-time-string
"◀── now ─────────────────────────────────────────────────")
:bind (("C-c o a" . org-agenda)))
(org-super-agenda-groups
'(;; 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
:after org

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,7 @@
{
lib,
fleetModules,
pkgs,
...
}:
{
@ -15,4 +16,12 @@
users.mutableUsers = false;
i18n.defaultLocale = "en_US.UTF-8";
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
sessions = builtins.concatStringsSep ":" [
(pkgs.writeTextFile {
name = "xorg-session.desktop";
destination = "/hyprland-session.desktop";
text = ''
[Desktop Entry]
Name=Hyprland
Exec=Hyprland
'';
})
(pkgs.writeTextFile {
name = "xorg-session.desktop";
destination = "/cosmic-session.desktop";
text = ''
[Desktop Entry]
Name=Cosmic
Exec=cosmic-session
'';
})
# (pkgs.writeTextFile {
# name = "xorg-session.desktop";
# destination = "/hyprland-session.desktop";
# text = ''
# [Desktop Entry]
# Name=Hyprland
# Exec=Hyprland
# '';
# })
# (pkgs.writeTextFile {
# name = "xorg-session.desktop";
# destination = "/cosmic-session.desktop";
# text = ''
# [Desktop Entry]
# Name=Cosmic
# Exec=cosmic-session
# '';
# })
(pkgs.writeTextFile {
name = "xorg-session.desktop";
destination = "/niri-session.desktop";

View file

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

View file

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

View file

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

View file

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

View file

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