Compare commits

..

3 commits

Author SHA1 Message Date
78118c14dc qenya: Install Celluloid (on GNOME) or Haruna (on KDE) 2025-05-16 17:28:53 +01:00
7dc684cce3 flake: Update lix to 2.93.0 2025-05-16 17:05:42 +01:00
a8ab37993d flake.lock: Update
Flake lock file updates:

• Updated input 'birdsong':
    'git+https://git.qenya.tel/qenya/birdsong?ref=main&rev=a40220a4b977bc04cbe9e13ff5c667ed6f252677' (2025-02-05)
  → 'git+https://git.qenya.tel/qenya/birdsong?ref=main&rev=9955b1ae4eb0cbeff2ae0ed6520e651753880445' (2025-05-13)
• Updated input 'colmena':
    'github:zhaofengli/colmena/2370d4336eda2a9ef29fce10fa7076ae011983ab' (2025-02-18)
  → 'github:zhaofengli/colmena/df694ee23be7ed7b2d8b42c245a640f0724eb06c' (2025-05-09)
• Updated input 'firefox-addons':
    'gitlab:rycee/nur-expressions/346899a4b3b651ab447c61e0c8e9d8a1454cda72?dir=pkgs/firefox-addons' (2025-04-23)
  → 'gitlab:rycee/nur-expressions/1ebb2cf654110901889353440027993312e1aeb0?dir=pkgs/firefox-addons' (2025-05-16)
• Updated input 'home-manager':
    'github:nix-community/home-manager/dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1' (2025-04-25)
  → 'github:nix-community/home-manager/1eec32f0efe3b830927989767a9e6ece0d82d608' (2025-05-15)
• Updated input 'home-manager-unstable':
    'github:nix-community/home-manager/2f5819a962489e037a57835f63ed6ff8dbc2d5fb' (2025-04-26)
  → 'github:nix-community/home-manager/d2263ce5f4c251c0f7608330e8fdb7d1f01f0667' (2025-05-16)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5630cf13cceac06cefe9fc607e8dfa8fb342dde3' (2025-04-24)
  → 'github:NixOS/nixpkgs/5d736263df906c5da72ab0f372427814de2f52f8' (2025-05-14)
• Updated input 'nixpkgs-small':
    'github:NixOS/nixpkgs/d1e377e4cfcb3da8da4b71dbef631e8317907cd8' (2025-04-26)
  → 'github:NixOS/nixpkgs/288a96500445cddb1613dfd3b6fcc9d5b32fa7ad' (2025-05-16)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24)
  → 'github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e' (2025-05-13)
• Updated input 'nixpkgs-unstable-small':
    'github:NixOS/nixpkgs/1ee8b713821882c66f5ecfde5c4e5874b1cb5e2f' (2025-04-27)
  → 'github:NixOS/nixpkgs/adfa8b0e75657c862acd0119ee42a69a6a6b2b4e' (2025-05-16)
• Updated input 'randomcat':
    'github:randomnetcat/nix-configs/876f365eaa010988a0908421578c72fb17c28f09' (2025-04-27)
  → 'github:randomnetcat/nix-configs/a5540bdb3e6e9d2ad8ea9639654ff7263008d239' (2025-05-16)
2025-05-16 17:04:42 +01:00
3 changed files with 48 additions and 42 deletions

82
flake.lock generated
View file

