From 870d360e8a67bd58003bed9c3523cfeb5d2e073f Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 30 Nov 2025 15:37:42 -0600 Subject: [PATCH] Some minor updates and fixes --- flake.lock | 96 +------------------ flake.nix | 14 +-- hosts/snowfire/configuration.nix | 1 - hosts/snowfire/home.nix | 13 ++- .../system/virtualization/winapps/default.nix | 18 ---- modules/themes/orichalcum/default.nix | 4 +- modules/user/art/default.nix | 1 - 7 files changed, 19 insertions(+), 128 deletions(-) delete mode 100644 modules/system/virtualization/winapps/default.nix diff --git a/flake.lock b/flake.lock index 86f4975..a4e746c 100644 --- a/flake.lock +++ b/flake.lock @@ -192,20 +192,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -241,24 +227,6 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, - "flake-utils": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -827,21 +795,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -899,16 +852,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "type": "indirect" } }, @@ -1043,8 +996,7 @@ "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay_2", "secrets": "secrets", - "stylix": "stylix", - "winapps": "winapps" + "stylix": "stylix" } }, "rust-overlay": { @@ -1183,21 +1135,6 @@ "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" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1279,29 +1216,6 @@ "type": "github" } }, - "winapps": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763586102, - "narHash": "sha256-BWQXLnX0JpK+Wcs2gOXMId0iAoPaIsc3xHLzZc2q05Y=", - "owner": "winapps-org", - "repo": "winapps", - "rev": "b4766336903d0cbe768d2ca7e8bb4b8a5951d0f2", - "type": "github" - }, - "original": { - "owner": "winapps-org", - "repo": "winapps", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 6da18af..9ff3dd5 100644 --- a/flake.nix +++ b/flake.nix @@ -94,7 +94,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-25.05"; + nixpkgs-stable.url = "nixpkgs/nixos-25.11"; chaotic.url = "github:chaotic-cx/nyx"; home-manager.url = "github:nix-community/home-manager/master"; @@ -103,15 +103,8 @@ hyprland = { url = "github:hyprwm/Hyprland/v0.52.1?submodules=true"; inputs.nixpkgs.follows = "nixpkgs"; - # inputs.hyprland-qtutils.follows = "hyprland-qtutils"; }; - # FIXME tmp fix - #hyprland-qtutils = { - # url = "github:hyprwm/hyprland-qtutils/629b15c19fa4082e4ce6be09fdb89e8c3312aed7"; - # inputs.nixpkgs.follows = "nixpkgs"; - #}; - hyprlock = { url = "github:hyprwm/hyprlock/v0.9.2"; inputs.nixpkgs.follows = "nixpkgs"; @@ -123,11 +116,6 @@ inputs.home-manager.follows = "home-manager"; }; - winapps = { - url = "github:winapps-org/winapps"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - stylix.url = "github:nix-community/stylix"; emacs-overlay = { diff --git a/hosts/snowfire/configuration.nix b/hosts/snowfire/configuration.nix index bf7ddca..673e3d9 100644 --- a/hosts/snowfire/configuration.nix +++ b/hosts/snowfire/configuration.nix @@ -21,7 +21,6 @@ virtualization = { docker.enable = true; virtualMachines.enable = true; - winapps.enable = true; }; brave.enable = true; diff --git a/hosts/snowfire/home.nix b/hosts/snowfire/home.nix index 33e7cbf..7303779 100644 --- a/hosts/snowfire/home.nix +++ b/hosts/snowfire/home.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + pkgs, + ... +}: { config = { @@ -30,7 +35,7 @@ virtualization = { virtualMachines.enable = true; }; - ai.enable = true; + ai.enable = false; # local-ai broken in nixpkgs # wm hyprland.enable = true; @@ -42,6 +47,10 @@ bluetooth.enable = true; }; + home.packages = with pkgs; [ + freerdp + ]; + home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable { AQ_DRM_DEVICES = lib.mkForce "/dev/dri/card2:/dev/dri/card1"; }; diff --git a/modules/system/virtualization/winapps/default.nix b/modules/system/virtualization/winapps/default.nix deleted file mode 100644 index 1c715a7..0000000 --- a/modules/system/virtualization/winapps/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, inputs, ... }: - -let - cfg = config.systemSettings.virtualization.winapps; -in { - options = { - systemSettings.virtualization.winapps = { - enable = lib.mkEnableOption "Enable winapps"; - }; - }; - - config = lib.mkIf cfg.enable { - environment.systemPackages = with inputs.winapps.packages."${pkgs.system}"; [ - winapps - winapps-launcher - ] ++ [ pkgs.freerdp ]; - }; -} diff --git a/modules/themes/orichalcum/default.nix b/modules/themes/orichalcum/default.nix index f438ce9..c272791 100644 --- a/modules/themes/orichalcum/default.nix +++ b/modules/themes/orichalcum/default.nix @@ -5,8 +5,8 @@ credits = "Forked from Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77))"; description = "Flagship theme of the LibrePhoenix Channel, named after a mythical metal"; polarity = "dark"; - backgroundUrl = "https://wallpapers.com/images/hd/alluring-sunset-anime-scenery-r2gmgtcp8h9iwo9u.webp"; - backgroundSha256 = "sha256-jOd9SznQTa8AoO6cZGy0LhN8lBadrRf60FvyCEs2tLo="; + backgroundUrl = "https://w.wallhaven.cc/full/m3/wallhaven-m3m1yk.png"; + backgroundSha256 = "sha256-KbLZPbXCIHUNvL6qKb3iD17Gkk/l08+UKavs0JxgezU="; base00 = "#1a181a"; base01 = "#262326"; base02 = "#302c30"; diff --git a/modules/user/art/default.nix b/modules/user/art/default.nix index 558768e..562d15a 100644 --- a/modules/user/art/default.nix +++ b/modules/user/art/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, pkgs-stable, ... }: