diff --git a/common/generic-desktop.nix b/common/generic-desktop.nix index d195dec..05afcc1 100644 --- a/common/generic-desktop.nix +++ b/common/generic-desktop.nix @@ -30,5 +30,18 @@ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) maple-mono-NF atkinson-hyperlegible + liberation_ttf + ocr-a + (pkgs.stdenv.mkDerivation { + pname = "libre-barcode"; + version = "1.008"; + src = pkgs.fetchzip { + url = "https://github.com/graphicore/librebarcode/releases/download/v1.008/LibreBarcode_v1.008.zip"; + hash = "sha256-2Tqpjb+wBrfawgdRdrL+rfJeYLsnwMhfDkwIBt2HWkE="; + }; + installPhase = '' + install -D -m 0644 $src/LibreBarcode39-Regular.ttf $out/share/fonts/truetype/LibreBarcode39-Regular.ttf + ''; + }) ]; } diff --git a/flake.lock b/flake.lock index 3166fc3..4ca65f6 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -302,11 +302,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727686547, - "narHash": "sha256-cIDsnMenhrMRNaiemUDv2Y1RH9VqADgXCjFEQR6lri8=", + "lastModified": 1728555961, + "narHash": "sha256-83y9rpVnBOLJrTS9T6ZlBur8Z5z2YhfFaKSVvdeKgLE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "435fd2de47ce3af98a055b17b6cb72d801824cf9", + "rev": "20b3f2804cac3be24c4c826275435ee6c0807e37", "type": "github" }, "original": { @@ -433,11 +433,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1727682344, - "narHash": "sha256-SIirDELRmRnbpfkMzuP80JxJbFNbjVIcq88Ug0f9EFs=", + "lastModified": 1728463806, + "narHash": "sha256-RHfieDDCEjPxtevtpt/IyxBaw4ISjjyY0WGzw7zYCMg=", "owner": "YaLTeR", "repo": "niri", - "rev": "80bb0d5876f8fae43791a8d6e52a38d3c1e01a72", + "rev": "e24723125f5ef91983735043fba893a940469686", "type": "github" }, "original": { @@ -448,11 +448,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -469,11 +469,11 @@ ] }, "locked": { - "lastModified": 1727658276, - "narHash": "sha256-X/jGUJnxy0zms4SDvHGOray/vM0OT+3l8mz71JcB35c=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a6353874234c45ca4bf98828dc2a067a61f9ee67", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -500,23 +500,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1727660984, - "narHash": "sha256-jgusy1DsdNX5KRZOQ/DonKoMshcDMZ17dAc0eVlNTS8=", + "lastModified": 1728179514, + "narHash": "sha256-mOGZFPYm9SuEXnYiXhgs/JmLu7RofRaMpAYyJiWudkc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6b2d41c8e20f8eb9f969ec4bd851b036ae688e14", + "rev": "018196c371073d669510fd69dd2f6dc0ec608c41", "type": "github" }, "original": { diff --git a/home/ash/desktop.nix b/home/ash/desktop.nix index a2a180c..774fe8e 100644 --- a/home/ash/desktop.nix +++ b/home/ash/desktop.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { home.packages = with pkgs; [ firefox - fluffychat +# fluffychat cachix prismlauncher gnome.gnome-sudoku @@ -14,7 +14,7 @@ programs.kitty = { enable = true; - theme = "Catppuccin-Mocha"; + themeFile = "Catppuccin-Mocha"; font.name = "JetBrainsMono Nerd Font"; }; diff --git a/home/ash/intellij.nix b/home/ash/intellij.nix index 1ece101..e7f1d39 100644 --- a/home/ash/intellij.nix +++ b/home/ash/intellij.nix @@ -1,6 +1,7 @@ { config, pkgs, ... }: { home.packages = with pkgs; [ jetbrains.idea-ultimate + jetbrains.phpstorm android-studio ]; } diff --git a/hosts/alex/configuration.nix b/hosts/alex/configuration.nix index 52c9a0c..d140f71 100644 --- a/hosts/alex/configuration.nix +++ b/hosts/alex/configuration.nix @@ -80,5 +80,7 @@ virtualisation.waydroid.enable = true; + services.logind.lidSwitch = "ignore"; + system.stateVersion = "22.11"; } diff --git a/hosts/loona/configuration.nix b/hosts/loona/configuration.nix index f42017a..1c8e46f 100644 --- a/hosts/loona/configuration.nix +++ b/hosts/loona/configuration.nix @@ -15,7 +15,7 @@ networking.hostId = "df9469a3"; networking.firewall.enable = false; - boot.kernelPackages = pkgs.linuxPackages_6_8; + #boot.kernelPackages = pkgs.linuxPackages_6_8; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = {