Updated system (& temp remove stuff that doesn't build)

This commit is contained in:
Emmet
2025-01-25 21:10:05 -06:00
parent 2b5c68a6c6
commit 6aafa4a6af
5 changed files with 61 additions and 57 deletions

104
flake.lock generated
View File

@ -102,11 +102,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736978230, "lastModified": 1737822304,
"narHash": "sha256-f5SH4qQzRWYKwIjpzOuhI9mPwlyNcBWjr2mrCKLgml4=", "narHash": "sha256-FBq7yonwKPh57ZYI4XUqYZZyxTWON3Ox5i45qYELkSs=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "1b19054c880e1ea75c73dfbeb3fb071c2bf08e1f", "rev": "55a9a74a5f40502ec61c56bcb4a39f851270d300",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +124,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1737055309, "lastModified": 1737811239,
"narHash": "sha256-nRkk3vB5B5ITfWsCxDU+aOVZ4bMqDVIPB1TLWc5zbWE=", "narHash": "sha256-X0C4HEcw3AdSgEH6YDHwC6w8xBxK0pVKyUYMoXU2f1w=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "b0e6aee3b90fd6506e0164bc180ae1e1f6be22a8", "rev": "be39fe2f8f4e922fc5f2402377531191f96f6b02",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1737105550, "lastModified": 1737825153,
"narHash": "sha256-BagwQS3VHSPgZ9xwmwaMGShSkdghAv7ZD1xE5Wb9678=", "narHash": "sha256-R1p2ZXOydII+MT/SpeOXBjo/dgfD/gIArge2YAgSw38=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c7efde709bbcd3a207abe763c11922fda4358a6d", "rev": "4ebe4c890e7c8662ae31192359a56b0505cf10ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1737009074, "lastModified": 1737268357,
"narHash": "sha256-BF+OxooVz4KeSIJyLXCnX2VTMsyfGrpEsay76hGRyrI=", "narHash": "sha256-J3At8JDKpQGDeDUcz1eh0h5yFwNH7fPfm+N95TxiOq4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "fe17a42e2c306d1a8a4fb3f977b12048d8cf7471", "rev": "f9662e6ea6020671e1e17102bd20d6692bb38aba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,11 +375,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736883540, "lastModified": 1737221749,
"narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=", "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632", "rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737120639, "lastModified": 1737762889,
"narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906540, "lastModified": 1737634937,
"narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +496,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732808127, "lastModified": 1734906236,
"narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=", "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059", "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -613,11 +613,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728168612, "lastModified": 1735393019,
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -642,7 +642,7 @@
"locked": { "locked": {
"lastModified": 1735497496, "lastModified": 1735497496,
"narHash": "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=", "narHash": "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=",
"ref": "02639c27599b03c81dc1d0e031628224f5ad8d50", "ref": "refs/heads/main",
"rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b", "rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b",
"revCount": 301, "revCount": 301,
"type": "git", "type": "git",
@ -735,11 +735,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737007397, "lastModified": 1737126697,
"narHash": "sha256-uJ7Lk0moWSn8Tr0QkUbOCWR7WrhiLeha4E00rckhl8I=", "narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "6bbb19666e753c18ef8af35f590cbc3ba42dd0ca", "rev": "27a0ddac1a14e10ba98530f59db728951495f2ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -827,11 +827,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1737632463,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -875,11 +875,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1736916166, "lastModified": 1737672001,
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -907,11 +907,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1736916166, "lastModified": 1737672001,
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -922,11 +922,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1737746512,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1049,11 +1049,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736970696, "lastModified": 1737215993,
"narHash": "sha256-WP5yBCVkidEf5y3kCaUSjRd0udpAE6nmY3MMx3Q2aNo=", "narHash": "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "7d337c7f350a163ac3a9bd4ce0c4dae2df20579b", "rev": "248bd511aee2c1c1cb2d5314649521d6d93b854a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1068,11 +1068,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1737080704, "lastModified": 1737771740,
"narHash": "sha256-n+J2h9GM9ZpFOQUmtZoCr1+DFF/iO5UlmLJeHIxbZGY=", "narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f9953fe89f8b65401fc4d4a288940bc2cb072949", "rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1117,11 +1117,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736993991, "lastModified": 1737833281,
"narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=", "narHash": "sha256-+hCZqNMvcjGinYinsITX+kJvqkEqcWheaNX5WGGcRow=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407", "rev": "7c1c3259283f2da9c3d15c9096e7b8864f82bd4c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -53,7 +53,7 @@
# create patched nixpkgs # create patched nixpkgs
nixpkgs-patched = nixpkgs-patched =
(import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches { (import inputs.nixpkgs { system = systemSettings.system; }).applyPatches {
name = "nixpkgs-patched"; name = "nixpkgs-patched";
src = inputs.nixpkgs; src = inputs.nixpkgs;
patches = [ ]; patches = [ ];

View File

@ -185,7 +185,7 @@
libmediainfo libmediainfo
audio-recorder audio-recorder
cheese cheese
ardour #ardour
#rosegarden #rosegarden
tenacity tenacity

View File

@ -19,7 +19,8 @@
hardware.opengl.extraPackages = [ pkgs.rocmPackages.clr.icd ]; hardware.opengl.extraPackages = [ pkgs.rocmPackages.clr.icd ];
hardware.opengl.extraPackages32 = [ ]; hardware.opengl.extraPackages32 = [ ];
environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipblas hipfft hipcub hipify ]; #environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipblas hipfft hipcub hipify ];
environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipfft hipcub hipify ];
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
@ -42,8 +43,8 @@
rocmEnv = pkgs.symlinkJoin { rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined"; name = "rocm-combined";
paths = with pkgs.rocmPackages; [ paths = with pkgs.rocmPackages; [
rocblas #rocblas
hipblas #hipblas
clr clr
]; ];
}; };

View File

@ -35,6 +35,7 @@ in
exec-once = dbus-update-activation-environment --systemd DISPLAY XAUTHORITY WAYLAND_DISPLAY XDG_SESSION_DESKTOP=Hyprland XDG_CURRENT_DESKTOP=Hyprland XDG_SESSION_TYPE=wayland exec-once = dbus-update-activation-environment --systemd DISPLAY XAUTHORITY WAYLAND_DISPLAY XDG_SESSION_DESKTOP=Hyprland XDG_CURRENT_DESKTOP=Hyprland XDG_SESSION_TYPE=wayland
exec-once = hyprctl setcursor '' + config.gtk.cursorTheme.name + " " + builtins.toString config.gtk.cursorTheme.size + '' exec-once = hyprctl setcursor '' + config.gtk.cursorTheme.name + " " + builtins.toString config.gtk.cursorTheme.size + ''
exec-once = sleep 10 && nextcloud
exec-once = iio-hyprland exec-once = iio-hyprland
env = NIXOS_OZONE_WL,1 env = NIXOS_OZONE_WL,1
env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_CURRENT_DESKTOP,Hyprland
@ -53,6 +54,7 @@ in
exec-once = hyprprofile Default exec-once = hyprprofile Default
exec-once = ydotoold exec-once = ydotoold
exec-once = sleep 10 && caffeine
#exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent #exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent
exec-once = nm-applet exec-once = nm-applet
exec-once = blueman-applet exec-once = blueman-applet
@ -423,6 +425,7 @@ in
}; };
home.packages = (with pkgs; [ home.packages = (with pkgs; [
caffeine-ng
alacritty alacritty
kitty kitty
feh feh