diff --git a/.github/actions/install-lix/action.yml b/.github/actions/install-lix/action.yml index 8900892..2170b8d 100644 --- a/.github/actions/install-lix/action.yml +++ b/.github/actions/install-lix/action.yml @@ -1,4 +1,4 @@ -# Derived from: https://github.com/isabelroses/dotfiles/blob/d3149ba27ec531b53de9e13c815ea1741c835299/.github/actions/install-lix/action.yml :3 +# Derived from: https://github.com/isabelroses/dotfiles/blob/9335e5728eaaa9bdcb0d5c3130a5d7c8dddbb6e3/.github/actions/install-lix/action.yml :3 name: Install Lix description: "Install Lix for the specified system" @@ -6,7 +6,7 @@ runs: using: composite steps: - - uses: DeterminateSystems/nix-installer-action@v20 + - uses: DeterminateSystems/nix-installer-action@main with: source-url: 'https://install.lix.systems/lix/lix-installer-${{ fromJSON(''{"X64":"x86_64","X86":"i686","ARM64":"aarch64","ARM":"armv7l"}'')[runner.arch] }}-${{ fromJSON(''{"Linux":"linux","macOS":"darwin","Windows":"windows"}'')[runner.os] }}' logger: pretty diff --git a/.gitignore b/.gitignore index aa78a54..48b3472 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,3 @@ ### VSCode /.vscode - -### User provided binaries -# Cisco Packet Tracer -/homes/x86_64-linux/*/apps/packettracer/*.deb diff --git a/flake.lock b/flake.lock index bc3936e..301b01e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1762198582, - "narHash": "sha256-P9giW/1Crn7ekQt4YIbONJ/hKFaHkTwyhz82FCjh+OM=", + "lastModified": 1760468693, + "narHash": "sha256-JtXWEvA09PLiBOcNws3eUa6WSj/j1aDc1isWXka6ctk=", "owner": "catppuccin", "repo": "nix", - "rev": "08716214674ca27914daa52e6fa809cc022b581e", + "rev": "2b289e5837767dd9239e4469d6ba69ca4f98038b", "type": "github" }, "original": { @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1762296971, - "narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=", + "lastModified": 1760500983, + "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", "owner": "nix-community", "repo": "home-manager", - "rev": "34fe48801d2a5301b814eaa1efb496499d06cebc", + "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1762305918, - "narHash": "sha256-wVPT9kNpQH4PyRdhZH7oqBlBk8aoNMOYVcy4OzYBjh0=", + "lastModified": 1760491287, + "narHash": "sha256-BOvhD3Q9fZcxQbjz9YPdOTrWjRnyUVqW2YTFJZI8rQE=", "owner": "kaylorben", "repo": "nixcord", - "rev": "9c6b54492dcee998fc5981e1a21b34b243e85d3e", + "rev": "b88450ad729eed534601ff0813b3fed46dd013cb", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762267440, - "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1760393368, + "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1762271689, - "narHash": "sha256-pzlrIfOSk0MaEYNbhQ5gDKMA7XmrcuoJaEOP/IZ/dNk=", + "lastModified": 1760276212, + "narHash": "sha256-7It9jBYdT8lqJLkKN+i/9RplR2Fv3F7bH02gDVlEV0o=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "9f202f5d1d445558605926bfdd6e1be7b6bdb4ef", + "rev": "6c583ff744ce0acf4f1af9c5f5af37057bfcde68", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/jo/default.nix b/homes/x86_64-linux/jo/default.nix index 2f5bac6..191b1ff 100644 --- a/homes/x86_64-linux/jo/default.nix +++ b/homes/x86_64-linux/jo/default.nix @@ -9,8 +9,6 @@ ./apps/firefox ./apps/vicinae ./apps/packettracer - - ./desktop/gnome ]; puzzlevision = { @@ -63,9 +61,6 @@ git git-credential-oauth attic-client - - ## PHP/Shopware - shopware-cli ]; home.stateVersion = "25.05"; diff --git a/homes/x86_64-linux/jo/desktop/gnome/default.nix b/homes/x86_64-linux/jo/desktop/gnome/default.nix deleted file mode 100644 index d6586dc..0000000 --- a/homes/x86_64-linux/jo/desktop/gnome/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - puzzlevision.desktop.gnome.wallpaper = ../wallpapers/macchiato-waves.jpg; -} diff --git a/homes/x86_64-linux/jo/desktop/wallpapers/macchiato-waves.jpg b/homes/x86_64-linux/jo/desktop/wallpapers/macchiato-waves.jpg deleted file mode 100644 index 336cd88..0000000 Binary files a/homes/x86_64-linux/jo/desktop/wallpapers/macchiato-waves.jpg and /dev/null differ diff --git a/modules/home/apps/zed/default.nix b/modules/home/apps/zed/default.nix index 22a9e00..c1cc934 100644 --- a/modules/home/apps/zed/default.nix +++ b/modules/home/apps/zed/default.nix @@ -58,7 +58,7 @@ in }; hard_tabs = true; - tab_size = 4; + tab_size = 2; soft_wrap = "preferred_line_length"; ### Language specific configurations @@ -74,20 +74,6 @@ in arguments = [ "--quiet" ]; }; }; - - tab_size = 2; - }; - PHP = { - language_servers = [ - "phpactor" - "!intelephense" - "!tailwind-language-server" - ]; - formatter = { - external = { - command = "pretty-php"; - }; - }; }; }; @@ -140,11 +126,6 @@ in ### Python python3Packages.python-lsp-server - - ### PHP - php - phpPackages.composer - pretty-php ]; }; }; diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 806e92f..2b62601 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -28,13 +28,13 @@ in nerd-fonts.zed-mono monocraft - noto-fonts-color-emoji + noto-fonts-emoji material-icons material-design-icons ]; example = [ noto-fonts - noto-fonts-color-emoji + noto-fonts-emoji ]; description = "Install additional font packages"; }; diff --git a/systems/x86_64-nixos/puzzlevision/default.nix b/systems/x86_64-nixos/puzzlevision/default.nix index be1b1f8..b5dfef4 100644 --- a/systems/x86_64-nixos/puzzlevision/default.nix +++ b/systems/x86_64-nixos/puzzlevision/default.nix @@ -22,7 +22,7 @@ }; archetypes.laptop.enable = true; - system.kernel.version = "linuxPackages_6_17"; + system.kernel.version = "linuxPackages_6_16"; }; boot = { diff --git a/systems/x86_64-nixos/puzzlevision/hardware.nix b/systems/x86_64-nixos/puzzlevision/hardware.nix index 39f3613..ec9b870 100644 --- a/systems/x86_64-nixos/puzzlevision/hardware.nix +++ b/systems/x86_64-nixos/puzzlevision/hardware.nix @@ -35,7 +35,7 @@ extraPackages = with pkgs; [ intel-ocl intel-media-driver - libva-vdpau-driver + vaapiVdpau libvdpau-va-gl ]; };