diff --git a/configs/flameshot.nix b/configs/flameshot.nix index 451500d..e351bb4 100644 --- a/configs/flameshot.nix +++ b/configs/flameshot.nix @@ -10,7 +10,6 @@ autoCloseIdleDaemon = true; drawColor = "#ff0000"; drawThickness = 2; - checkForUpdates = false; showDesktopNotification = true; disabledTrayIcon = true; showHelp = false; diff --git a/configs/fonts.nix b/configs/fonts.nix index 3a5a5da..5de1133 100644 --- a/configs/fonts.nix +++ b/configs/fonts.nix @@ -110,7 +110,7 @@ in { roboto roboto-mono noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji roboto-slab scheherazade-new diff --git a/configs/nix.nix b/configs/nix.nix index 9b7f76f..571fb41 100644 --- a/configs/nix.nix +++ b/configs/nix.nix @@ -7,7 +7,7 @@ config.allowUnfree = true; }; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = "experimental-features = nix-command flakes"; nixPath = ["nixpkgs=${inputs.nixpkgs}"]; }; diff --git a/configs/packages.nix b/configs/packages.nix index a350904..a26a48e 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -92,7 +92,7 @@ in { man-pages-posix exfat # to mount windows drives # HARDWARE TOOLS - gnome.gnome-disk-utility + gnome-disk-utility arandr # xrandr for noobs libnotify # for notify-send xclip # clipboard CLI @@ -212,7 +212,7 @@ in { #krebs niveumPackages.dic - config.nur.repos.mic92.ircsink + pkgs.nur.repos.mic92.ircsink (haskellPackages.ghcWithHoogle (hs: [ hs.text diff --git a/configs/sound.nix b/configs/sound.nix index fc334e1..295d83c 100644 --- a/configs/sound.nix +++ b/configs/sound.nix @@ -1,6 +1,4 @@ {pkgs, ...}: { - sound.enable = true; - services.pipewire = { enable = true; alsa = { diff --git a/flake.lock b/flake.lock index ac5f7d3..2e39939 100644 --- a/flake.lock +++ b/flake.lock @@ -87,30 +87,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -119,50 +103,18 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -172,11 +124,11 @@ "fromYaml": "fromYaml_2" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -223,11 +175,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732787251, - "narHash": "sha256-1qbt9obcsxegc82pgJod61/R0PFzMb0MdWO75PCHBhw=", + "lastModified": 1733833740, + "narHash": "sha256-vaNjbqpR1KZhLY7/Ht+pcQuaNO+NhQ71n+0QWtaQaXo=", "owner": "kmein", "repo": "brockman", - "rev": "d52ce9ab5df8da99bf98806717dfd4f65f9598b8", + "rev": "ebea6a616190dbaeda793951b008c65383be1e0a", "type": "github" }, "original": { @@ -238,13 +190,13 @@ }, "buildbot-nix": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "stockholm", "nixpkgs" ], - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1732578586, @@ -389,11 +341,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -403,6 +355,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stockholm", @@ -494,6 +467,27 @@ } }, "flake-utils_5": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "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_6": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -527,11 +521,11 @@ "fromYaml_2": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -614,16 +608,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -1105,11 +1099,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1733129790, - "narHash": "sha256-NpLl6+w3Hm5JnM5OfhA/hONVwzx4yh0AWR2wzVDy/Dc=", + "lastModified": 1733830410, + "narHash": "sha256-eBpi7AacnhhDrOE8FTmj2Rt0PafEWqb31s0wTJKCsCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61237cf7410999f0842be2c51d211e98b53ddbb4", + "rev": "45135b31a8782310c1e70ac242ba4130c5601030", "type": "github" }, "original": { @@ -1120,6 +1114,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -1135,7 +1145,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1615532953, "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", @@ -1243,31 +1253,31 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1733016324, - "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1385,12 +1395,17 @@ } }, "nur_2": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_9", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1733129406, - "narHash": "sha256-GekkNBbtHuRnbfcFmnURinySpcDws/ltV2keclsuRxE=", + "lastModified": 1733828023, + "narHash": "sha256-P6VUTtoauXQ8Um8dEU2pvSiGBjWMcMRRNdpuj0qBDk4=", "owner": "nix-community", "repo": "NUR", - "rev": "e23f1ed7ff100d18c284a83514ae98587f6edb37", + "rev": "5518ebad74468be340329de7fd2c1505592389f7", "type": "github" }, "original": { @@ -1560,11 +1575,11 @@ ] }, "locked": { - "lastModified": 1733106880, - "narHash": "sha256-aJmAIjZfWfPSWSExwrYBLRgXVvgF5LP1vaeUGOOIQ98=", + "lastModified": 1733798086, + "narHash": "sha256-XHIh0h84xDnjkqampyNI/r2FAkKmwbL719ZsygiJHKE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e66c0d43abf5bdefb664c3583ca8994983c332ae", + "rev": "8a19e07800d64462913f3dbf5c9a20ea7b50e6cd", "type": "github" }, "original": { @@ -1635,14 +1650,14 @@ "inputs": { "buildbot-nix": "buildbot-nix", "nix-writers": "nix-writers", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1732618784, - "narHash": "sha256-xEX/pyiOLZNiyKCr7FaLCjrSsu/gg9EPF2rl2Hzxl94=", + "lastModified": 1733336762, + "narHash": "sha256-rwO+P8LbkVUJWcp4NAq4VUK2B+KytVGkpi8bd7ulyyQ=", "owner": "krebs", "repo": "stockholm", - "rev": "3bd2443831443269ddfe54ab58c917cda6e7f1d5", + "rev": "636d6ee89b15e38a44442c041d255ef8743e5efa", "type": "github" }, "original": { @@ -1685,31 +1700,33 @@ "inputs": { "base16": "base16_2", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_5", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" ], "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_5", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "lastModified": 1732993760, + "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", "owner": "danth", "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", + "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "stylix", "type": "github" } @@ -1774,6 +1791,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "telebots": { "inputs": { "flake-utils": "flake-utils_2", @@ -1795,8 +1827,8 @@ }, "telebots_2": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1703313352, @@ -1870,7 +1902,78 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stockholm", @@ -1953,7 +2056,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1615819231, diff --git a/flake.nix b/flake.nix index eddaafa..cbd1d83 100644 --- a/flake.nix +++ b/flake.nix @@ -7,21 +7,21 @@ brockman.url = "github:kmein/brockman"; coptic-dictionary.url = "github:kmein/coptic-dictionary"; flake-utils.url = "github:numtide/flake-utils"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; menstruation-backend.url = "github:kmein/menstruation.rs"; menstruation-telegram.url = "github:kmein/menstruation-telegram"; nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05"; nixinate.url = "github:matthewcroughan/nixinate"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nur.url = "github:nix-community/NUR"; recht.url = "github:kmein/recht"; retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum"; rust-overlay.url = "github:oxalica/rust-overlay"; scripts.url = "github:kmein/scripts"; stockholm.url = "github:krebs/stockholm"; - stylix.url = "github:danth/stylix/release-24.05"; + stylix.url = "github:danth/stylix/release-24.11"; telebots.url = "github:kmein/telebots"; tinc-graph.url = "github:kmein/tinc-graph"; voidrice.url = "github:Lukesmithxyz/voidrice"; @@ -212,7 +212,7 @@ inputs.stockholm.nixosModules.reaktor2 brockman.nixosModule retiolum.nixosModules.retiolum - nur.nixosModules.nur + nur.modules.nixos.default { nixpkgs.overlays = [ inputs.stockholm.overlays.default ]; } { _module.args.nixinate = { @@ -246,7 +246,7 @@ inputs.self.nixosModules.passport agenix.nixosModules.default retiolum.nixosModules.retiolum - nur.nixosModules.nur + nur.modules.nixos.default ]; }; tahina = nixpkgs.lib.nixosSystem rec { @@ -275,7 +275,7 @@ agenix.nixosModules.default retiolum.nixosModules.retiolum home-manager.nixosModules.home-manager - nur.nixosModules.nur + nur.modules.nixos.default stylix.nixosModules.stylix ]; }; @@ -287,7 +287,7 @@ agenix.nixosModules.default retiolum.nixosModules.retiolum home-manager.nixosModules.home-manager - nur.nixosModules.nur + nur.modules.nixos.default stylix.nixosModules.stylix ]; }; @@ -299,7 +299,7 @@ agenix.nixosModules.default retiolum.nixosModules.retiolum home-manager.nixosModules.home-manager - nur.nixosModules.nur + nur.modules.nixos.default stylix.nixosModules.stylix ]; }; @@ -309,7 +309,7 @@ pkgs = import nixpkgs { inherit system; overlays = [ - nur.overlay + nur.overlays.default (self: super: { mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];}; dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"''; @@ -332,7 +332,7 @@ brassica = pkgs.callPackage packages/brassica.nix {}; cheat-sh = pkgs.callPackage packages/cheat-sh.nix {}; closest = pkgs.callPackage packages/closest {}; - cltk = pkgs.python3Packages.callPackage packages/cltk.nix {}; + cltk = pkgs.python310Packages.callPackage packages/cltk.nix {}; cro = pkgs.callPackage packages/cro.nix {}; cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {}; default-gateway = pkgs.callPackage packages/default-gateway.nix {}; diff --git a/lib/default.nix b/lib/default.nix index fb01bbf..5966801 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -45,11 +45,11 @@ theme = pkgs: { gtk = { name = "Adwaita-dark"; - package = pkgs.gnome.gnome-themes-extra; + package = pkgs.gnome-themes-extra; }; icon = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; }; cursor = { name = "capitaine-cursors-white"; diff --git a/lib/panoptikon.nix b/lib/panoptikon.nix index 659cae5..6e3cf6a 100644 --- a/lib/panoptikon.nix +++ b/lib/panoptikon.nix @@ -2,7 +2,6 @@ pkgs, lib, niveumPackages, - config, ... }: { # watcher scripts @@ -37,7 +36,7 @@ then "2" else "3" }s/^/${messagePrefix}/p" \ - | ${config.nur.repos.mic92.ircsink}/bin/ircsink \ + | ${pkgs.nur.repos.mic92.ircsink}/bin/ircsink \ --nick ${nick} \ --server ${server} \ --target ${target} diff --git a/systems/maakaron/home.nix b/systems/maakaron/home.nix index 67e2ea3..d355707 100644 --- a/systems/maakaron/home.nix +++ b/systems/maakaron/home.nix @@ -92,7 +92,7 @@ in { home.username = "xm7234fu"; home.homeDirectory = "/Users/${config.home.username}"; nixpkgs.config.allowUnfree = true; - nix.package = pkgs.nixFlakes; + nix.package = pkgs.nixVersions.stable; nix.extraOptions = "experimental-features = nix-command flakes"; } diff --git a/systems/makanek/configuration.nix b/systems/makanek/configuration.nix index ffbddf6..b963741 100644 --- a/systems/makanek/configuration.nix +++ b/systems/makanek/configuration.nix @@ -17,7 +17,7 @@ in { ./nextcloud.nix ./radio-news.nix ./scrabble.nix - ./onlyoffice.nix + # ./onlyoffice.nix ./retiolum-map.nix ./tarot.nix ./tt-rss.nix diff --git a/systems/makanek/moinbot.nix b/systems/makanek/moinbot.nix index ac04b63..8bbb41e 100644 --- a/systems/makanek/moinbot.nix +++ b/systems/makanek/moinbot.nix @@ -1,6 +1,5 @@ { pkgs, - config, ... }: { systemd.services.moinbot = { @@ -9,7 +8,7 @@ greeting=$(echo "moin MOIN moin: gib" | shuf -n1) - echo "$greeting" | ${config.nur.repos.mic92.ircsink}/bin/ircsink \ + echo "$greeting" | ${pkgs.nur.repos.mic92.ircsink}/bin/ircsink \ --nick "$greeting""bot" \ --server irc.hackint.org \ --port 6697 \ diff --git a/systems/tabula/configuration.nix b/systems/tabula/configuration.nix index 26ecb62..f2d526d 100644 --- a/systems/tabula/configuration.nix +++ b/systems/tabula/configuration.nix @@ -71,7 +71,6 @@ in { hostName = "tabula"; }; - sound.enable = true; hardware.pulseaudio.enable = true; networking.networkmanager.enable = true; diff --git a/systems/zaatar/nas.nix b/systems/zaatar/nas.nix index 3dc01a6..a8476ed 100644 --- a/systems/zaatar/nas.nix +++ b/systems/zaatar/nas.nix @@ -42,17 +42,19 @@ enable = true; securityType = "user"; openFirewall = true; - extraConfig = '' - workgroup = WORKGROUP - server string = zaatar - server role = standalone server - netbios name = zaatar - security = user - hosts allow = 192.168.178. 127.0.0.1 localhost - hosts deny = 0.0.0.0/0 - guest account = nobody - map to guest = Bad User - ''; + settings = { + global = { + "guest account" = "nobody"; + "hosts allow" = ["192.168.178." "127.0.0.1" "localhost"]; + "hosts deny" = ["0.0.0.0/0"]; + "map to guest" = "Bad User"; + "netbios name" = "zaatar"; + "security" = "user"; + "server role" = "standalone server"; + "server string" = "zaatar"; + "workgroup" = "WORKGROUP"; + }; + }; shares.nas = { path = "/media"; browseable = "yes";