@ -46,11 +46,11 @@
}, },
"birdsong": { "birdsong": {
"locked": { "locked": {
"lastModified": 1738782723, "lastModified": 1747153132,
"narHash": "sha256-tQ8DZrB9pucCl0qOEzvqRBrrYS0f72Sxhf+jYJQV1eE=", "narHash": "sha256-sGFCyWhTcI4TP+4ZlZniBEF41NWyKrojfpsHP7ld54c=",
"ref": "main", "ref": "main",
"rev": "a40220a4b977bc04cbe9e13ff5c667ed6f252677", "rev": "9955b1ae4eb0cbeff2ae0ed6520e651753880445",
"revCount": 22, "revCount": 23,
"type": "git", "type": "git",
"url": "https://git.qenya.tel/qenya/birdsong" "url": "https://git.qenya.tel/qenya/birdsong"
}, },
@ -71,11 +71,11 @@
"stable": [] "stable": []
}, },
"locked": { "locked": {
"lastModified": 1739900653, "lastModified": 1746816769,
"narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=", "narHash": "sha256-ymQzXrfHVT8/RJiGbfrNjEeuzXQan46lUJdxEhgivdM=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab", "rev": "df694ee23be7ed7b2d8b42c245a640f0724eb06c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,11 +92,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1745419403, "lastModified": 1747403139,
"narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=", "narHash": "sha256-GpldCFeC+YP9m2xm1POByfT3+9J9/nwst0CYxvR85I0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72", "rev": "1ebb2cf654110901889353440027993312e1aeb0",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745557122, "lastModified": 1747331121,
"narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745703610, "lastModified": 1747374689,
"narHash": "sha256-KgaGPlmjJItZ+Xf8mSoRmrsso+sf3K54n9oIP9Q17LY=", "narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f5819a962489e037a57835f63ed6ff8dbc2d5fb", "rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,15 +217,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1746827285,
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "079528098f5998ba13c88821a2eca1005c1695de", "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -238,24 +238,24 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742943028, "lastModified": 1746838955,
"narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1745487689, "lastModified": 1747209494,
"narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "rev": "5d736263df906c5da72ab0f372427814de2f52f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
}, },
"nixpkgs-small": { "nixpkgs-small": {
"locked": { "locked": {
"lastModified": 1745699837, "lastModified": 1747375575,
"narHash": "sha256-RqGZeOaAdvaVRibN/x6QF+Ahcuigj/WMsqLkGjq/mUI=", "narHash": "sha256-FQmc8T0JaLzdbVglulli0az8Z27GUQKg0ZKPzRmW3+U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d1e377e4cfcb3da8da4b71dbef631e8317907cd8", "rev": "288a96500445cddb1613dfd3b6fcc9d5b32fa7ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1745526057, "lastModified": 1747179050,
"narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1745731301, "lastModified": 1747369069,
"narHash": "sha256-2DZgcq2sylQuml+L6FOh8eWMoMGGbNHM7Ls56iBQPX0=", "narHash": "sha256-ijSyxbvVMV0G6FrGV3+yedO0mGYhLGPZYZpnAheBaQo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1ee8b713821882c66f5ecfde5c4e5874b1cb5e2f", "rev": "adfa8b0e75657c862acd0119ee42a69a6a6b2b4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,11 +354,11 @@
"randomcat": { "randomcat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745719427, "lastModified": 1747360898,
"narHash": "sha256-g3Xt07uJyj9WO+FvQFrxZe9QA6wauWIvyWzUPEu4g64=", "narHash": "sha256-KjgQXHGy92V2i5SFt3AQIeJiaW59hHvchu5V0gsTcH0=",
"owner": "randomnetcat", "owner": "randomnetcat",
"repo": "nix-configs", "repo": "nix-configs",
"rev": "876f365eaa010988a0908421578c72fb17c28f09", "rev": "a5540bdb3e6e9d2ad8ea9639654ff7263008d239",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,7 +7,7 @@
lix-module = { lix-module = {
# lix haven't figured out automatic updates yet: https://git.lix.systems/lix-project/nixos-module/issues/39 # lix haven't figured out automatic updates yet: https://git.lix.systems/lix-project/nixos-module/issues/39
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -3,6 +3,8 @@
let let
inherit (lib) optionals; inherit (lib) optionals;
isGraphical = osConfig.services.xserver.enable; isGraphical = osConfig.services.xserver.enable;
isGnome = osConfig.services.xserver.desktopManager.gnome.enable;
isPlasma = osConfig.services.desktopManager.plasma6.enable || osConfig.services.xserver.desktopManager.plasma5.enable;
in in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -30,5 +32,9 @@ in
libreoffice libreoffice
hunspell hunspell
hunspellDicts.en_GB-ise hunspellDicts.en_GB-ise
] ++ optionals isGnome [
celluloid
] ++ optionals isPlasma [
haruna
]; ];
} }